projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e9714e3
dd26ec2
)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
author
Bdale Garbee
<bdale@gag.com>
Sat, 6 Sep 2014 19:41:36 +0000
(13:41 -0600)
committer
Bdale Garbee
<bdale@gag.com>
Sat, 6 Sep 2014 19:41:36 +0000
(13:41 -0600)
Conflicts:
ao-bringup/turnon_telemega
1
2
ao-bringup/turnon_telemega
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ao-bringup/turnon_telemega
index 46c254b6477bf48c2d50004237ac2b2853756875,9705798a09c8bd25056674cbe93e57009da13c82..7745a8e560abcddf71bddf50fc8281c0db75965d
---
1
/
ao-bringup/turnon_telemega
---
2
/
ao-bringup/turnon_telemega
+++ b/
ao-bringup/turnon_telemega
@@@
-54,6
-54,4
+54,6
@@@
echo 'E 0' > $de
SERIAL=$SERIAL ./cal-freq $dev
- ./cal-accel $dev
+ ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+
+echo 'E 1' > $dev