[gnoduino: 189/237] uploading now completes using RC2 on Win7
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnoduino: 189/237] uploading now completes using RC2 on Win7
- Date: Sat, 31 Mar 2012 20:30:43 +0000 (UTC)
commit 905a68c568b7d8d754d81a6580fd0a8182938abc
Author: Zach Eveland <zeveland blacklabel-development com>
Date: Wed Oct 26 11:28:07 2011 -0400
uploading now completes using RC2 on Win7
.../nuevo_diskloader/DiskLoader.elf.hex | 327 ++++++++++----------
.../bootloaders/nuevo_diskloader/DiskLoader.hex | 327 ++++++++++----------
arduino/bootloaders/nuevo_diskloader/Makefile | 2 +-
.../nuevo_diskloader/src/DiskLoader.cpp | 17 +-
4 files changed, 333 insertions(+), 340 deletions(-)
---
diff --git a/arduino/bootloaders/nuevo_diskloader/DiskLoader.elf.hex b/arduino/bootloaders/nuevo_diskloader/DiskLoader.elf.hex
index 4df1b58..90201d9 100644
--- a/arduino/bootloaders/nuevo_diskloader/DiskLoader.elf.hex
+++ b/arduino/bootloaders/nuevo_diskloader/DiskLoader.elf.hex
@@ -1,166 +1,167 @@
-:10700000BBC00000DEC00000DCC00000DAC0000031
-:10701000D8C00000D6C00000D4C00000D2C000001C
-:10702000D0C00000CEC0000061C30000D3C3000088
-:10703000C8C00000C6C00000C4C00000C2C000003C
-:10704000C0C00000BEC00000BCC00000BAC000004C
-:10705000B8C00000B6C00000B4C00000B2C000005C
-:10706000B0C00000AEC00000ACC00000AAC000006C
-:10707000A8C00000A6C00000A4C00000A2C000007C
-:10708000A0C000009EC000009CC000009AC000008C
-:1070900098C0000096C0000094C0000092C000009C
-:1070A00090C000008EC000008CC0000011241FBEE4
-:1070B000CFEFDAE0F7C0080B00020202010009047A
-:1070C0000000010202000005240010010524010156
-:1070D00001042402060524060001070581031000AF
-:1070E0004009040100020A000000070502024000F6
-:1070F0000007058302400000410142144505560483
-:1071000055026403740300001E95870201100300FA
-:107110000403090422030000000000000000000036
+:10700000BDC00000E0C00000DEC00000DCC0000029
+:10701000DAC00000D8C00000D6C00000D4C0000014
+:10702000D2C00000D0C0000063C30000D5C3000080
+:10703000CAC00000C8C00000C6C00000C4C0000034
+:10704000C2C00000C0C00000BEC00000BCC0000044
+:10705000BAC00000B8C00000B6C00000B4C0000054
+:10706000B2C00000B0C00000AEC00000ACC0000064
+:10707000AAC00000A8C00000A6C00000A4C0000074
+:10708000A2C00000A0C000009EC000009CC0000084
+:107090009AC0000098C0000096C0000094C0000094
+:1070A00092C0000090C000008EC0000011241FBEDE
+:1070B000CFEFDAE0DEBFCDBFF7C0080B000202025F
+:1070C0000100090400000102020000052400100173
+:1070D0000524010101042402060524060001070518
+:1070E000810310004009040100020A0000000705A6
+:1070F00002024000000705830240000041014214E3
+:107100004505560455026403740300001E9587026A
+:107110000110030004030904220300000000000022
:10712000000000000000000000000000000000005F
-:1071300000000000000018034100720064007500A8
-:1071400069006E006F0020004C004C0043001201EB
-:1071500000020000004041238800000101020001FC
-:1071600012010002020000404123880000010102D8
-:10717000000100C18081DA3B11241FBECFEFDAE0AD
-:10718000DEBFCDBF11E0A0E0B1E0E0E3FAE702C06E
-:1071900005900D92A830B107D9F711E0A8E0B1E051
-:1071A00001C01D92A539B107E1F711E7C8E7D1E7A2
-:1071B00003C02297FE0136D4C637D107D1F772D06B
-:1071C00035C41ECFFC0180818E5F808380E866EB32
-:1071D00070E742E450E03CC2FC0181819081913A29
-:1071E00049F48132C1F480E060E071E047E050E0B2
-:1071F0002FD20FC0913279F4803231F480E091E0E7
-:1072000067E070E061D205C0823229F48281809308
-:10721000070181E0089580E00895FF920F931F9386
-:10722000CF93DF93982F8B01FF2488E76030780796
-:1072300038F4FF24F39483E0FB0180935700E89532
-:10724000C42FD0E0892F68E071E0AE01FCD0FF20B0
-:1072500019F107B600FCFDCFD595C7954C2FF80165
-:10726000A8E0B1E020E031E009C08D919D910C01D2
-:1072700030935700E895112432962F5F2417A8F316
-:1072800085E0F80180935700E89507B600FCFDCF34
-:1072900081E180935700E895DF91CF911F910F9185
-:1072A000FF90089588E10FB6F894809360001092E3
-:1072B00060000FBE3F9A209A6E9A90E8909361000A
-:1072C0001092610081E885BF95BF01E005BF02E033
-:1072D00005BF769A289A479884E991E055D2789428
-:1072E00084E18093880180E180938901CC24DD24AE
-:1072F00082E0A0D08823E1F382E0F6D0E82E88EF88
-:1073000090E7FC0124913196029644912E1511F0DC
-:107310002223B9F710928B0110928A0150E082E08B
-:1073200068E071E090D0F1E4EF1679F46091080123
-:107330006058633028F0683111F064E001C063E008
-:10734000C62FD0E0C55FDE4810C026E5E21681F406
-:1073500080910801803319F0FF24F39428C08091B4
-:107360000A01C82FD0E0C85FDE48FF24F39427C08D
-:1073700085E7E81629F423E0F22EC8E0D1E71FC024
-:10738000E5E5EE1639F4C0900801D0900901CC0C67
-:10739000DD1C0CC0F4E6EF1631F482E0B60140913A
-:1073A00009013BDF03C024E7E21621F0FF24CFE010
-:1073B000D1E705C0F0900901E601CF0CD11C08E827
-:1073C00013E1015010400930110501F182E032D083
-:1073D0008823E1F4F6CF809709F088CF83E068E84E
-:1073E00071E041E050E0A8D0FF2029F04F2D50E09F
-:1073F00083E8BE01A1D083E469E871E041E050E098
-:107400009BD081E5E81609F073CF70CF82E06CD095
-:10741000EFEF8F3F9E07F9F6E1CFFC0104C08091AA
-:10742000F100819361506623D1F7289884E6809318
-:107430008D0108959FB7F89487708093E90080913B
-:10744000F2009FBF0895FB018093E90024E69BE6CC
-:1074500010C08091E80085FFFCCF289820938D0113
-:107460008091F10081938091E80085FD02C09093A6
-:10747000E800415050408FEF4F3F580751F70895B3
-:10748000282F80918E018823C1F057FF1AC015C0A4
-:10749000289890938D018091F1008193E217F30772
-:1074A000B9F74115510539F08091F200882319F49C
-:1074B0008BE68093E800AFBF02C04FEF5FEFCA01D9
-:1074C0000895AFB7F89427702093E9008091F200F7
-:1074D000282F30E0241735070CF4A901FB019B018C
-:1074E000240F311D94E6DACFDF93CF930F92CDB7FF
-:1074F000DEB7BE016F5F7F4F41E050E0C1DF019713
-:1075000019F08FEF9FEF02C0898190E00F90CF912B
-:10751000DF9108952FB7F89487708093E9008091E8
-:10752000E80085FD02C090E004C08091F20090E484
-:10753000981B2FBF892F08955F926F927F928F9231
-:107540009F92AF92BF92CF92DF92EF92FF920F93F2
-:107550001F93CF93DF93F82E6A0180918E018823C9
-:1075600019F44FEF5FEF63C08B01EA0157E0E52E9E
-:10757000EF208F2D90E040E2842E912C88229922DA
-:107580003AE3532E20E4A22EB12CA822B92280EA9D
-:10759000682E8FE0782E43C08F2DBCDF282F8823E4
-:1075A00021F4C3010197F1F73AC090E0C817D90759
-:1075B0000CF42C2FC21BD1094FB7F894E092E900CC
-:1075C0008114910421F406C01092F100215022236D
-:1075D000D9F719C0F7FC03C0F801922F10C0C801F9
-:1075E000322F06C0FC010196E491E093F100315086
-:1075F0003323C1F706C081918093F1009150992304
-:10760000D1F7020F111D8091E80085FF05C020977A
-:1076100029F4A114B10411F05092E8004FBF209753
-:1076200009F0BACF769884E680938C01A601CA014E
-:10763000DF91CF911F910F91FF90EF90DF90CF904E
-:10764000BF90AF909F908F907F906F905F900895C4
-:107650000F931F93182FFB01A0919101B0919201FC
-:10766000BA010EEF2AC017FF02C0949101C09081A9
-:1076700020918F01309190012A173B07ACF4809143
-:10768000E8008570E1F38091E80082FF03C04FEFCE
-:107690005FEF16C09093F100C90101968F7390704F
-:1076A000892B11F40093E8002F5F3F4F3093900136
-:1076B00020938F016150704031966115710599F6E4
-:1076C000CA011F910F910895CF93DF939C01EB01A5
-:1076D0008091E80082FFFCCFC9016C2F9EDE8BEF0A
-:1076E0008093E800CE01DF91CF9108951F920F9211
-:1076F0000FB60F9211242F933F938F938091E10047
-:107700001092E100282F83FF0FC01092E90081E062
-:107710008093EB001092EC0082E38093ED001092D6
-:107720008E0188E08093F00022FF26C083E08093E2
-:10773000E9008091F200882319F08AE38093E80041
-:1077400080918C01882351F080918C01815080932D
-:107750008C0180918C01882309F4769A80918D01A7
-:10776000882351F080918D01815080938D0180910B
-:107770008D01882309F4289A8F913F912F910F90C2
-:107780000FBE0F901F90189510928E0181E080938C
-:10779000D70080EA8093D80082E189BD09B400FE59
-:1077A000FDCF80E98093D8008CE08093E2001092B6
-:1077B000E00008950895DF93CF930F92CDB7DEB721
-:1077C0001982CE010196FEDC898190E00F90CF9165
-:1077D000DF9108951F920F920FB60F921124EF922E
-:1077E000FF921F932F933F934F935F936F937F93DA
-:1077F0008F939F93AF93BF93EF93FF93DF93CF93B9
-:10780000CDB7DEB76197DEBFCDBF1092E9008091A2
-:10781000E80083FFECC0CE01019668E0FEDD82EF58
-:107820008093E800998197FF05C08091E80080FF70
-:10783000FCCF03C08EEF8093E800292F30E0C90110
-:1078400080769070892B09F0B3C08A81882329F44F
-:107850001092F1001092F100BFC0813009F4BCC059
-:10786000833009F4B9C0853049F48091E80080FF85
-:10787000FCCF8B8180688093E300AEC0863009F036
-:107880006DC01C81EF80F8841230A9F51092E900D8
-:107890001092900110928F0110929201109291011A
-:1078A0008ADF99E0FE013996DF01292F1D922A9582
-:1078B000E9F799871A8791E09E8790E8988B9AEF6D
-:1078C000998B20918F0130919001275F3F4F3C872A
-:1078D0002B878D871092E9001092900110928F01F2
-:1078E000F0929201E092910180E0BF0149E050E006
-:1078F000AFDE61DF71C01092E9001092900110922A
-:107900008F01F0929201E0929101113071F488E0C0
-:10791000E816F10411F410939301809193018823E8
-:1079200009F062C0EEE4F1E713C0133009F058C06B
-:107930008B81882319F4E0E1F1E70AC0823019F461
-:10794000E4E1F1E705C0813009F04AC0E6E3F1E780
-:10795000449150E080E8BF017BDE3EC0873009F4EF
-:107960003FC0883021F481E08093F10035C0893038
-:1079700099F523703070232B99F5E3E7F1E791E057
-:1079800031E026E39093E9003093EB0084918093FB
-:10799000EC002093ED009F5F3196943099F78EE7CD
-:1079A0008093EA001092EA008B8180938E0114C0CC
-:1079B0008F8198851092E9001092900110928F01AA
-:1079C00090939201809391018D81882349F4CE0197
-:1079D000019602DC882321F08EEF8093E80007C037
-:1079E00081E28093EB0003C0E0E6F1E7B1CF61965E
-:1079F000DEBFCDBFCF91DF91FF91EF91BF91AF91EE
-:107A00009F918F917F916F915F914F913F912F91B6
-:107A10001F91FF90EF900F900FBE0F901F90189541
-:107A2000EE0FFF1F0590F491E02D0994F894FFCF1D
-:087A300000E10000000000006D
+:107130000000000000000000000018034100720081
+:107140006400750069006E006F0020004C004C0068
+:1071500043001201000200000040412389000001A9
+:1071600001020001120100020200004041238900D7
+:1071700000010102000100C18081DC3B11241FBE1F
+:10718000CFEFDAE0DEBFCDBF11E0A0E0B1E0E4E395
+:10719000FAE702C005900D92A830B107D9F711E0C7
+:1071A000A8E0B1E001C01D92A539B107E1F711E7F0
+:1071B000CCE7D1E703C02297FE0136D4CA37D10706
+:1071C000D1F772D035C41CCFFC0180818E5F8083E3
+:1071D00080E86AEB70E742E450E03CC2FC01818148
+:1071E0009081913A49F48132C1F480E060E071E02D
+:1071F00047E050E02FD20FC0913279F4803231F461
+:1072000080E091E067E070E061D205C0823229F44D
+:1072100082818093070181E0089580E00895FF92C4
+:107220000F931F93CF93DF93982F8B01FF2480E759
+:107230006030780738F4FF24F39483E0FB018093F7
+:107240005700E895C42FD0E0892F68E071E0AE01C7
+:10725000FCD0FF2019F107B600FCFDCFD595C795EE
+:107260004C2FF801A8E0B1E020E031E009C08D9199
+:107270009D910C0130935700E895112432962F5FB1
+:107280002417A8F385E0F80180935700E89507B626
+:1072900000FCFDCF81E180935700E895DF91CF910D
+:1072A0001F910F91FF90089588E10FB6F894809395
+:1072B0006000109260000FBE3F9A209A6E9A90E88C
+:1072C000909361001092610081E885BF95BF01E055
+:1072D00005BF02E005BF769A289A479884E991E0B5
+:1072E00055D2789484E18093880180E1809389016C
+:1072F000CC24DD2482E0A0D08823E1F382E0F6D024
+:10730000E82E8CEF90E7FC0124913196029644918F
+:107310002E1511F02223B9F710928B0110928A01D9
+:1073200050E082E068E071E090D0F1E4EF1679F48B
+:10733000609108016058633028F0683111F064E012
+:1073400001C063E0C62FD0E0C15FDE4810C026E573
+:10735000E21681F480910801803319F0FF24F39440
+:1073600028C080910A01C82FD0E0C45FDE48FF2406
+:10737000F39427C085E7E81629F423E0F22ECCE049
+:10738000D1E71FC0E5E5EE1639F4C0900801D090B2
+:107390000901CC0CDD1C0CC0F4E6EF1631F482E0E0
+:1073A000B601409109013BDF03C024E7E21621F05A
+:1073B000FF24C3E1D1E705C0F0900901E601CF0C3D
+:1073C000D11C08E813E1015010400930110501F10A
+:1073D00082E032D08823E1F4F6CF809709F088CF9D
+:1073E00083E068E871E041E050E0A8D0FF2029F098
+:1073F0004F2D50E083E8BE01A1D083E469E871E03D
+:1074000041E050E09BD081E5E81609F073CF70CFE2
+:1074100082E06CD0EFEF8F3F9E07F9F6E1CFFC01E1
+:1074200004C08091F100819361506623D1F72898C0
+:1074300084E680938D0108959FB7F89487708093B8
+:10744000E9008091F2009FBF0895FB018093E9005D
+:1074500024E69BE610C08091E80085FFFCCF2898C9
+:1074600020938D018091F10081938091E80085FD4A
+:1074700002C09093E800415050408FEF4F3F5807B3
+:1074800051F70895282F80918E018823C1F057FF6E
+:107490001AC015C0289890938D018091F1008193B6
+:1074A000E217F307B9F74115510539F08091F20061
+:1074B000882319F48BE68093E800AFBF02C04FEF3A
+:1074C0005FEFCA010895AFB7F89427702093E900E1
+:1074D0008091F200282F30E0241735070CF4A90121
+:1074E000FB019B01240F311D94E6DACFDF93CF938C
+:1074F0000F92CDB7DEB7BE016F5F7F4F41E050E026
+:10750000C1DF019719F08FEF9FEF02C0898190E0F2
+:107510000F90CF91DF9108952FB7F89487708093E3
+:10752000E9008091E80085FD02C090E004C08091F0
+:10753000F20090E4981B2FBF892F08955F926F92FD
+:107540007F928F929F92AF92BF92CF92DF92EF92F3
+:10755000FF920F931F93CF93DF93F82E6A018091D0
+:107560008E01882319F44FEF5FEF63C08B01EA01AE
+:1075700057E0E52EEF208F2D90E040E2842E912CF5
+:10758000882299223AE3532E20E4A22EB12CA8227D
+:10759000B92280EA682E8FE0782E43C08F2DBCDFA1
+:1075A000282F882321F4C3010197F1F73AC090E016
+:1075B000C817D9070CF42C2FC21BD1094FB7F89468
+:1075C000E092E9008114910421F406C01092F100C8
+:1075D00021502223D9F719C0F7FC03C0F801922FDC
+:1075E00010C0C801322F06C0FC010196E491E0935F
+:1075F000F10031503323C1F706C081918093F1002F
+:1076000091509923D1F7020F111D8091E80085FF59
+:1076100005C0209729F4A114B10411F05092E8009C
+:107620004FBF209709F0BACF769884E680938C01FB
+:10763000A601CA01DF91CF911F910F91FF90EF90AA
+:10764000DF90CF90BF90AF909F908F907F906F9082
+:107650005F9008950F931F93182FFB01A091910144
+:10766000B0919201BA010EEF2AC017FF02C09491A7
+:1076700001C0908120918F01309190012A173B0722
+:10768000ACF48091E8008570E1F38091E80082FF1E
+:1076900003C04FEF5FEF16C09093F100C901019650
+:1076A0008F739070892B11F40093E8002F5F3F4F88
+:1076B0003093900120938F01615070403196611595
+:1076C000710599F6CA011F910F910895CF93DF9329
+:1076D0009C01EB018091E80082FFFCCFC9016C2F77
+:1076E0009EDE8BEF8093E800CE01DF91CF9108956D
+:1076F0001F920F920FB60F9211242F933F938F93E7
+:107700008091E1001092E100282F83FF0FC01092BA
+:10771000E90081E08093EB001092EC0082E380931B
+:10772000ED0010928E0188E08093F00022FF26C0C9
+:1077300083E08093E9008091F200882319F08AE3C6
+:107740008093E80080918C01882351F080918C0116
+:10775000815080938C0180918C01882309F4769A62
+:1077600080918D01882351F080918D01815080930B
+:107770008D0180918D01882309F4289A8F913F9182
+:107780002F910F900FBE0F901F90189510928E01A1
+:1077900081E08093D70080EA8093D80082E189BDA0
+:1077A00009B400FEFDCF80E98093D8008CE080937F
+:1077B000E2001092E00008950895DF93CF930F92B6
+:1077C000CDB7DEB71982CE010196FEDC898190E04B
+:1077D0000F90CF91DF9108951F920F920FB60F92E5
+:1077E0001124EF92FF921F932F933F934F935F9338
+:1077F0006F937F938F939F93AF93BF93EF93FF9379
+:10780000DF93CF93CDB7DEB76197DEBFCDBF1092C8
+:10781000E9008091E80083FFECC0CE01019668E0AA
+:10782000FEDD82EF8093E800998197FF05C080918B
+:10783000E80080FFFCCF03C08EEF8093E800292F83
+:1078400030E0C90180769070892B09F0B3C08A813D
+:10785000882329F41092F1001092F100BFC081300A
+:1078600009F4BCC0833009F4B9C0853049F4809173
+:10787000E80080FFFCCF8B8180688093E300AEC07E
+:10788000863009F06DC01C81EF80F8841230A9F5B4
+:107890001092E9001092900110928F0110929201C3
+:1078A000109291018ADF99E0FE013996DF01292FBC
+:1078B0001D922A95E9F799871A8791E09E8790E8AB
+:1078C000988B9AEF998B20918F0130919001275FCF
+:1078D0003F4F3C872B878D871092E90010929001D3
+:1078E00010928F01F0929201E092910180E0BF012D
+:1078F00049E050E0AFDE61DF71C01092E900109204
+:10790000900110928F01F0929201E092910111305A
+:1079100071F488E0E816F10411F41093930180915A
+:107920009301882309F062C0E2E5F1E713C0133048
+:1079300009F058C08B81882319F4E4E1F1E70AC00B
+:10794000823019F4E8E1F1E705C0813009F04AC05E
+:10795000EAE3F1E7449150E080E8BF017BDE3EC0FE
+:10796000873009F43FC0883021F481E08093F10032
+:1079700035C0893099F523703070232B99F5E7E7EE
+:10798000F1E791E031E026E39093E9003093EB00DA
+:1079900084918093EC002093ED009F5F31969430AA
+:1079A00099F78EE78093EA001092EA008B8180932A
+:1079B0008E0114C08F8198851092E9001092900179
+:1079C00010928F0190939201809391018D81882371
+:1079D00049F4CE01019602DC882321F08EEF8093DA
+:1079E000E80007C081E28093EB0003C0E4E6F1E722
+:1079F000B1CF6196DEBFCDBFCF91DF91FF91EF9107
+:107A0000BF91AF919F918F917F916F915F914F91B6
+:107A10003F912F911F91FF90EF900F900FBE0F900D
+:107A20001F901895EE0FFF1F0590F491E02D09941B
+:047A3000F894FFCFF8
+:087A340000E100000000000069
:040000030000700089
:00000001FF
diff --git a/arduino/bootloaders/nuevo_diskloader/DiskLoader.hex b/arduino/bootloaders/nuevo_diskloader/DiskLoader.hex
index 4df1b58..90201d9 100644
--- a/arduino/bootloaders/nuevo_diskloader/DiskLoader.hex
+++ b/arduino/bootloaders/nuevo_diskloader/DiskLoader.hex
@@ -1,166 +1,167 @@
-:10700000BBC00000DEC00000DCC00000DAC0000031
-:10701000D8C00000D6C00000D4C00000D2C000001C
-:10702000D0C00000CEC0000061C30000D3C3000088
-:10703000C8C00000C6C00000C4C00000C2C000003C
-:10704000C0C00000BEC00000BCC00000BAC000004C
-:10705000B8C00000B6C00000B4C00000B2C000005C
-:10706000B0C00000AEC00000ACC00000AAC000006C
-:10707000A8C00000A6C00000A4C00000A2C000007C
-:10708000A0C000009EC000009CC000009AC000008C
-:1070900098C0000096C0000094C0000092C000009C
-:1070A00090C000008EC000008CC0000011241FBEE4
-:1070B000CFEFDAE0F7C0080B00020202010009047A
-:1070C0000000010202000005240010010524010156
-:1070D00001042402060524060001070581031000AF
-:1070E0004009040100020A000000070502024000F6
-:1070F0000007058302400000410142144505560483
-:1071000055026403740300001E95870201100300FA
-:107110000403090422030000000000000000000036
+:10700000BDC00000E0C00000DEC00000DCC0000029
+:10701000DAC00000D8C00000D6C00000D4C0000014
+:10702000D2C00000D0C0000063C30000D5C3000080
+:10703000CAC00000C8C00000C6C00000C4C0000034
+:10704000C2C00000C0C00000BEC00000BCC0000044
+:10705000BAC00000B8C00000B6C00000B4C0000054
+:10706000B2C00000B0C00000AEC00000ACC0000064
+:10707000AAC00000A8C00000A6C00000A4C0000074
+:10708000A2C00000A0C000009EC000009CC0000084
+:107090009AC0000098C0000096C0000094C0000094
+:1070A00092C0000090C000008EC0000011241FBEDE
+:1070B000CFEFDAE0DEBFCDBFF7C0080B000202025F
+:1070C0000100090400000102020000052400100173
+:1070D0000524010101042402060524060001070518
+:1070E000810310004009040100020A0000000705A6
+:1070F00002024000000705830240000041014214E3
+:107100004505560455026403740300001E9587026A
+:107110000110030004030904220300000000000022
:10712000000000000000000000000000000000005F
-:1071300000000000000018034100720064007500A8
-:1071400069006E006F0020004C004C0043001201EB
-:1071500000020000004041238800000101020001FC
-:1071600012010002020000404123880000010102D8
-:10717000000100C18081DA3B11241FBECFEFDAE0AD
-:10718000DEBFCDBF11E0A0E0B1E0E0E3FAE702C06E
-:1071900005900D92A830B107D9F711E0A8E0B1E051
-:1071A00001C01D92A539B107E1F711E7C8E7D1E7A2
-:1071B00003C02297FE0136D4C637D107D1F772D06B
-:1071C00035C41ECFFC0180818E5F808380E866EB32
-:1071D00070E742E450E03CC2FC0181819081913A29
-:1071E00049F48132C1F480E060E071E047E050E0B2
-:1071F0002FD20FC0913279F4803231F480E091E0E7
-:1072000067E070E061D205C0823229F48281809308
-:10721000070181E0089580E00895FF920F931F9386
-:10722000CF93DF93982F8B01FF2488E76030780796
-:1072300038F4FF24F39483E0FB0180935700E89532
-:10724000C42FD0E0892F68E071E0AE01FCD0FF20B0
-:1072500019F107B600FCFDCFD595C7954C2FF80165
-:10726000A8E0B1E020E031E009C08D919D910C01D2
-:1072700030935700E895112432962F5F2417A8F316
-:1072800085E0F80180935700E89507B600FCFDCF34
-:1072900081E180935700E895DF91CF911F910F9185
-:1072A000FF90089588E10FB6F894809360001092E3
-:1072B00060000FBE3F9A209A6E9A90E8909361000A
-:1072C0001092610081E885BF95BF01E005BF02E033
-:1072D00005BF769A289A479884E991E055D2789428
-:1072E00084E18093880180E180938901CC24DD24AE
-:1072F00082E0A0D08823E1F382E0F6D0E82E88EF88
-:1073000090E7FC0124913196029644912E1511F0DC
-:107310002223B9F710928B0110928A0150E082E08B
-:1073200068E071E090D0F1E4EF1679F46091080123
-:107330006058633028F0683111F064E001C063E008
-:10734000C62FD0E0C55FDE4810C026E5E21681F406
-:1073500080910801803319F0FF24F39428C08091B4
-:107360000A01C82FD0E0C85FDE48FF24F39427C08D
-:1073700085E7E81629F423E0F22EC8E0D1E71FC024
-:10738000E5E5EE1639F4C0900801D0900901CC0C67
-:10739000DD1C0CC0F4E6EF1631F482E0B60140913A
-:1073A00009013BDF03C024E7E21621F0FF24CFE010
-:1073B000D1E705C0F0900901E601CF0CD11C08E827
-:1073C00013E1015010400930110501F182E032D083
-:1073D0008823E1F4F6CF809709F088CF83E068E84E
-:1073E00071E041E050E0A8D0FF2029F04F2D50E09F
-:1073F00083E8BE01A1D083E469E871E041E050E098
-:107400009BD081E5E81609F073CF70CF82E06CD095
-:10741000EFEF8F3F9E07F9F6E1CFFC0104C08091AA
-:10742000F100819361506623D1F7289884E6809318
-:107430008D0108959FB7F89487708093E90080913B
-:10744000F2009FBF0895FB018093E90024E69BE6CC
-:1074500010C08091E80085FFFCCF289820938D0113
-:107460008091F10081938091E80085FD02C09093A6
-:10747000E800415050408FEF4F3F580751F70895B3
-:10748000282F80918E018823C1F057FF1AC015C0A4
-:10749000289890938D018091F1008193E217F30772
-:1074A000B9F74115510539F08091F200882319F49C
-:1074B0008BE68093E800AFBF02C04FEF5FEFCA01D9
-:1074C0000895AFB7F89427702093E9008091F200F7
-:1074D000282F30E0241735070CF4A901FB019B018C
-:1074E000240F311D94E6DACFDF93CF930F92CDB7FF
-:1074F000DEB7BE016F5F7F4F41E050E0C1DF019713
-:1075000019F08FEF9FEF02C0898190E00F90CF912B
-:10751000DF9108952FB7F89487708093E9008091E8
-:10752000E80085FD02C090E004C08091F20090E484
-:10753000981B2FBF892F08955F926F927F928F9231
-:107540009F92AF92BF92CF92DF92EF92FF920F93F2
-:107550001F93CF93DF93F82E6A0180918E018823C9
-:1075600019F44FEF5FEF63C08B01EA0157E0E52E9E
-:10757000EF208F2D90E040E2842E912C88229922DA
-:107580003AE3532E20E4A22EB12CA822B92280EA9D
-:10759000682E8FE0782E43C08F2DBCDF282F8823E4
-:1075A00021F4C3010197F1F73AC090E0C817D90759
-:1075B0000CF42C2FC21BD1094FB7F894E092E900CC
-:1075C0008114910421F406C01092F100215022236D
-:1075D000D9F719C0F7FC03C0F801922F10C0C801F9
-:1075E000322F06C0FC010196E491E093F100315086
-:1075F0003323C1F706C081918093F1009150992304
-:10760000D1F7020F111D8091E80085FF05C020977A
-:1076100029F4A114B10411F05092E8004FBF209753
-:1076200009F0BACF769884E680938C01A601CA014E
-:10763000DF91CF911F910F91FF90EF90DF90CF904E
-:10764000BF90AF909F908F907F906F905F900895C4
-:107650000F931F93182FFB01A0919101B0919201FC
-:10766000BA010EEF2AC017FF02C0949101C09081A9
-:1076700020918F01309190012A173B07ACF4809143
-:10768000E8008570E1F38091E80082FF03C04FEFCE
-:107690005FEF16C09093F100C90101968F7390704F
-:1076A000892B11F40093E8002F5F3F4F3093900136
-:1076B00020938F016150704031966115710599F6E4
-:1076C000CA011F910F910895CF93DF939C01EB01A5
-:1076D0008091E80082FFFCCFC9016C2F9EDE8BEF0A
-:1076E0008093E800CE01DF91CF9108951F920F9211
-:1076F0000FB60F9211242F933F938F938091E10047
-:107700001092E100282F83FF0FC01092E90081E062
-:107710008093EB001092EC0082E38093ED001092D6
-:107720008E0188E08093F00022FF26C083E08093E2
-:10773000E9008091F200882319F08AE38093E80041
-:1077400080918C01882351F080918C01815080932D
-:107750008C0180918C01882309F4769A80918D01A7
-:10776000882351F080918D01815080938D0180910B
-:107770008D01882309F4289A8F913F912F910F90C2
-:107780000FBE0F901F90189510928E0181E080938C
-:10779000D70080EA8093D80082E189BD09B400FE59
-:1077A000FDCF80E98093D8008CE08093E2001092B6
-:1077B000E00008950895DF93CF930F92CDB7DEB721
-:1077C0001982CE010196FEDC898190E00F90CF9165
-:1077D000DF9108951F920F920FB60F921124EF922E
-:1077E000FF921F932F933F934F935F936F937F93DA
-:1077F0008F939F93AF93BF93EF93FF93DF93CF93B9
-:10780000CDB7DEB76197DEBFCDBF1092E9008091A2
-:10781000E80083FFECC0CE01019668E0FEDD82EF58
-:107820008093E800998197FF05C08091E80080FF70
-:10783000FCCF03C08EEF8093E800292F30E0C90110
-:1078400080769070892B09F0B3C08A81882329F44F
-:107850001092F1001092F100BFC0813009F4BCC059
-:10786000833009F4B9C0853049F48091E80080FF85
-:10787000FCCF8B8180688093E300AEC0863009F036
-:107880006DC01C81EF80F8841230A9F51092E900D8
-:107890001092900110928F0110929201109291011A
-:1078A0008ADF99E0FE013996DF01292F1D922A9582
-:1078B000E9F799871A8791E09E8790E8988B9AEF6D
-:1078C000998B20918F0130919001275F3F4F3C872A
-:1078D0002B878D871092E9001092900110928F01F2
-:1078E000F0929201E092910180E0BF0149E050E006
-:1078F000AFDE61DF71C01092E9001092900110922A
-:107900008F01F0929201E0929101113071F488E0C0
-:10791000E816F10411F410939301809193018823E8
-:1079200009F062C0EEE4F1E713C0133009F058C06B
-:107930008B81882319F4E0E1F1E70AC0823019F461
-:10794000E4E1F1E705C0813009F04AC0E6E3F1E780
-:10795000449150E080E8BF017BDE3EC0873009F4EF
-:107960003FC0883021F481E08093F10035C0893038
-:1079700099F523703070232B99F5E3E7F1E791E057
-:1079800031E026E39093E9003093EB0084918093FB
-:10799000EC002093ED009F5F3196943099F78EE7CD
-:1079A0008093EA001092EA008B8180938E0114C0CC
-:1079B0008F8198851092E9001092900110928F01AA
-:1079C00090939201809391018D81882349F4CE0197
-:1079D000019602DC882321F08EEF8093E80007C037
-:1079E00081E28093EB0003C0E0E6F1E7B1CF61965E
-:1079F000DEBFCDBFCF91DF91FF91EF91BF91AF91EE
-:107A00009F918F917F916F915F914F913F912F91B6
-:107A10001F91FF90EF900F900FBE0F901F90189541
-:107A2000EE0FFF1F0590F491E02D0994F894FFCF1D
-:087A300000E10000000000006D
+:107130000000000000000000000018034100720081
+:107140006400750069006E006F0020004C004C0068
+:1071500043001201000200000040412389000001A9
+:1071600001020001120100020200004041238900D7
+:1071700000010102000100C18081DC3B11241FBE1F
+:10718000CFEFDAE0DEBFCDBF11E0A0E0B1E0E4E395
+:10719000FAE702C005900D92A830B107D9F711E0C7
+:1071A000A8E0B1E001C01D92A539B107E1F711E7F0
+:1071B000CCE7D1E703C02297FE0136D4CA37D10706
+:1071C000D1F772D035C41CCFFC0180818E5F8083E3
+:1071D00080E86AEB70E742E450E03CC2FC01818148
+:1071E0009081913A49F48132C1F480E060E071E02D
+:1071F00047E050E02FD20FC0913279F4803231F461
+:1072000080E091E067E070E061D205C0823229F44D
+:1072100082818093070181E0089580E00895FF92C4
+:107220000F931F93CF93DF93982F8B01FF2480E759
+:107230006030780738F4FF24F39483E0FB018093F7
+:107240005700E895C42FD0E0892F68E071E0AE01C7
+:10725000FCD0FF2019F107B600FCFDCFD595C795EE
+:107260004C2FF801A8E0B1E020E031E009C08D9199
+:107270009D910C0130935700E895112432962F5FB1
+:107280002417A8F385E0F80180935700E89507B626
+:1072900000FCFDCF81E180935700E895DF91CF910D
+:1072A0001F910F91FF90089588E10FB6F894809395
+:1072B0006000109260000FBE3F9A209A6E9A90E88C
+:1072C000909361001092610081E885BF95BF01E055
+:1072D00005BF02E005BF769A289A479884E991E0B5
+:1072E00055D2789484E18093880180E1809389016C
+:1072F000CC24DD2482E0A0D08823E1F382E0F6D024
+:10730000E82E8CEF90E7FC0124913196029644918F
+:107310002E1511F02223B9F710928B0110928A01D9
+:1073200050E082E068E071E090D0F1E4EF1679F48B
+:10733000609108016058633028F0683111F064E012
+:1073400001C063E0C62FD0E0C15FDE4810C026E573
+:10735000E21681F480910801803319F0FF24F39440
+:1073600028C080910A01C82FD0E0C45FDE48FF2406
+:10737000F39427C085E7E81629F423E0F22ECCE049
+:10738000D1E71FC0E5E5EE1639F4C0900801D090B2
+:107390000901CC0CDD1C0CC0F4E6EF1631F482E0E0
+:1073A000B601409109013BDF03C024E7E21621F05A
+:1073B000FF24C3E1D1E705C0F0900901E601CF0C3D
+:1073C000D11C08E813E1015010400930110501F10A
+:1073D00082E032D08823E1F4F6CF809709F088CF9D
+:1073E00083E068E871E041E050E0A8D0FF2029F098
+:1073F0004F2D50E083E8BE01A1D083E469E871E03D
+:1074000041E050E09BD081E5E81609F073CF70CFE2
+:1074100082E06CD0EFEF8F3F9E07F9F6E1CFFC01E1
+:1074200004C08091F100819361506623D1F72898C0
+:1074300084E680938D0108959FB7F89487708093B8
+:10744000E9008091F2009FBF0895FB018093E9005D
+:1074500024E69BE610C08091E80085FFFCCF2898C9
+:1074600020938D018091F10081938091E80085FD4A
+:1074700002C09093E800415050408FEF4F3F5807B3
+:1074800051F70895282F80918E018823C1F057FF6E
+:107490001AC015C0289890938D018091F1008193B6
+:1074A000E217F307B9F74115510539F08091F20061
+:1074B000882319F48BE68093E800AFBF02C04FEF3A
+:1074C0005FEFCA010895AFB7F89427702093E900E1
+:1074D0008091F200282F30E0241735070CF4A90121
+:1074E000FB019B01240F311D94E6DACFDF93CF938C
+:1074F0000F92CDB7DEB7BE016F5F7F4F41E050E026
+:10750000C1DF019719F08FEF9FEF02C0898190E0F2
+:107510000F90CF91DF9108952FB7F89487708093E3
+:10752000E9008091E80085FD02C090E004C08091F0
+:10753000F20090E4981B2FBF892F08955F926F92FD
+:107540007F928F929F92AF92BF92CF92DF92EF92F3
+:10755000FF920F931F93CF93DF93F82E6A018091D0
+:107560008E01882319F44FEF5FEF63C08B01EA01AE
+:1075700057E0E52EEF208F2D90E040E2842E912CF5
+:10758000882299223AE3532E20E4A22EB12CA8227D
+:10759000B92280EA682E8FE0782E43C08F2DBCDFA1
+:1075A000282F882321F4C3010197F1F73AC090E016
+:1075B000C817D9070CF42C2FC21BD1094FB7F89468
+:1075C000E092E9008114910421F406C01092F100C8
+:1075D00021502223D9F719C0F7FC03C0F801922FDC
+:1075E00010C0C801322F06C0FC010196E491E0935F
+:1075F000F10031503323C1F706C081918093F1002F
+:1076000091509923D1F7020F111D8091E80085FF59
+:1076100005C0209729F4A114B10411F05092E8009C
+:107620004FBF209709F0BACF769884E680938C01FB
+:10763000A601CA01DF91CF911F910F91FF90EF90AA
+:10764000DF90CF90BF90AF909F908F907F906F9082
+:107650005F9008950F931F93182FFB01A091910144
+:10766000B0919201BA010EEF2AC017FF02C09491A7
+:1076700001C0908120918F01309190012A173B0722
+:10768000ACF48091E8008570E1F38091E80082FF1E
+:1076900003C04FEF5FEF16C09093F100C901019650
+:1076A0008F739070892B11F40093E8002F5F3F4F88
+:1076B0003093900120938F01615070403196611595
+:1076C000710599F6CA011F910F910895CF93DF9329
+:1076D0009C01EB018091E80082FFFCCFC9016C2F77
+:1076E0009EDE8BEF8093E800CE01DF91CF9108956D
+:1076F0001F920F920FB60F9211242F933F938F93E7
+:107700008091E1001092E100282F83FF0FC01092BA
+:10771000E90081E08093EB001092EC0082E380931B
+:10772000ED0010928E0188E08093F00022FF26C0C9
+:1077300083E08093E9008091F200882319F08AE3C6
+:107740008093E80080918C01882351F080918C0116
+:10775000815080938C0180918C01882309F4769A62
+:1077600080918D01882351F080918D01815080930B
+:107770008D0180918D01882309F4289A8F913F9182
+:107780002F910F900FBE0F901F90189510928E01A1
+:1077900081E08093D70080EA8093D80082E189BDA0
+:1077A00009B400FEFDCF80E98093D8008CE080937F
+:1077B000E2001092E00008950895DF93CF930F92B6
+:1077C000CDB7DEB71982CE010196FEDC898190E04B
+:1077D0000F90CF91DF9108951F920F920FB60F92E5
+:1077E0001124EF92FF921F932F933F934F935F9338
+:1077F0006F937F938F939F93AF93BF93EF93FF9379
+:10780000DF93CF93CDB7DEB76197DEBFCDBF1092C8
+:10781000E9008091E80083FFECC0CE01019668E0AA
+:10782000FEDD82EF8093E800998197FF05C080918B
+:10783000E80080FFFCCF03C08EEF8093E800292F83
+:1078400030E0C90180769070892B09F0B3C08A813D
+:10785000882329F41092F1001092F100BFC081300A
+:1078600009F4BCC0833009F4B9C0853049F4809173
+:10787000E80080FFFCCF8B8180688093E300AEC07E
+:10788000863009F06DC01C81EF80F8841230A9F5B4
+:107890001092E9001092900110928F0110929201C3
+:1078A000109291018ADF99E0FE013996DF01292FBC
+:1078B0001D922A95E9F799871A8791E09E8790E8AB
+:1078C000988B9AEF998B20918F0130919001275FCF
+:1078D0003F4F3C872B878D871092E90010929001D3
+:1078E00010928F01F0929201E092910180E0BF012D
+:1078F00049E050E0AFDE61DF71C01092E900109204
+:10790000900110928F01F0929201E092910111305A
+:1079100071F488E0E816F10411F41093930180915A
+:107920009301882309F062C0E2E5F1E713C0133048
+:1079300009F058C08B81882319F4E4E1F1E70AC00B
+:10794000823019F4E8E1F1E705C0813009F04AC05E
+:10795000EAE3F1E7449150E080E8BF017BDE3EC0FE
+:10796000873009F43FC0883021F481E08093F10032
+:1079700035C0893099F523703070232B99F5E7E7EE
+:10798000F1E791E031E026E39093E9003093EB00DA
+:1079900084918093EC002093ED009F5F31969430AA
+:1079A00099F78EE78093EA001092EA008B8180932A
+:1079B0008E0114C08F8198851092E9001092900179
+:1079C00010928F0190939201809391018D81882371
+:1079D00049F4CE01019602DC882321F08EEF8093DA
+:1079E000E80007C081E28093EB0003C0E4E6F1E722
+:1079F000B1CF6196DEBFCDBFCF91DF91FF91EF9107
+:107A0000BF91AF919F918F917F916F915F914F91B6
+:107A10003F912F911F91FF90EF900F900FBE0F900D
+:107A20001F901895EE0FFF1F0590F491E02D09941B
+:047A3000F894FFCFF8
+:087A340000E100000000000069
:040000030000700089
:00000001FF
diff --git a/arduino/bootloaders/nuevo_diskloader/Makefile b/arduino/bootloaders/nuevo_diskloader/Makefile
index 965ca6b..dc9172e 100644
--- a/arduino/bootloaders/nuevo_diskloader/Makefile
+++ b/arduino/bootloaders/nuevo_diskloader/Makefile
@@ -14,7 +14,7 @@ AVR_FREQ = 16000000L
# Specify the Arduino model using the assigned PID. This is used by Descriptors.c
# to set PID and product descriptor string
# Arduino Leonardo PID
-ARDUINO_MODEL_PID = 0x0088
+ARDUINO_MODEL_PID = 0x0089
# Arduino Micro PID
#ARDUINO_MODEL_PID = 0x0035
diff --git a/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp b/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp
index 8088b7b..f611e17 100644
--- a/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp
+++ b/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp
@@ -6,7 +6,7 @@
//#include "USBCore.h"
-//extern "C"
+extern "C"
void entrypoint(void) __attribute__ ((naked)) __attribute__ ((section (".vectors")));
void entrypoint(void)
{
@@ -15,8 +15,8 @@ void entrypoint(void)
"out 0x3F, r1\n" // SREG
"ldi r28, 0xFF\n" // Y-register
"ldi r29, 0x0A\n" // Y-register
-// "out 0x3E, r29\n" // SPH
-// "out 0x3D, r28\n" // SPL
+ "out 0x3E, r29\n" // SPH
+ "out 0x3D, r28\n" // SPL
"rjmp main" // Stack is all set up, start the main code
::);
}
@@ -28,7 +28,7 @@ volatile u16 _timeout;
void Program(u8 ep, u16 page, u8 count)
{
- u8 write = page < 30*1024; // Don't write over firmware please
+ u8 write = page < 28*1024; // Don't write over firmware please
if (write)
boot_page_erase(page);
@@ -126,11 +126,6 @@ int main()
TX_LED_OFF();
RX_LED_OFF();
L_LED_OFF();
-
- /* UART setup stuff */
-
- /* end UART setup stuff */
-
USB.attach();
sei();
@@ -143,9 +138,6 @@ int main()
u16 address = 0;
for (;;)
{
-// while (Serial.available() < 1)
-// ;
-// u8 cmd = Serial.read();
while (!USB_Available(CDC_RX))
;
u8 cmd = USB_Recv(CDC_RX);
@@ -162,7 +154,6 @@ int main()
}
_timeout = 0;
// Read params
-// USB_Recv(CDC_RX, packet, len);
USB_Recv_block(CDC_RX, packet, len);
// Send a response
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
