Skip to content

Commit

Permalink
apply patch from Fix stk500v2 READ_EEPROM to properly read EEPROM ard…
Browse files Browse the repository at this point in the history 
…uino#24 now reads correctly
  • Loading branch information
phlebos committed May 24, 2022
1 parent b406c8b commit b2a12f6
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 68 deletions.
12 changes: 9 additions & 3 deletions bootloaders/stk500v2/stk500boot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1063,10 +1063,16 @@ int main(void)
else
{
/* Read EEPROM */
uint16_t ii = address >> 1;
do {
EEARL = address; // Setup EEPROM address
EEARH = ((address >> 8));
address++; // Select next EEPROM byte
// EEARL = address; // Setup EEPROM address
// EEARH = ((address >> 8));
// address++; // Select next EEPROM byte
EEARL = ii; // Setup EEPROM address
EEARH = ((ii >> 8));
address += 2; // Select next EEPROM byte
ii++;

EECR |= (1<<EERE); // Read EEPROM
*p++ = EEDR; // Send EEPROM data
size--;
Expand Down
131 changes: 66 additions & 65 deletions bootloaders/stk500v2/stk500boot_v2_mega2560.hex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
:10E2F00078706C6F7265722073746B353030563283
:10E30000206279204D4C530041546D656761323570
:10E310003630000011241FBECFEFD1E2DEBFCDBFEB
:10E3200001E00CBF12E0A0E0B2E0E8E2F8EF03E0A9
:10E3200001E00CBF12E0A0E0B2E0E2E3F8EF03E0AE
:10E330000BBF02C007900D92A430B107D9F722E0BD
:10E34000A4E0B2E001C01D92A231B207E1F70F9440
:10E35000E8F20D9412FC01E20EBF0FEF0DBF112485
:10E35000E8F20D9417FC01E20EBF0FEF0DBF112480
:10E360001FBE0D94E8F20D9400F08093C6008091DA
:10E37000C00086FFFCCF8091C00080648093C00005
:10E3800008958091C00087FFFCCF8091C60008955A
Expand Down Expand Up @@ -84,34 +84,34 @@
:10E520008A948110B1CF62960FB6F894DEBF0FBE09
:10E53000CDBFDF91CF911F910F91FF90EF90DF90B2
:10E54000CF90BF90AF909F908F907F906F905F9093
:10E550004F903F902F900895C2010F94FCFB182F0D
:10E550004F903F902F900895C2010F9401FC182F07
:10E56000BFCFF2011081BCCF0F931F93CF93DF93E6
:10E57000EC018B01853691051CF4633071054CF07C
:10E58000CE0164E670E00F94ABFB80E3860F0F943E
:10E58000CE0164E670E00F94B0FB80E3860F0F9439
:10E59000B5F1CB30D1051CF4023011056CF0CE0181
:10E5A00064E670E00F94ABFB6AE070E00F94ABFBA5
:10E5A00064E670E00F94B0FB6AE070E00F94B0FB9B
:10E5B00080E3860F0F94B5F1CE016AE070E00F940E
:10E5C000ABFB805DDF91CF911F910F910D94B5F161
:10E5C000B0FB805DDF91CF911F910F910D94B5F15C
:10E5D000CDB7DEB7CD53D1400FB6F894DEBF0FBE36
:10E5E000CDBF01E20EBF0FEF0DBF94B7F894A89511
:10E5F00014BE80916000886180936000109260007A
:10E60000789493FF05C0E0911002F09111021995E2
:10E61000279A2F9A8091C00082608093C00080E189
:10E620008093C40088E18093C100000010E000E006
:10E63000C12CD12C7601E7EC8E2EEBE19E2EA12C85
:10E63000C12CD12C7601F7EC8F2EFBE19F2EA12C63
:10E64000B12C8091C00087FD39C0012BA1F0279823
:10E650002F9884E690E00F94C8F100008091C000EC
:10E660008D7F8093C00081E180935700E895EE276D
:10E67000FF270994FFCF25E02A95F1F700003FEF2F
:10E68000C31AD30AE30AF30A81E041E2C4164EE456
:10E69000D406E104F10408F480E0082F10E0C7017B
:10E6A000B601A50194010F94BFFB672B682B692B62
:10E6A000B601A50194010F94C4FB672B682B692B5D
:10E6B00009F0C7CF85B1805885B9C3CF012B09F0C8
:10E6C000C6CFCF5CDE4F19821882C153D140312CA6
:10E6D000212CCA5DDE4F19821882C652D140C55D19
:10E6E000DE4F188219821A821B82CB52D140412CF4
:10E6F000512C320141E050E0C65DDE4F1882CA5213
:10E70000D140D12CFE013196C25EDE4FF983E88301
:10E70000D140C12CFE013196C25EDE4FF983E88311
:10E71000CE51D140C25EDE4FF881CE51D140C45CB3
:10E72000DE4FF883CC53D140C15EDE4F2881CF51FC
:10E73000D140C35CDE4F2883CD53D140BE01655F1D
Expand Down Expand Up @@ -177,9 +177,9 @@
:10EAF00092E0190729F50F94EBF10F94EBF160E028
:10EB000088E891EE0F94D7F161E070E0C7010F94AF
:10EB1000B4F20F94EBF10F94EBF1FBCE6F2DC80123
:10EB20000F9404FCF11008C060E08BEA91EE0F94A2
:10EB20000F9409FCF11008C060E08BEA91EE0F949D
:10EB3000D7F10F5F1F4FB2CF8F2D0F94B5F1F9CFE3
:10EB4000C8010F94FCFBC82E81110DC060E08BEA58
:10EB4000C8010F9401FCC82E81110DC060E08BEA52
:10EB500091EE0F94D7F1CD1419F07FEFE71AF70A71
:10EB60000F5F1F4FB9CF0F94B5F1F5CF62E081E58C
:10EB700091EE0F94FEF1279A2F9A8091C00087FFA3
Expand All @@ -194,8 +194,8 @@
:10EC0000F1F184E40F94F1F185E40F94F1F186E4DD
:10EC10000F94F1F187E40F94F1F188E40F94F1F18E
:10EC20008AE40F94F1F18BE40F94F1F18CE40F94EA
:10EC3000F1F100CF62E087E191EE0F94FEF19924AB
:10EC400093942981243109F427C508F085C326301F
:10EC3000F1F100CF62E087E191EE0F94FEF1DD2467
:10EC4000D3942981243109F428C508F085C32630DE
:10EC500009F4CBC408F070C3223009F479C323301F
:10EC600009F478C4213009F45FC480EC8A8371C34D
:10EC700062E08CE091EE0F94FEF140910C02509115
Expand Down Expand Up @@ -244,12 +244,12 @@
:10EF20000EF2892D0F940EF2882D0F940EF2BACFA7
:10EF30006EE0C622E894D0F8EE24FF247CE0C716E9
:10EF400074E9D706E104F10409F0ACCFB401552708
:10EF500044274427552761707727E1E1880C991CE5
:10EF6000AA1CBB1CEA95D1F78824992480EEA8221C
:10EF500044274427552761707727F1E1880C991CD5
:10EF6000AA1CBB1CFA95D1F78824992480EEA8220C
:10EF700081E0B822842A952AA62AB72A812F90E018
:10EF8000B0E0A0E0BA2FA92F982F8827800F911DFD
:10EF9000A11DB11DC95CDE4F488159816A817B8109
:10EFA000C753D14015E1440F551F661F771F1A95AF
:10EFA000C753D14005E1440F551F661F771F0A95CF
:10EFB000D1F74427552760727727840F951FA61F26
:10EFC000B71F880E991EAA1EBB1E75016401CC0CCA
:10EFD000DD1CEE1CFF1C60E08CED91EE0F94D7F170
Expand Down Expand Up @@ -289,27 +289,27 @@
:10F1F000C600CF5CDE4FA881B981C153D1401196C2
:10F20000CF5CDE4FB983A883C153D1409132C9F698
:10F210001A97B8F6BFEF2B1A3B0AE3E02E1631041B
:10F2200091F675E0272E312C09E110E081E20F9470
:10F2200091F6E5E02E2E312C09E110E081E20F94F9
:10F23000B5F101501109D1F70F94EBF1F1E02F1A5C
:10F24000310891F710920C0210920D0210920E02EA
:10F2500010920F02109208021092090210920A02F4
:10F2600010920B02109204021092050210920602F4
:10F270001092070260E087EE92EE0F94FEF1DACB77
:10F28000853099F1863009F452C08430F9F0873026
:10F2900009F0A7CF912CD5CC9B3109F0A2CF8BE1FF
:10F2A000D82E81E09ECFD926C65DDE4F9883CA5204
:10F2B000D14082E096CF292F30E0322F2227D92665
:10F2C00083E08FCF292BD92684E08BCF9E3091F518
:10F2D000D926CA5DDE4F1882C652D140C95DDE4FC5
:10F2900009F0A7CFD12CD5CC9B3109F0A2CF8BE1BF
:10F2A000C82E81E09ECFC926C65DDE4F9883CA5224
:10F2B000D14082E096CF292F30E0322F2227C92675
:10F2C00083E08FCF292BC92684E08BCF9E3091F528
:10F2D000C926CA5DDE4F1882C652D140C95DDE4FD5
:10F2E0001882C752D14085E07CCFCA5DDE4F48818D
:10F2F0005981C652D1404F5F5F4FE1E0F0E0EC0F23
:10F30000FD1FCA5DDE4FA881B981C652D140EA0F08
:10F31000FB1F9083D9264217530709F015C2CA5D17
:10F32000DE4F39832883C652D14086E05ACF9D15DF
:10F31000FB1F9083C9264217530709F01AC2CA5D22
:10F32000DE4F39832883C652D14086E05ACF9C15E0
:10F3300009F4B0CF80E055CF223109F449C123311F
:10F34000C9F0203129F0213109F08FCC9924939410
:10F34000C9F0203129F0213109F08FCCDD24D3948C
:10F350001A8202E010E08AC0293109F42AC108F0BB
:10F360005DC0263109F498C1283109F40DC1253159
:10F360005DC0263109F499C1283109F40DC1253158
:10F3700009F07BCC0A811B8110270127102723313C
:10F3800009F05CC1C55DDE4F488159816A817B818E
:10F39000CB52D140411580EC580783E068077105D6
Expand All @@ -327,13 +327,13 @@
:10F4500009F466C0813009F465C081E01A821B821C
:10F460009C831D828E831F8207E010E08BE10F9446
:10F47000B5F1C65DDE4F8881CA52D1400F94B5F117
:10F48000812F0F94B5F1C65DDE4FD880CA52D140AE
:10F49000D126802F0F94B5F1D0268EE00F94B5F1D0
:10F4A00085E1D82641E050E04C0F5D1F040F151F89
:10F48000812F0F94B5F1C65DDE4FC880CA52D140BE
:10F49000C126802F0F94B5F1C0268EE00F94B5F1F0
:10F4A00085E1C826E1E0F0E0EC0FFD1F0E0F1F1F05
:10F4B000C45CDE4FE880CC53D140C35CDE4FF880A3
:10F4C000CD53D140E016F10609F036C18D2D0F94D1
:10F4C000CD53D140E016F10609F03BC18C2D0F94CD
:10F4D000B5F1C65DDE4FB881CA52D140BF5FC65D8F
:10F4E000DE4FB883CA52D14085B1805885B991109A
:10F4E000DE4FB883CA52D14085B1805885B9D1105A
:10F4F000AEC850E040E02BC9892F807509F4AECF2B
:10F5000089E0F0E0E0E0903539F080E0983509F0EE
:10F51000A5CF89E0E3E0F0E08093570084919ECF8F
Expand All @@ -351,41 +351,42 @@
:10F5D00080EC8A8302E010E0C55DDE4F188219825C
:10F5E0001A821B82CB52D14041CF2A813B814C8170
:10F5F0005D81CE5DDE4F288339834A835B83C252AF
:10F60000D140CA01B9010F94E1FB2B013C01440C2C
:10F60000D140CA01B9010F94E6FB2B013C01440C27
:10F61000551C661C771C9CCE35E0F20160925B00A5
:10F6200030935700E89507B600FCFDCF81E1809349
:10F630005700E8951A822A013B018BCE73016201C3
:10F64000F694E794D794C7945601C00ED11EC05EBD
:10F65000DE4F8881C052D140CF5DDE4F9881C152CC
:10F66000D140AC14BD0469F430E020E0000F111F5C
:10F67000221F331FB901A801440D551D661D771DBA
:10F68000D9CFDC016D917D01C5010F9404FCBFEF62
:10F69000AB1ABB0AC701E5CF8A819B8198278927CE
:10F6A00098278C010D5F1F4F1A822431C9F4DE01A7
:10F6B00011966BBEF2012791369112962C931297F8
:10F6C000FD01349613963C93139722E0420E511C91
:10F6D000611C711C02971296009759F71082C6CED2
:10F6E000FE0131969F01280F391FB301A20141BDD0
:10F6F000C52ED62EE72EFF24C2BC4F5F5F4F6F4F43
:10F700007F4FF89AA0B5A28331962E173F0779F75D
:10F71000AC014150510970E060E04F5F5F4F6F4FA7
:10F720007F4F440E551E661E771EE3E0F0E0EC0F9F
:10F73000FD1FE80FF91FD2CFD701CD907D018C2D91
:10F740000F94B5F1DC24BECECA5DDE4F59834883E9
:10F75000C652D14046CD97FB072E16F4009407D031
:10F7600077FD09D00F94E8FB07FC05D03EF4909597
:10F7700081959F4F0895709561957F4F0895A1E2FF
:10F780001A2EAA1BBB1BFD010DC0AA1FBB1FEE1F1B
:10F79000FF1FA217B307E407F50720F0A21BB30B66
:10F7A000E40BF50B661F771F881F991F1A9469F7E2
:10F7B00060957095809590959B01AC01BD01CF013E
:10F7C0000895692796276927782787277827089536
:10F7D000AA1BBB1B51E107C0AA1FBB1FA617B70777
:10F7E00010F0A61BB70B881F991F5A95A9F7809593
:10F7F0009095BC01CD010895F999FECF92BD81BDD0
:10F80000F89A992780B50895262FF999FECF1FBA47
:10F8100092BD81BD20BD0FB6F894FA9AF99A0FBE39
:08F8200001960895F894FFCF52
:04F828000F020A00C1
:10F630005700E8951A822A013B018BCED301C20103
:10F64000B695A795979587954C015801A80EB91EB8
:10F65000C05EDE4F8881C052D140CF5DDE4F9881C1
:10F66000C152D1408A149B0469F430E020E0000FBD
:10F67000111F221F331FB901A801440D551D661D1E
:10F68000771DD8CFDC016D917D01C4010F9409FC79
:10F69000BFEF8B1A9B0AC701E5CF8A819B81982710
:10F6A000892798278C010D5F1F4F1A822431D9F4C6
:10F6B000DE0111966BBEF2012791369112962C93C2
:10F6C0001297AD014C5F5F4F13963C931397E2E0A6
:10F6D0004E0E511C611C711C02971296009751F737
:10F6E000DA011C92C3CEB301A201769567955795B6
:10F6F00047959A01BC01640F751FFE013396AF0157
:10F7000021BD32BD2F5F3F4FF89AF0B4F0823196A1
:10F7100062177307A9F74C01F1E08F1A9108B12C19
:10F72000A12C2FEF821A920AA20AB20A880C991C05
:10F73000AA1CBB1C480C591C6A1C7B1C480F591F77
:10F74000CFCFD701BD907D018B2D0F94B5F1CB2488
:10F75000B9CECA5DDE4F59834883C652D14041CDF0
:10F7600097FB072E16F4009407D077FD09D00F946D
:10F77000EDFB07FC05D03EF4909581959F4F0895D1
:10F78000709561957F4F0895A1E21A2EAA1BBB1BAD
:10F79000FD010DC0AA1FBB1FEE1FFF1FA217B3075D
:10F7A000E407F50720F0A21BB30BE40BF50B661F73
:10F7B000771F881F991F1A9469F760957095809537
:10F7C00090959B01AC01BD01CF0108956927962753
:10F7D00069277827872778270895AA1BBB1B51E143
:10F7E00007C0AA1FBB1FA617B70710F0A61BB70BB1
:10F7F000881F991F5A95A9F780959095BC01CD0156
:10F800000895F999FECF92BD81BDF89A992780B5E8
:10F810000895262FF999FECF1FBA92BD81BD20BD54
:10F820000FB6F894FA9AF99A0FBE01960895F894D3
:02F83000FFCF08
:04F832000F020A00B7
:040000033000E000E9
:00000001FF

0 comments on commit b2a12f6

Please sign in to comment.