[gnoduino: 179/237] more attempts to get parameter sending to work
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnoduino: 179/237] more attempts to get parameter sending to work
- Date: Sat, 31 Mar 2012 20:29:52 +0000 (UTC)
commit cf94c04cbdd6d597996be2ff0dcf215f39962390
Author: Zach Eveland <zeveland blacklabel-development com>
Date: Fri Oct 21 20:30:55 2011 -0400
more attempts to get parameter sending to work
.../nuevo_diskloader/DiskLoader.elf.hex | 174 --------------
.../bootloaders/nuevo_diskloader/DiskLoader.hex | 253 ++++++++++----------
.../nuevo_diskloader/src/DiskLoader.cpp | 34 +--
3 files changed, 139 insertions(+), 322 deletions(-)
---
diff --git a/arduino/bootloaders/nuevo_diskloader/DiskLoader.hex b/arduino/bootloaders/nuevo_diskloader/DiskLoader.hex
index a4e2d75..c7ae611 100644
--- a/arduino/bootloaders/nuevo_diskloader/DiskLoader.hex
+++ b/arduino/bootloaders/nuevo_diskloader/DiskLoader.hex
@@ -1,6 +1,6 @@
:10700000B8C00000DBC00000D9C00000D7C000003D
:10701000D5C00000D3C00000D1C00000CFC0000028
-:10702000CDC00000CBC0000098C300000BC400001E
+:10702000CDC00000CBC00000BEC3000031C40000D2
:10703000C5C00000C3C00000C1C00000BFC0000048
:10704000BDC00000BBC00000B9C00000B7C0000058
:10705000B5C00000B3C00000B1C00000AFC0000068
@@ -21,35 +21,35 @@
:107140004C004C00430012010002000000404123AB
:10715000880000010102000112010002020000404B
:107160004123880000010102000100C18081F8383C
-:10717000123C11241FBECFEFDAE0DEBFCDBF11E01D
-:10718000A0E0B1E0E0EAFAE702C005900D92A83174
+:10717000383C11241FBECFEFDAE0DEBFCDBF11E0F7
+:10718000A0E0B1E0ECEEFAE702C005900D92A83164
:10719000B107D9F711E0A8E1B1E001C01D92A73A0B
:1071A000B107E1F711E7C2E7D1E703C02297FE017B
-:1071B00071D4CE36D107D1F7EDD070C421CFDC0128
+:1071B00097D4CE36D107D1F7EDD096C421CFDC01DC
:1071C00080910001909101018F5F9F4F61F4ED91DB
:1071D000FC9111970480F581E02DCD0109959093E4
:1071E00001018093000180910001909101010895B7
:1071F0008EE091E090931901809318010895DF9338
:10720000CF930F92CDB7DEB76983809109018823B0
-:1072100051F083E0BE016F5F7F4F41E050E0C7D186
+:1072100051F083E0BE016F5F7F4F41E050E0EDD160
:107220001816190614F080E090E00F90CF91DF91CE
-:10723000089583E088C220910001309101018FEF11
+:10723000089583E0AEC220910001309101018FEFEB
:107240002F3F380739F08FEF9FEF90930101809324
-:10725000000103C082E083D19C01C901089582E04E
-:1072600041D1282F80910001909101018F5F9F4FA4
+:10725000000103C082E0A9D19C01C901089582E028
+:1072600067D1282F80910001909101018F5F9F4F7E
:1072700009F02F5F822F90E00895FC0180818E5FDE
-:10728000808380E86EEA70E742E450E00EC286EA4E
-:1072900091E0C7D2F8940C94003C0895CF93DF930B
+:10728000808380E86EEA70E742E450E034C286EA28
+:1072900091E0EDD2F8940C94003C0895CF93DF93E5
:1072A000EC0189819881913A49F4813251F580E06D
-:1072B00062E071E047E050E0F8D121C0913209F579
-:1072C000803231F482E091E067E070E02AD217C0AA
+:1072B00062E071E047E050E01ED221C0913209F552
+:1072C000803231F482E091E067E070E050D217C084
:1072D0008232B9F480910901882371F08091020112
:1072E00090910301A0910401B0910501805B94404D
:1072F000A040B04009F4CBDF8A818093090181E08E
:1073000001C080E0DF91CF910895FF920F931F930A
:10731000CF93DF93982F8B01FF2488E760307807A5
:1073200038F4FF24F39483E0FB0180935700E89541
-:10733000C42FD0E0892F6AE171E0AE01DCD0FF20DC
+:10733000C42FD0E0892F6AE171E0AE0102D1FF20B5
:1073400019F107B600FCFDCFD595C7954C2FF80174
:10735000AAE1B1E020E031E009C08D919D910C01DE
:1073600030935700E895112432962F5F2417A8F325
@@ -58,117 +58,122 @@
:10739000FF90089588E10FB6F894809360001092F2
:1073A00060000FBE3F9A209A6E9A90E89093610019
:1073B0001092610081E885BF95BF01E005BF02E042
-:1073C00005BF769A289A479886EA91E014D2789475
-:1073D00084E180939A0180E180939B0100E010E0BA
+:1073C00005BF769A289A479886EA91E03AD278944F
+:1073D00084E180939A0180E180939B01EE24FF2455
:1073E00088E191E03CDF18161906D4F788E191E0B6
-:1073F00022DFE82E80EF90E7FC012491319602967F
-:1074000044912E1511F02223B9F710929D0110928C
-:107410009C0150E082E06AE171E06DD0F1E4EF168A
-:1074200049F186E5E81631F1E5E7EE1621F4E801C9
-:1074300023E0F22E22C0F5E5EF1639F4C0911A01CF
-:10744000D0911B01CC0FDD1F0DC084E6E81631F48E
-:1074500082E0B80140911B0158DF03C0E4E7EE165B
-:1074600019F0E801FF2409C0F0901B01E801CF0DDD
-:10747000D11D03C0E801FF24F39488E191E0EFDE21
-:1074800018161906CCF488E191E0D5DE00E010E092
-:10749000809709F0A5CF10C088E191E061E0AFDEF0
-:1074A00083E46BE971E041E050E081D0F1E5EF1653
-:1074B00009F494CF8E0194CF83E06AE971E041E052
-:1074C00050E075D0FF2061F3E7CFFC0104C080914C
-:1074D000F100819361506623D1F7289884E6809368
-:1074E0009F0108959FB7F89487708093E900809179
-:1074F000F2009FBF0895282F8091A0018823C1F03A
-:1075000057FF1AC015C0289890939F018091F100F1
-:107510008193E217F307B9F74115510539F08091CE
-:10752000F200882319F48BE68093E800AFBF02C015
-:107530004FEF5FEFCA010895AFB7F894277020931B
-:10754000E9008091F200282F30E0241735070CF471
-:10755000A901FB019B01240F311D94E6DACFDF93D3
-:10756000CF930F92CDB7DEB7BE016F5F7F4F41E083
-:1075700050E0C1DF019719F08FEF9FEF02C08981C2
-:1075800090E00F90CF91DF9108952FB7F894877016
-:107590008093E9008091E80085FD02C090E004C07E
-:1075A0008091F20090E4981B2FBF892F08957F925D
-:1075B0008F929F92AF92BF92CF92DF92EF92FF9203
-:1075C0000F931F93CF93DF93F82E6A018091A00150
-:1075D000882319F44FEF5FEF59C08B01EA0157E0A0
-:1075E000E52EEF208F2D90E040E2842E912C882212
-:1075F00099223AE3732E20E4A22EB12CA822B922BC
-:107600003DC08F2DC2DF282F90E0C817D9070CF49A
-:107610002C2FC21BD1094FB7F894E092E9008114D6
-:10762000910421F406C01092F10021502223D9F7D1
-:1076300019C0F7FC03C0F801922F10C0C801322F07
-:1076400006C0FC010196E491E093F1003150332330
-:10765000C1F706C081918093F10091509923D1F731
-:10766000020F111D8091E80085FF05C0209729F4C5
-:10767000A114B10411F07092E8004FBF209709F0F7
-:10768000C0CF769884E680939E01A601CA01DF915F
-:10769000CF911F910F91FF90EF90DF90CF90BF900F
-:1076A000AF909F908F907F9008950F931F93182F06
-:1076B000FB01A091A301B091A401BA010EEF2AC071
-:1076C00017FF02C0949101C090812091A1013091D7
-:1076D000A2012A173B07ACF48091E8008570E1F322
-:1076E0008091E80082FF03C04FEF5FEF16C09093D8
-:1076F000F100C90101968F739070892B11F40093EA
-:10770000E8002F5F3F4F3093A2012093A101615009
-:10771000704031966115710599F6CA011F910F915C
-:107720000895CF93DF939C01EB018091E80082FFE5
-:10773000FCCFC9016C2FC9DE8BEF8093E800CE012E
-:10774000DF91CF9108958093E9008091F200882322
-:1077500019F08AE38093E80008951F920F920FB604
-:107760000F9211242F933F938F938091E1001092F9
-:10777000E100282F83FF0FC01092E90081E0809381
-:10778000EB001092EC0082E38093ED001092A001D8
-:1077900088E08093F00022FF26C083E08093E90018
-:1077A0008091F200882319F08AE38093E8008091A9
-:1077B0009E01882351F080919E01815080939E010B
-:1077C00080919E01882309F4769A80919F018823F5
-:1077D00051F080919F01815080939F0180919F0182
-:1077E000882309F4289A8F913F912F910F900FBE13
-:1077F0000F901F9018951092A00181E08093D70000
-:1078000080EA8093D80082E189BD09B400FEFDCFF3
-:1078100080E98093D8008CE08093E2001092E00031
-:10782000089508950895DF93CF930F92CDB7DEB7F3
-:107830001982CE01019621DD898190E00F90CF91D0
-:10784000DF9108951F920F920FB60F921124EF92BD
-:10785000FF921F932F933F934F935F936F937F9369
-:107860008F939F93AF93BF93EF93FF93DF93CF9348
-:10787000CDB7DEB76197DEBFCDBF1092E900809132
-:10788000E80083FFECC0CE01019668E01EDE82EFC7
-:107890008093E800998197FF05C08091E80080FF00
-:1078A000FCCF03C08EEF8093E800292F30E0C901A0
-:1078B00080769070892B09F0B3C08A81882329F4DF
-:1078C0001092F1001092F100BFC0813009F4BCC0E9
-:1078D000833009F4B9C0853049F48091E80080FF15
-:1078E000FCCF8B8180688093E300AEC0863009F0C6
-:1078F0006DC01C81EF80F8841230A9F51092E90068
-:107900001092A2011092A1011092A4011092A30161
-:107910008ADF99E0FE013996DF01292F1D922A9511
-:10792000E9F799871A8791E09E8790E8988B9AEFFC
-:10793000998B2091A1013091A201275F3F4F3C8795
-:107940002B878D871092E9001092A2011092A1015D
-:10795000F092A401E092A30180E0BF0149E050E071
-:10796000A4DE61DF71C01092E9001092A2011092B2
-:10797000A101F092A401E092A301113071F488E01A
-:10798000E816F10411F41093A5018091A501882354
-:1079900009F062C0E6E4F1E713C0133009F058C003
-:1079A0008B81882319F4E8E0F1E70AC0823019F4EA
-:1079B000ECE0F1E705C0813009F04AC0EEE2F1E702
-:1079C000449150E080E8BF0170DE3EC0873009F48A
-:1079D0003FC0883021F481E08093F10035C08930C8
-:1079E00099F523703070232B99F5EBE6F1E791E0E0
-:1079F00031E026E39093E9003093EB00849180938B
-:107A0000EC002093ED009F5F3196943099F78EE75C
-:107A10008093EA001092EA008B818093A00114C049
-:107A20008F8198851092E9001092A2011092A10115
-:107A30009093A4018093A3018D81882349F4CE0102
-:107A400001962CDC882321F08EEF8093E80007C09C
-:107A500081E28093EB0003C0E8E5F1E7B1CF6196E6
-:107A6000DEBFCDBFCF91DF91FF91EF91BF91AF917D
-:107A70009F918F917F916F915F914F913F912F9146
-:107A80001F91FF90EF900F900FBE0F901F901895D1
-:107A9000EE0FFF1F0590F491E02D0994F894FFCFAD
-:107AA000FFFF00E1000000000000000000002F398F
-:087AB000DF381B391939FF38DA
+:1073F00022DFC82E80EF90E7FC012491319602969F
+:1074000044912C1511F02223B9F710929D0110928E
+:107410009C0150E082E06AE171E093D0F1E4CF1684
+:1074200079F480911A018058833028F0883111F066
+:1074300084E001C083E0C82FD0E0CD5FDE4811C0FA
+:1074400086E5C81691F480911A01803321F08701F6
+:10745000DD24D3942BC080911C01C82FD0E0C050F4
+:10746000DF488701DD24D3942AC0E5E7CE1631F446
+:10747000870123E0D22EC0E0D1E721C0F5E5CF1689
+:1074800039F400911A0110911B01000F111F0DC05A
+:1074900084E6C81631F482E0B70140911B0135DF64
+:1074A00003C0E4E7CE1629F08701DD24C7E0D1E769
+:1074B00006C0D0901B01E70187010D0D111D88E169
+:1074C00091E0CDDE18161906E4F488E191E0B3DE10
+:1074D000EE24FF24809709F083CF13C088E191E068
+:1074E00069918DDEF394FD14C8F383E46BE971E0D8
+:1074F00041E050E082D0F1E5CF1609F46FCF78017A
+:107500006FCF83E06AE971E041E050E076D0DD20A2
+:1075100061F3FF24E8CFFC0104C08091F100819366
+:1075200061506623D1F7289884E680939F010895DF
+:107530009FB7F89487708093E9008091F2009FBF15
+:107540000895282F8091A0018823C1F057FF1AC009
+:1075500015C0289890939F018091F1008193E217C4
+:10756000F307B9F74115510539F08091F2008823EE
+:1075700019F48BE68093E800AFBF02C04FEF5FEFD6
+:10758000CA010895AFB7F89427702093E90080915D
+:10759000F200282F30E0241735070CF4A901FB0175
+:1075A0009B01240F311D94E6DACFDF93CF930F9226
+:1075B000CDB7DEB7BE016F5F7F4F41E050E0C1DF66
+:1075C000019719F08FEF9FEF02C0898190E00F9033
+:1075D000CF91DF9108952FB7F89487708093E900D9
+:1075E0008091E80085FD02C090E004C08091F20027
+:1075F00090E4981B2FBF892F08957F928F929F92BE
+:10760000AF92BF92CF92DF92EF92FF920F931F93B0
+:10761000CF93DF93F82E6A018091A001882319F49B
+:107620004FEF5FEF59C08B01EA0157E0E52EEF20E5
+:107630008F2D90E040E2842E912C882299223AE30B
+:10764000732E20E4A22EB12CA822B9223DC08F2D8A
+:10765000C2DF282F90E0C817D9070CF42C2FC21BCB
+:10766000D1094FB7F894E092E9008114910421F414
+:1076700006C01092F10021502223D9F719C0F7FC5F
+:1076800003C0F801922F10C0C801322F06C0FC01C0
+:107690000196E491E093F10031503323C1F706C025
+:1076A00081918093F10091509923D1F7020F111D20
+:1076B0008091E80085FF05C0209729F4A114B1044A
+:1076C00011F07092E8004FBF209709F0C0CF769874
+:1076D00084E680939E01A601CA01DF91CF911F919C
+:1076E0000F91FF90EF90DF90CF90BF90AF909F9061
+:1076F0008F907F9008950F931F93182FFB01A091F7
+:10770000A301B091A401BA010EEF2AC017FF02C075
+:10771000949101C090812091A1013091A2012A177A
+:107720003B07ACF48091E8008570E1F38091E800BC
+:1077300082FF03C04FEF5FEF16C09093F100C901C5
+:1077400001968F739070892B11F40093E8002F5FDE
+:107750003F4F3093A2012093A101615070403196B8
+:107760006115710599F6CA011F910F910895CF9384
+:10777000DF939C01EB018091E80082FFFCCFC901FF
+:107780006C2FC9DE8BEF8093E800CE01DF91CF91A3
+:1077900008958093E9008091F200882319F08AE32C
+:1077A0008093E80008951F920F920FB60F92112454
+:1077B0002F933F938F938091E1001092E100282F47
+:1077C00083FF0FC01092E90081E08093EB001092DC
+:1077D000EC0082E38093ED001092A00188E080939A
+:1077E000F00022FF26C083E08093E9008091F20040
+:1077F000882319F08AE38093E80080919E01882312
+:1078000051F080919E01815080939E0180919E0154
+:10781000882309F4769A80919F01882351F0809102
+:107820009F01815080939F0180919F01882309F4DB
+:10783000289A8F913F912F910F900FBE0F901F901C
+:1078400018951092A00181E08093D70080EA809380
+:10785000D80082E189BD09B400FEFDCF80E98093A4
+:10786000D8008CE08093E2001092E0000895089523
+:107870000895DF93CF930F92CDB7DEB71982CE0173
+:107880000196FBDC898190E00F90CF91DF91089504
+:107890001F920F920FB60F921124EF92FF921F9337
+:1078A0002F933F934F935F936F937F938F939F9308
+:1078B000AF93BF93EF93FF93DF93CF93CDB7DEB733
+:1078C0006197DEBFCDBF1092E9008091E80083FF91
+:1078D000ECC0CE01019668E01EDE82EF8093E800E6
+:1078E000998197FF05C08091E80080FFFCCF03C01D
+:1078F0008EEF8093E800292F30E0C90180769070E8
+:10790000892B09F0B3C08A81882329F41092F100F1
+:107910001092F100BFC0813009F4BCC0833009F47B
+:10792000B9C0853049F48091E80080FFFCCF8B819D
+:1079300080688093E300AEC0863009F06DC01C8182
+:10794000EF80F8841230A9F51092E9001092A2019C
+:107950001092A1011092A4011092A3018ADF99E074
+:10796000FE013996DF01292F1D922A95E9F79987A3
+:107970001A8791E09E8790E8988B9AEF998B2091D7
+:10798000A1013091A201275F3F4F3C872B878D8754
+:107990001092E9001092A2011092A101F092A401AC
+:1079A000E092A30180E0BF0149E050E0A4DE61DF86
+:1079B00071C01092E9001092A2011092A101F09200
+:1079C000A401E092A301113071F488E0E816F104FB
+:1079D00011F41093A5018091A501882309F062C0DC
+:1079E000E6E4F1E713C0133009F058C08B81882317
+:1079F00019F4E8E0F1E70AC0823019F4ECE0F1E7AD
+:107A000005C0813009F04AC0EEE2F1E7449150E050
+:107A100080E8BF0170DE3EC0873009F43FC0883087
+:107A200021F481E08093F10035C0893099F523700D
+:107A30003070232B99F5EBE6F1E791E031E026E396
+:107A40009093E9003093EB0084918093EC002093B5
+:107A5000ED009F5F3196943099F78EE78093EA00AE
+:107A60001092EA008B818093A00114C08F819885C9
+:107A70001092E9001092A2011092A1019093A4012A
+:107A80008093A3018D81882349F4CE01019606DC01
+:107A9000882321F08EEF8093E80007C081E2809375
+:107AA000EB0003C0E8E5F1E7B1CF6196DEBFCDBFE3
+:107AB000CF91DF91FF91EF91BF91AF919F918F9106
+:107AC0007F916F915F914F913F912F911F91FF9007
+:107AD000EF900F900FBE0F901F901895EE0FFF1FA5
+:0C7AE0000590F491E02D0994F894FFCF7C
+:107AEC00FFFF00E1000000000000000000002F3943
+:087AFC00DF381B391939FF388E
:040000030000700089
:00000001FF
diff --git a/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp b/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp
index 4f9c793..86d62e4 100644
--- a/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp
+++ b/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp
@@ -123,9 +123,9 @@ int main()
for (;;)
{
while (Serial.available() <= 0)
- ;
-
+ ;
u8 cmd = Serial.read();
+
// Read packet contents
u8 len;
const u8* rs = _readSize;
@@ -184,28 +184,14 @@ int main()
// Serial.write(STK_INSYNC);
USB_Send(CDC_TX, &_inSync, 1);
-// u8 i;
-// for (i=0; i<send; i++) {
-// Serial.write(pgm[i]);
-// }
-// Serial.write(0x01);
-// u8 i;
-// for (i=0; i<send; i++) {
-// Serial.write();
-// }
-
-// if (send > 0)
-// USB_Send(CDC_TX, pgm, send);
-
-// if (send) {
-//// USB_Send(CDC_TX|TRANSFER_PGM, pgm, send);
-// u8 _foo;
-// _foo = 0x01;
-// USB_Send(CDC_TX|TRANSFER_PGM, &_foo, 1);
-//
-// }
- if (send)
- Serial.write(0x01);
+ if (send) {
+ u8 i;
+ for (i=0; i<send; i++) {
+// Serial.write(0xFF); // this works
+// Serial.write(*pgm + i); // this doesn't
+ Serial.write(pgm[i]);
+ }
+ }
// Send ok
// Serial.write(STK_OK);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
