Merge branch 'master' into branch-1.8

diff --git a/ao-bringup/turnon_teledongle b/ao-bringup/turnon_teledongle
index 0cdbde7a5973e37830e775ed677da6a0a66b503b..983f1010340004b69b1c7e0a74f2d5e61118a5e6 100755 (executable)
--- a/ao-bringup/turnon_teledongle
+++ b/ao-bringup/turnon_teledongle
@@ -71,7 +71,9 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+CALFILE=cal-$SERIAL.txt
+
+../ao-tools/ao-cal-freq/ao-cal-freq --verbose --nosave --output=$CALFILE --tty=$dev
 
 case $? in
     0)
@@ -82,7 +84,7 @@ case $? in
        ;;
 esac
 
-CAL_VALUE=`grep "^$SERIAL," cal_values | tail -1 | sed 's/^[^,]*,//'`
+CAL_VALUE=`cat $CALFILE`
 
 case "$CAL_VALUE" in
     [1-9]*)
@@ -93,6 +95,8 @@ case "$CAL_VALUE" in
        ;;
 esac
 
+echo $SERIAL","$CAL_VALUE >> cal_values
+
 echo "Reflashing with calibration: $CAL_VALUE"
 
 $USBLOAD --cal=$CAL_VALUE --tty=$dev $ALTOS || exit 1

diff --git a/src/lpc/ao_usb_lpc.c b/src/lpc/ao_usb_lpc.c
index c50e752883faca07f5d92b0965c203d2db160eaf..d26a1437f9b34c94e8d8c93ca1ea051c8fe0906d 100644 (file)
--- a/src/lpc/ao_usb_lpc.c
+++ b/src/lpc/ao_usb_lpc.c
@@ -1013,7 +1013,11 @@ void
 ao_usb_init(void)
 {
 #if HAS_USB_PULLUP
+       int     i;
        ao_enable_output(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 0);
+
+       for (i = 0; i < 40000; i++)
+               ao_arch_nop();
 #endif
        ao_usb_enable();