From: Bdale Garbee <bdale@gag.com>
Date: Sat, 6 Sep 2014 19:41:36 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.4.9.3~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=8c212cd5bfa03f71a31d84bd0051314e77d88461

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

Conflicts:
	ao-bringup/turnon_telemega
---

8c212cd5bfa03f71a31d84bd0051314e77d88461
diff --cc ao-bringup/turnon_telemega
index 46c254b6,9705798a..7745a8e5
--- a/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