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

diff --git a/ao-bringup/turnon_easymotor b/ao-bringup/turnon_easymotor
index b9bc00772af3169d580ceb9512c24a84e2e8b680..306e0ad9c4e7d8b0c9676c0d97a4147374c80b1e 100755 (executable)
--- a/ao-bringup/turnon_easymotor
+++ b/ao-bringup/turnon_easymotor
@@ -44,7 +44,7 @@ esac
 
 echo $DFU_UTIL
 
-$DFU_UTIL -v -v -R -a 0 -s 0x08000000:leave -D $REPO/loaders/easymotor-v$VERSION*.elf
+$DFU_UTIL -v -v -R -a 0 -s 0x08000000:leave -D $REPO/loaders/easymotor-v$VERSION*.bin
 
 sleep 3
 

diff --git a/doc/telelaunch-configuration.inc b/doc/telelaunch-configuration.inc
index 0317613cae8340033759a4d5c9554bad10f52241..a24776331a09818cece9e6cdfb77b7e78a1a0ec0 100644 (file)
--- a/doc/telelaunch-configuration.inc
+++ b/doc/telelaunch-configuration.inc
@@ -59,7 +59,7 @@
                memory.  For example, the default 435.750 MHz would be 
                configured using
 
-                       c F 435750
+                       c F 435750 +
                        c w
 
                Note that the 'f' parameter is a frequency calibration value