Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Sat, 6 Sep 2014 19:41:36 +0000 (13:41 -0600)
committerBdale 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

@@@ -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