From e8b2adc36a329fa2fe7673dbc3ae372e30dba078 Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Sat, 27 Aug 2011 07:00:07 -0400
Subject: bootloader ends as soon as sketch upload finishes.   restored pulsing
 of LED while bootloader running.

---
 bootloaders/diskloader/DiskLoader.hex     | 168 +++++++++++++++---------------
 bootloaders/diskloader/src/DiskLoader.cpp |   1 +
 bootloaders/diskloader/src/USBCore.cpp    |   2 +-
 3 files changed, 88 insertions(+), 83 deletions(-)

diff --git a/bootloaders/diskloader/DiskLoader.hex b/bootloaders/diskloader/DiskLoader.hex
index 62734a8..ced02bd 100644
--- a/bootloaders/diskloader/DiskLoader.hex
+++ b/bootloaders/diskloader/DiskLoader.hex
@@ -1,4 +1,4 @@
-:1078000011241FBECFEFDAE0DEBFCDBFBAC0410109
+:1078000011241FBECFEFDAE0DEBFCDBFD0C04101F3
 :1078100042144505560455026403740300001E9586
 :1078200087020110030000C18081C106C0FF0A0069
 :107830000CA10185037508150026FF00954009017C
@@ -13,86 +13,90 @@
 :1078C000040100020A000000070502024000000750
 :1078D00005830240000009040200010300000009C2
 :1078E0002101010001221E00070584034000400021
-:1078F00081E08093E0001092E200EE27FF270994D8
-:1079000008950F931F93CF93DF93982FEB01042FCC
-:1079100010E088E76030780730F411E083E0FB0185
-:1079200080935700E895892F68E071E0402FDBD005
-:10793000112311F107B600FCFDCF402F4695FE0143
-:10794000A8E0B1E020E031E009C08D919D910C01EB
-:1079500030935700E895112432962F5F2417A8F32F
-:1079600085E0FE0180935700E89507B600FCFDCF47
-:1079700081E180935700E895DF91CF911F910F919E
-:107980000895769A289A47983F9A209A6E9A90E896
-:10799000909361001092610081E885BF95BF8AD005
-:1079A00084E18093880180E180938901E0E0F0E048
-:1079B000859194918F5F9F4F19F081E080938B01A7
-:1079C000EE24FF24DD24D394DDD1082F8EE098E748
-:1079D000FC012491319602964491201711F0222344
-:1079E000B9F710928D0110928C0182E068E071E08D
-:1079F0007AD0013479F4609108016058633028F03E
-:107A0000683111F064E001C063E0C62FD0E0CF5DC3
-:107A1000D7480EC0063571F480910801803311F00B
-:107A200011E022C080910A01C82FD0E0C25ED74881
-:107A300011E022C0053721F413E0CEE1D8E71CC0E5
-:107A4000053539F4E0900801F0900901EE0CFF1CB7
-:107A50000AC0043631F482E0B7014091090151DFD8
-:107A600002C0043721F010E0C5E2D8E705C010914C
-:107A70000901E701E10EF11C85D18097B1F483E0A3
-:107A800068E871E041E050E045D0112329F0412F32
-:107A900050E083E8BE013ED083E469E871E041E054
-:107AA00050E038D0013509F08FCFD0928B01EE2411
-:107AB000FF248ACF10928D0110928C0110928A01BE
-:107AC00010928B0181E08093D70080EA8093D800E8
-:107AD00082E189BD09B400FEFDCF80E98093D80022
-:107AE0001092E0000895FB018093E9009BE60FC02F
-:107AF0008091E80085FFFCCF28988091F100819368
-:107B00008091E80085FD02C09093E8004150442335
-:107B100079F70895982FFB01282F207287708093A2
-:107B2000E9003AE315C08091E80085FFFCCF97FF9C
-:107B300002C0849101C080813196211180E0769845
-:107B40008093F1008091E80085FD02C03093E80049
-:107B5000415050408FEF4F3F580729F796FF03C021
-:107B60008AE38093E800089580918F01813281F447
-:107B7000769820E030E003C080818093F100F90125
-:107B8000E050FF4F2F5F3F4F28303105A9F71FC04E
-:107B90008032B9F48091E80082FFFCCF289820E081
-:107BA00030E003C08091F1008083F901E050FF4F85
-:107BB0002F5F3F4F28303105A9F78BEF8093E80006
-:107BC00006C0823221F4809190018093070181E008
-:107BD000089520919101223231F1213081F4809178
-:107BE000940190919501089711F42093960180914A
-:107BF0009601882309F03BC0E9E7F8E73AC0223054
-:107C000021F484E6EBE8F8E711C0233071F58091A8
-:107C10009001882319F4E9E4F8E72BC0813029F5B5
-:107C2000EDE4F8E726C081E0EBE2F8E790919401FB
-:107C3000282F981708F4292F90E03EEF8091E80054
-:107C40008570E1F38091E80082FD0FC09F5F849111
-:107C500076988093F100892F8F7311F43093E800A8
-:107C60003196921758F381E0089580E00895E7E691
-:107C7000F8E78491DBCF1092E9008091E80083FF60
-:107C800062C02898EEE8F1E003C08091F100819392
-:107C900081E0E639F807C9F782EF8093E800809128
-:107CA0008E0187FF05C08091E80080FFFCCF03C0F4
-:107CB0008EEF8093E80080918F01853051F48091A0
-:107CC000E80080FFFCCF8091900180688093E30002
-:107CD00033C08930E1F48091900180938A01E7E21A
-:107CE000F8E791E031E026E39093E9003093EB0070
-:107CF00084918093EC002093ED009F5F3196953046
-:107D000099F78EE78093EA001092EA0015C0883058
-:107D100031F480918A0176988093F1000DC0882318
-:107D200021F476981092F10007C0863011F451DFEB
-:107D300001C01ADF882321F08EEF8093E8000895B8
-:107D400081E28093EB0008958091E1001092E100C0
-:107D5000282F83FF0CC01092E90081E08093EB0094
-:107D60001092EC0082E38093ED0010928A0122FFD2
-:107D700008C080918B01882321F410928D0110920C
-:107D80008C0108951F9312E076DFDEDF1093E90087
-:107D90008091E80085FF0EC028989091F1008091B5
-:107DA000E80085FD03C08BE68093E800892F90E012
-:107DB0001F91089584E6000000000000000081503B
-:107DC000D1F7289A769A80918C0190918D01019734
-:107DD00090938D0180938C0180918C0190918D0105
-:0C7DE000892B91F6769A289A83DDCECF8D
-:087DEC0000E1000000000000AE
+:1078F00020918A0130918B012F5F3F4F30938B0194
+:1079000020938A01832F9927982F87FD9095990FAF
+:10791000921710F447980895479A089581E080934C
+:10792000E0001092E200EE27FF27099408950F93DC
+:107930001F93CF93DF93982FEB01042F10E088E77C
+:107940006030780730F411E083E0FB01809357004A
+:10795000E895892F68E071E0402FE2D0112311F102
+:1079600007B600FCFDCF402F4695FE01A8E0B1E030
+:1079700020E031E009C08D919D910C0130935700BA
+:10798000E895112432962F5F2417A8F385E0FE01B5
+:1079900080935700E89507B600FCFDCF81E1809306
+:1079A0005700E895DF91CF911F910F910895769A36
+:1079B000289A47983F9A209A6E9A90E8909361008F
+:1079C0001092610081E885BF95BF91D084E18093DA
+:1079D000880180E180938901E0E0F0E08591949155
+:1079E0008F5F9F4F19F081E080938D01EE24FF247B
+:1079F000BB24B39421E0C22ED12CE1D1082F8EE01C
+:107A000098E7FC012491319602964491201711F0D9
+:107A10002223B9F710928F0110928E0182E068E064
+:107A200071E07ED0013479F46091080160586330D0
+:107A300028F0683111F064E001C063E0C62FD0E0A7
+:107A4000CF5DD7480EC0063571F4809108018033B0
+:107A500011F011E022C080910A01C82FD0E0C25E6F
+:107A6000D74811E022C0053721F413E0CEE1D8E772
+:107A70001CC0053539F4E0900801F0900901EE0CC6
+:107A8000FF1C0AC0043631F482E0B70140910901BD
+:107A90004EDF02C0043721F010E0C5E2D8E705C090
+:107AA00010910901E701E10EF11C89D18097B1F431
+:107AB00083E068E871E041E050E049D0112329F00B
+:107AC000412F50E083E8BE0142D083E469E871E0D1
+:107AD00041E050E03CD0013509F08FCFD0928F01CA
+:107AE000C0928E01B0928D01EE24FF2486CF1092B9
+:107AF0008F0110928E0110928C0110928D0181E005
+:107B00008093D70080EA8093D80082E189BD09B4D0
+:107B100000FEFDCF80E98093D8001092E000089528
+:107B2000FB018093E9009BE60FC08091E80085FF90
+:107B3000FCCF28988091F10081938091E80085FD29
+:107B400002C09093E8004150442379F70895982F9C
+:107B5000FB01282F207287708093E9003AE315C05B
+:107B60008091E80085FFFCCF97FF02C0849101C09F
+:107B700080813196211180E076988093F100809188
+:107B8000E80085FD02C03093E800415050408FEF7F
+:107B90004F3F580729F796FF03C08AE38093E80018
+:107BA000089580919101813281F4769820E030E04F
+:107BB00003C080818093F100F901E050FF4F2F5FF7
+:107BC0003F4F28303105A9F71FC08032B9F48091AA
+:107BD000E80082FFFCCF289820E030E003C08091CD
+:107BE000F1008083F901E050FF4F2F5F3F4F2830B5
+:107BF0003105A9F78BEF8093E80006C0823221F4AB
+:107C0000809192018093070181E008952091930172
+:107C1000223231F1213081F48091960190919701C7
+:107C2000089711F42093980180919801882309F016
+:107C30003BC0E9E7F8E73AC0223021F484E6EBE8FC
+:107C4000F8E711C0233071F580919201882319F46F
+:107C5000E9E4F8E72BC0813029F5EDE4F8E726C028
+:107C600081E0EBE2F8E790919601282F981708F44D
+:107C7000292F90E03EEF8091E8008570E1F380913C
+:107C8000E80082FD0FC09F5F849176988093F10099
+:107C9000892F8F7311F43093E8003196921758F3BF
+:107CA00081E0089580E00895E7E6F8E78491DBCF6E
+:107CB0001092E9008091E80083FF62C02898E0E913
+:107CC000F1E003C08091F100819381E0E839F80789
+:107CD000C9F782EF8093E8008091900187FF05C08B
+:107CE0008091E80080FFFCCF03C08EEF8093E80016
+:107CF00080919101853051F48091E80080FFFCCFA4
+:107D00008091920180688093E30033C08930E1F470
+:107D10008091920180938C01E7E2F8E791E031E0F5
+:107D200026E39093E9003093EB0084918093EC007C
+:107D30002093ED009F5F3196953099F78EE7809301
+:107D4000EA001092EA0015C0883031F480918C016D
+:107D500076988093F1000DC0882321F476981092D4
+:107D6000F10007C0863011F451DF01C01ADF88230B
+:107D700021F08EEF8093E800089581E28093EB007C
+:107D800008958091E1001092E100282F83FF0CC03C
+:107D90001092E90081E08093EB001092EC0082E306
+:107DA0008093ED0010928C0122FF08C080918D011C
+:107DB000882321F410928F0110928E0108951F9351
+:107DC00012E076DFDEDF1093E9008091E80085FFA6
+:107DD0000EC028989091F1008091E80085FD03C0C5
+:107DE0008BE68093E800892F90E01F91089584E648
+:107DF00000000000000000008150D1F7289A769A18
+:107E000080918E0190918F01019790938F018093C3
+:107E10008E0180918E0190918F01892B19F4769AB1
+:087E2000289A7CDD65DDCDCF61
+:087E280000E100000000000071
 :040000030000780081
 :00000001FF
diff --git a/bootloaders/diskloader/src/DiskLoader.cpp b/bootloaders/diskloader/src/DiskLoader.cpp
index bc1e026..9ecbc4b 100644
--- a/bootloaders/diskloader/src/DiskLoader.cpp
+++ b/bootloaders/diskloader/src/DiskLoader.cpp
@@ -218,6 +218,7 @@ int main()
 			if (cmd == 'Q')
 				break;
 		}
+		_timeout = 1;		// signal to exit the bootloader
 		_ejected = 1;
 	}
 }
diff --git a/bootloaders/diskloader/src/USBCore.cpp b/bootloaders/diskloader/src/USBCore.cpp
index 52b960a..8b071a1 100644
--- a/bootloaders/diskloader/src/USBCore.cpp
+++ b/bootloaders/diskloader/src/USBCore.cpp
@@ -520,7 +520,7 @@ int USBGetChar()
 			Reboot();	// USB not connected, run firmware
 		}
 
-//		LEDPulse();
+		LEDPulse();
 	}
 	return -1;
 }
-- 
cgit v1.2.3-18-g5258