c0d3f88a857f1eb56317d74af85d7ab292d91cbc

diff --git a/software/nano-1284/bootloader-arduino/Makefile b/software/nano-1284/bootloader-arduino/Makefile
index 75809343e00f24bd6909b5af1a209588161912f1..bd4e4913c0746ffbf2cb2bbc2c3c18dbc5f1feb2 100644 (file)
--- a/software/nano-1284/bootloader-arduino/Makefile
+++ b/software/nano-1284/bootloader-arduino/Makefile
@@ -95,6 +95,9 @@ isp-1284p:
 isp-flash-1284p: dist/$(NAME).elf all
        avrdude -c usbasp -p m1284p -e -U flash:w:$<
 
+isp-flash-1284p-latest-release:
+       avrdude -c usbasp -p m1284p -e -U flash:w:release/$(shell ls -A release | tail -n 1)/$(NAME).elf
+
 isp-read-flash-1284p:
        avrdude -c usbasp -p m1284p -U flash:r:/tmp/flash-nano-1284__$(shell date +"%Y-%m-%d_%H%M%S")
 

diff --git a/software/nano-1284/bootloader-arduino/release/2024-09-05_110459/bootloader-arduino_nano-1284.elf b/software/nano-1284/bootloader-arduino/release/2024-09-05_110459/bootloader-arduino_nano-1284.elf
deleted file mode 100755 (executable)
index 547e7b6..0000000
Binary files a/software/nano-1284/bootloader-arduino/release/2024-09-05_110459/bootloader-arduino_nano-1284.elf and /dev/null differ

diff --git a/software/nano-1284/bootloader-arduino/release/2024-09-05_110459/bootloader-arduino_nano-1284.hex b/software/nano-1284/bootloader-arduino/release/2024-09-05_110459/bootloader-arduino_nano-1284.hex
deleted file mode 100644 (file)
index a903211..0000000
--- a/software/nano-1284/bootloader-arduino/release/2024-09-05_110459/bootloader-arduino_nano-1284.hex
+++ /dev/null
@@ -1,106 +0,0 @@
-:020000021000EC\r
-:10E000000C9451F00C9463F00C9463F00C9463F056\r
-:10E010000C9463F00C9463F00C9463F00C9463F034\r
-:10E020000C9463F00C9463F00C9463F00C9463F024\r
-:10E030000C9463F00C9463F00C9463F00C9463F014\r
-:10E040000C9463F00C9463F00C9463F00C9463F004\r
-:10E050000C9463F00C9463F00C9463F00C9463F0F4\r
-:10E060000C9463F00C9463F00C9463F00C9463F0E4\r
-:10E070000C9463F00C9463F00C9463F00C9463F0D4\r
-:10E080000C9463F00C9463F00C9463F031313A30EB\r
-:10E09000343A35390053657020203520323032341F\r
-:10E0A000000011241FBECFEFD0E4DEBFCDBF22E0C1\r
-:10E0B000A0E0B1E001C01D92AC30B207E1F70E94D0\r
-:10E0C00048F10C9434F30C9400F09091C00095FF4B\r
-:10E0D000FCCF8093C6000895CF93982F85958595A2\r
-:10E0E00085958595805D9F709A3014F0C7E501C0D5\r
-:10E0F000C0E3C90F0E9465F08C2FCF910C9465F09E\r
-:10E10000CF92DF92EF92FF92C12CD12C76018091B9\r
-:10E11000C00087FD15C08FEFC81AD80AE80AF80AB0\r
-:10E1200081EBC81681E7D8068BE0E806F10478F3A6\r
-:10E1300017B818B8E0910001F09101010995E7CFF7\r
-:10E140008091C600FF90EF90DF90CF900895CF931D\r
-:10E150000E9480F0C82F0E9465F0C13614F089EA51\r
-:10E1600003C0C0331CF080ED8C0F01C08C2FCF9109\r
-:10E170000895CF930E94A7F0C82F0E94A7F090E1C6\r
-:10E18000C99F800D1124CF910895CF93C82FCC2320\r
-:10E1900021F00E9480F0C150FACFCF910895CF9323\r
-:10E1A000C82F0E9480F0803251F484E10E9465F013\r
-:10E1B0008C2F0E9465F080E1CF910C9465F08091E6\r
-:10E1C00002018F5F80930201853041F417B818B8BF\r
-:10E1D000E0910001F0910101CF910994CF91089550\r
-:10E1E0000E9480F0803231F484E10E9465F080E189\r
-:10E1F0000C9465F0809102018F5F8093020185305D\r
-:10E2000039F417B818B8E0910001F09101010994B0\r
-:10E210000895CF93DF9300D000D0CDB7DEB7198239\r
-:10E220001A821B821C8289819A81AB81BC818115F3\r
-:10E230009042A140B10580F48091C00087FD0CC0E0\r
-:10E2400089819A81AB81BC810196A11DB11D898311\r
-:10E250009A83AB83BC83E7CF0F900F900F900F9002\r
-:10E26000DF91CF910895CF93C82F429A0E9409F170\r
-:10E27000439A0E9409F118B8CC2341F0449A0E94B5\r
-:10E2800009F144980E9409F1C150F6CFCF91089549\r
-:10E29000000018B88CE987B982E08093C0008CE058\r
-:10E2A0008093C4001092C50088E18093C10086E08D\r
-:10E2B0008093C20098E09093C9008093CA0084E0E4\r
-:10E2C0000E9433F103E011E0B1E1FB2E0E9480F0E7\r
-:10E2D000803309F447C0813319F50E9480F0803201\r
-:10E2E000B9F484E10E9465F081E40E9465F086E55E\r
-:10E2F0000E9465F082E50E9465F080E20E9465F070\r
-:10E3000089E40E9465F083E50E9465F080E593C191\r
-:10E31000809102018F5F809302018530B9F698C128\r
-:10E32000803439F40E9480F08638E0F00E9480F05A\r
-:10E3300019C0813491F40E9480F0803811F481EF8B\r
-:10E3400044C0813811F481E040C0823811F480E18A\r
-:10E350003CC08839C9F583E038C0823431F484E1A7\r
-:10E360000E94C5F00E94F0F0B1CF853411F485E031\r
-:10E37000F7CF982F9D7F9035A9F3813599F3853597\r
-:10E3800049F40E9480F080930A020E9480F08093FA\r
-:10E390000B02E8CF8635E1F40E9480F0803389F4E7\r
-:10E3A0000E9480F00E9480F0C82F0E9480F0C1116E\r
-:10E3B00002C08EE10AC0C13011F487E906C085E0D1\r
-:10E3C00004C083E00E94C5F080E00E94CFF07ECFC1\r
-:10E3D000843609F0C3C00E9480F0809309020E9435\r
-:10E3E00080F080930802809107028E7F809307025D\r
-:10E3F0000E9480F0853429F4809107028160809327\r
-:10E400000702C6E0D1E06E012091080230910902B6\r
-:10E41000C601865091408217930730F40E9480F025\r
-:10E42000F60181936F01F0CF0E9480F0803209F0F5\r
-:10E4300008C18091070280FF2DC080910A0290914F\r
-:10E440000B02880F991F90930B0280930A02E6E05B\r
-:10E45000F1E02091080230910902CF0186509140ED\r
-:10E460008217930708F078C0F999FECF80910A02CD\r
-:10E4700090910B0292BD81BD819180BDFA9AF99A6B\r
-:10E4800080910A0290910B02019690930B02809367\r
-:10E490000A02DFCF80910B0287FF02C01BBF01C0C1\r
-:10E4A0001BBE80910A0290910B02880F991F9093D6\r
-:10E4B0000B0280930A028091080280FF09C08091BC\r
-:10E4C0000802909109020196909309028093080234\r
-:10E4D000F894A0910A02B0910B02F999FECF07B609\r
-:10E4E00000FCFDCF4D01A12CB12CF401A0925B00EA\r
-:10E4F00000935700E89507B600FCFDCF20E030E020\r
-:10E50000AD01420F531F60E070E0898190E0982FC9\r
-:10E510008827E8818E0F911D0C01FA0160935B0042\r
-:10E5200010935700E89511242E5F3F4F2296211536\r
-:10E53000F1E03F0729F7309305012093040185E0BE\r
-:10E54000F401A0925B0080935700E89507B600FCA9\r
-:10E55000FDCFF0925700E89584E16DC0843709F053\r
-:10E560005AC00E9480F0809309020E9480F080933C\r
-:10E57000080280910A0290910B02880F991F9093D4\r
-:10E580000B0280930A020E9480F09091070285346A\r
-:10E5900011F4916001C09E7F909307020E9480F069\r
-:10E5A000803209F04AC084E10E9465F0C0E0D0E00A\r
-:10E5B0008091080290910902C817D90708F03DC060\r
-:10E5C0008091070280FF0BC0F999FECF80910A026B\r
-:10E5D00090910B0292BD81BDF89A80B50FC0E09179\r
-:10E5E0000A02F0910B0281FD02C0849107C0CF01A5\r
-:10E5F000A0E0B0E01196ABBFFC0187910E9465F0EE\r
-:10E6000080910A0290910B02019690930B028093E5\r
-:10E610000A022196CDCF853719F50E9480F080320D\r
-:10E6200081F484E10E9465F08EE10E9465F087E943\r
-:10E630000E9465F085E00E9465F080E10E9465F02F\r
-:10E6400045CE809102018F5F80930201853009F4ED\r
-:10E6500017B818B8E0910001F0910101099536CE84\r
-:0CE66000863709F033CEB0CEF894FFCF1F\r
-:040000031000E00009\r
-:00000001FF\r

diff --git a/software/nano-1284/bootloader-arduino/release/2024-09-05_120945/bootloader-arduino_nano-1284.elf b/software/nano-1284/bootloader-arduino/release/2024-09-05_120945/bootloader-arduino_nano-1284.elf
new file mode 100755 (executable)
index 0000000..955f52f
Binary files /dev/null and b/software/nano-1284/bootloader-arduino/release/2024-09-05_120945/bootloader-arduino_nano-1284.elf differ

diff --git a/software/nano-1284/bootloader-arduino/release/2024-09-05_120945/bootloader-arduino_nano-1284.hex b/software/nano-1284/bootloader-arduino/release/2024-09-05_120945/bootloader-arduino_nano-1284.hex
new file mode 100644 (file)
index 0000000..4db935b
--- /dev/null
+++ b/software/nano-1284/bootloader-arduino/release/2024-09-05_120945/bootloader-arduino_nano-1284.hex
@@ -0,0 +1,106 @@
+:020000021000EC\r
+:10E000000C9451F00C9463F00C9463F00C9463F056\r
+:10E010000C9463F00C9463F00C9463F00C9463F034\r
+:10E020000C9463F00C9463F00C9463F00C9463F024\r
+:10E030000C9463F00C9463F00C9463F00C9463F014\r
+:10E040000C9463F00C9463F00C9463F00C9463F004\r
+:10E050000C9463F00C9463F00C9463F00C9463F0F4\r
+:10E060000C9463F00C9463F00C9463F00C9463F0E4\r
+:10E070000C9463F00C9463F00C9463F00C9463F0D4\r
+:10E080000C9463F00C9463F00C9463F031323A30EA\r
+:10E09000393A34350053657020203520323032341F\r
+:10E0A000000011241FBECFEFD0E4DEBFCDBF22E0C1\r
+:10E0B000A0E0B1E001C01D92AC30B207E1F70E94D0\r
+:10E0C00048F10C9436F30C9400F09091C00095FF49\r
+:10E0D000FCCF8093C6000895CF93982F85958595A2\r
+:10E0E00085958595805D9F709A3014F0C7E501C0D5\r
+:10E0F000C0E3C90F0E9465F08C2FCF910C9465F09E\r
+:10E10000CF92DF92EF92FF92C12CD12C76018091B9\r
+:10E11000C00087FD15C08FEFC81AD80AE80AF80AB0\r
+:10E1200081EBC81681E7D8068BE0E806F10478F3A6\r
+:10E1300017B818B8E0910001F09101010995E7CFF7\r
+:10E140008091C600FF90EF90DF90CF900895CF931D\r
+:10E150000E9480F0C82F0E9465F0C13614F089EA51\r
+:10E1600003C0C0331CF080ED8C0F01C08C2FCF9109\r
+:10E170000895CF930E94A7F0C82F0E94A7F090E1C6\r
+:10E18000C99F800D1124CF910895CF93C82FCC2320\r
+:10E1900021F00E9480F0C150FACFCF910895CF9323\r
+:10E1A000C82F0E9480F0803251F484E10E9465F013\r
+:10E1B0008C2F0E9465F080E1CF910C9465F08091E6\r
+:10E1C00002018F5F80930201853041F417B818B8BF\r
+:10E1D000E0910001F0910101CF910994CF91089550\r
+:10E1E0000E9480F0803231F484E10E9465F080E189\r
+:10E1F0000C9465F0809102018F5F8093020185305D\r
+:10E2000039F417B818B8E0910001F09101010994B0\r
+:10E210000895CF93DF9300D000D0CDB7DEB7198239\r
+:10E220001A821B821C8289819A81AB81BC818115F3\r
+:10E230009042A140B10580F48091C00087FD0CC0E0\r
+:10E2400089819A81AB81BC810196A11DB11D898311\r
+:10E250009A83AB83BC83E7CF0F900F900F900F9002\r
+:10E26000DF91CF910895CF93C82F429A0E9409F170\r
+:10E27000439A0E9409F118B8CC2341F0449A0E94B5\r
+:10E2800009F144980E9409F1C150F6CFCF91089549\r
+:10E29000000018B88CE987B982E08093C0008CE058\r
+:10E2A0008093C4001092C50088E18093C10086E08D\r
+:10E2B0008093C20098E09093C9008093CA0084E0E4\r
+:10E2C0000E9433F103E011E0B1E1FB2E0E9480F0E7\r
+:10E2D000803309F447C0813319F50E9480F0803201\r
+:10E2E000B9F484E10E9465F081E40E9465F086E55E\r
+:10E2F0000E9465F082E50E9465F080E20E9465F070\r
+:10E3000089E40E9465F083E50E9465F080E595C18F\r
+:10E31000809102018F5F809302018530B9F69AC126\r
+:10E32000803439F40E9480F08638E0F00E9480F05A\r
+:10E3300019C0813491F40E9480F0803811F481EF8B\r
+:10E3400044C0813811F481E040C0823811F480E18A\r
+:10E350003CC08839C9F583E038C0823431F484E1A7\r
+:10E360000E94C5F00E94F0F0B1CF853411F485E031\r
+:10E37000F7CF982F9D7F9035A9F3813599F3853597\r
+:10E3800049F40E9480F080930A020E9480F08093FA\r
+:10E390000B02E8CF8635E1F40E9480F0803389F4E7\r
+:10E3A0000E9480F00E9480F0C82F0E9480F0C1116E\r
+:10E3B00002C08EE10AC0C13011F487E906C085E0D1\r
+:10E3C00004C083E00E94C5F080E00E94CFF07ECFC1\r
+:10E3D000843609F0C5C00E9480F0809309020E9433\r
+:10E3E00080F080930802809107028E7F809307025D\r
+:10E3F0000E9480F0853429F4809107028160809327\r
+:10E400000702C6E0D1E06E012091080230910902B6\r
+:10E41000C601865091408217930730F40E9480F025\r
+:10E42000F60181936F01F0CF0E9480F0803209F0F5\r
+:10E430000AC18091070280FF2DC080910A0290914D\r
+:10E440000B02880F991F90930B0280930A02E6E05B\r
+:10E45000F1E02091080230910902CF0186509140ED\r
+:10E460008217930708F07AC0F999FECF80910A02CB\r
+:10E4700090910B0292BD81BD819180BDFA9AF99A6B\r
+:10E4800080910A0290910B02019690930B02809367\r
+:10E490000A02DFCF80910B0287FF02C01BBF01C0C1\r
+:10E4A0001BBE80910A0290910B02880F991F9093D6\r
+:10E4B0000B0280930A028091080280FF09C08091BC\r
+:10E4C0000802909109020196909309028093080234\r
+:10E4D000F894A0910A02B0910B02F999FECF07B609\r
+:10E4E00000FCFDCF429A4D01A12CB12CF401A09269\r
+:10E4F0005B0000935700E89507B600FCFDCF4298FB\r
+:10E5000020E030E0AD01420F531F60E070E08981F0\r
+:10E5100090E0982F8827E8818E0F911D0C01FA0159\r
+:10E5200060935B0010935700E89511242E5F3F4FD6\r
+:10E5300022962115F1E03F0729F73093050120933A\r
+:10E54000040185E0F401A0925B0080935700E895F8\r
+:10E5500007B600FCFDCFF0925700E89584E16DC04E\r
+:10E56000843709F05AC00E9480F0809309020E940B\r
+:10E5700080F08093080280910A0290910B02880F2C\r
+:10E58000991F90930B0280930A020E9480F0909151\r
+:10E590000702853411F4916001C09E7F90930702B9\r
+:10E5A0000E9480F0803209F04AC084E10E9465F048\r
+:10E5B000C0E0D0E08091080290910902C817D90705\r
+:10E5C00008F03DC08091070280FF0BC0F999FECF93\r
+:10E5D00080910A0290910B0292BD81BDF89A80B59C\r
+:10E5E0000FC0E0910A02F0910B0281FD02C08491FC\r
+:10E5F00007C0CF01A0E0B0E01196ABBFFC0187914E\r
+:10E600000E9465F080910A0290910B02019690930E\r
+:10E610000B0280930A022196CDCF853719F50E940F\r
+:10E6200080F0803281F484E10E9465F08EE10E94E6\r
+:10E6300065F087E90E9465F085E00E9465F080E161\r
+:10E640000E9465F043CE809102018F5F80930201AA\r
+:10E65000853009F417B818B8E0910001F091010174\r
+:10E66000099534CE863709F031CEAECEF894FFCF7F\r
+:040000031000E00009\r
+:00000001FF\r

diff --git a/software/nano-1284/bootloader-arduino/src/main.c b/software/nano-1284/bootloader-arduino/src/main.c
index b93774c2c4c515f4e899b566e03343c91aa92556..3162adc0299c76ac38444e225b4d516af69bb389 100644 (file)
--- a/software/nano-1284/bootloader-arduino/src/main.c
+++ b/software/nano-1284/bootloader-arduino/src/main.c
@@ -311,8 +311,10 @@ int main () {
                                        printf("done\n");
                   printf("  boot_page_erase(0x%04x)...", address.word);
                #endif
+               SET_LED_RED;
                                        boot_page_erase(addr);
                                        boot_spm_busy_wait ();
+               CLR_LED_RED;
                                        #ifdef DEBUG_UART1
                                        printf("done\n");
                                        printf("  boot_page_fill(0x%04x, ...): ", address.word);