Merge branch 'branch-1.8' into debian

3 files changed, 44 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f7ecafb..d79a2feb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+commit f3330f019216ee2632f47be1fb06e158fb09d758
+Merge: 5a86ff43 e7136c6b
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Oct 8 20:58:43 2018 -0600
+
+    Merge branch 'master' into branch-1.8
+
+commit e7136c6b413c8464d32cdc4afc28c93ba1f17a3b
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Oct 8 19:42:09 2018 -0700
+
+    altos/lpc: Make sure USB pull-up is held low at boot for 'a while'
+    
+    Add a delay loop to make sure the host sees the pull-up low for long
+    enough.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6e785eea7b7a14ec8c1e69cad2c88836a9b1943e
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Oct 8 19:40:32 2018 -0700
+
+    ao-bringup: Use new ao-cal-freq options when flashing teledongle v3.0
+    
+    Use --nosave and --output to get the value needed to reflash the device.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 5a86ff43a2b4a90dbddc1bba48019626e1b83e10
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Oct 8 17:51:33 2018 -0600
+
+    releasing 1.8.7
+
 commit 34658a1236e34891b41a0a51a480717db98779e7
 Merge: 3a2a5a05 88ae4c5e
 Author: Bdale Garbee <bdale@gag.com>
diff --git a/ao-bringup/turnon_teledongle b/ao-bringup/turnon_teledongle
index 0cdbde7a..983f1010 100755
--- 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 c50e7528..d26a1437 100644
--- 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();