From c0d3f88a857f1eb56317d74af85d7ab292d91cbc Mon Sep 17 00:00:00 2001
From: Manfred Steiner <sx@htl-kaindorf.at>
Date: Thu, 5 Sep 2024 12:28:11 +0200
Subject: [PATCH] software/nano-1284/bootloader-arduino
 (release/2024-09-05_120945)

---
 .../nano-1284/bootloader-arduino/Makefile     |   3 +
 .../bootloader-arduino_nano-1284.elf          | Bin 9972 -> 9976 bytes
 .../bootloader-arduino_nano-1284.hex          |  66 +++++++++---------
 .../nano-1284/bootloader-arduino/src/main.c   |   2 +
 4 files changed, 38 insertions(+), 33 deletions(-)
 rename software/nano-1284/bootloader-arduino/release/{2024-09-05_110459 => 2024-09-05_120945}/bootloader-arduino_nano-1284.elf (82%)
 rename software/nano-1284/bootloader-arduino/release/{2024-09-05_110459 => 2024-09-05_120945}/bootloader-arduino_nano-1284.hex (66%)

diff --git a/software/nano-1284/bootloader-arduino/Makefile b/software/nano-1284/bootloader-arduino/Makefile
index 7580934..bd4e491 100644
--- 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_120945/bootloader-arduino_nano-1284.elf
similarity index 82%
rename from software/nano-1284/bootloader-arduino/release/2024-09-05_110459/bootloader-arduino_nano-1284.elf
rename to software/nano-1284/bootloader-arduino/release/2024-09-05_120945/bootloader-arduino_nano-1284.elf
index 547e7b656f70953e3815c4188a60cac9acec14bf..955f52f4ba54ca447d144a0e65a99cdbd830e6f9 100755
GIT binary patch
delta 320
zcmez3`@?sF0^^5?ipsJDYzzz_%*w#Pzy!pMK+M7pVl*%mOiUDKWSLmGg5Ai<z|zXZ
zbg~Ac0i)UGNJdX4!KnuuCNeSh$2Ux7Vr(_o`EAzZ&CFXFk50~HiDu-Qe3ZqMv1;;f
zmRcF7S-y-5bvEjJVO%gNnt@?*IKzvn?AsXr{5|h9WAg-77e;mGbI2xfei7dxvE#u+
z2B7;G89Aq#oNF`Z{9t%)-R9qHoWhKGlUb$SGZsw#D&-F(U8VaO3pQVsKFr8?XY)*1
zZAQkN$w%e%8FMy&mD6Wq1$$(&qnhw!8&wgY@<3H(MwZE?s_H;;E|8R%d=yAVOn$4X
u&iaavfkAWfM^)j;I%)!p!jo;))ERXrrvk~s$-O}G$mFd+a?0epYT^KjqGVA3

delta 276
zcmWm4F-QV&7{=l6z4We|A_^?!q>$4@K_e}43u<sUT8apVXw$g%9D-YF)$1#0336*J
z{uH<s(%@oijxEs;R3MR5)aUSfc!&4P={fZ&y!z8I%hibn1&K(LAdxW`9=ZN@2;^5U
zjM+jqSI95&46?|nO%%0JzVmzywJnb|9AulHr>usq(c(&=gkio9<gv%!f&B>wjr3Kz
zhx4Nn5pU4TiE%?ezYpp-xD2dtSGUah&f$XjKG(Taf4Vt_9X7*naJe5|6^oG?T-A-V
zfJb#^rGPTGqZyP{Kbp}&oU~JNTeoAft9C+ch~wNA*Z4zx=E-;hBfKOgxgzeeFWz!f
Jtn*Vm^bd_rRvQ2S

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_120945/bootloader-arduino_nano-1284.hex
similarity index 66%
rename from software/nano-1284/bootloader-arduino/release/2024-09-05_110459/bootloader-arduino_nano-1284.hex
rename to software/nano-1284/bootloader-arduino/release/2024-09-05_120945/bootloader-arduino_nano-1284.hex
index a903211..4db935b 100644
--- 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_120945/bootloader-arduino_nano-1284.hex
@@ -7,11 +7,11 @@
 :10E050000C9463F00C9463F00C9463F00C9463F0F4
 :10E060000C9463F00C9463F00C9463F00C9463F0E4
 :10E070000C9463F00C9463F00C9463F00C9463F0D4
-:10E080000C9463F00C9463F00C9463F031313A30EB
-:10E09000343A35390053657020203520323032341F
+:10E080000C9463F00C9463F00C9463F031323A30EA
+:10E09000393A34350053657020203520323032341F
 :10E0A000000011241FBECFEFD0E4DEBFCDBF22E0C1
 :10E0B000A0E0B1E001C01D92AC30B207E1F70E94D0
-:10E0C00048F10C9434F30C9400F09091C00095FF4B
+:10E0C00048F10C9436F30C9400F09091C00095FF49
 :10E0D000FCCF8093C6000895CF93982F85958595A2
 :10E0E00085958595805D9F709A3014F0C7E501C0D5
 :10E0F000C0E3C90F0E9465F08C2FCF910C9465F09E
@@ -47,8 +47,8 @@
 :10E2D000803309F447C0813319F50E9480F0803201
 :10E2E000B9F484E10E9465F081E40E9465F086E55E
 :10E2F0000E9465F082E50E9465F080E20E9465F070
-:10E3000089E40E9465F083E50E9465F080E593C191
-:10E31000809102018F5F809302018530B9F698C128
+:10E3000089E40E9465F083E50E9465F080E595C18F
+:10E31000809102018F5F809302018530B9F69AC126
 :10E32000803439F40E9480F08638E0F00E9480F05A
 :10E3300019C0813491F40E9480F0803811F481EF8B
 :10E3400044C0813811F481E040C0823811F480E18A
@@ -60,16 +60,16 @@
 :10E3A0000E9480F00E9480F0C82F0E9480F0C1116E
 :10E3B00002C08EE10AC0C13011F487E906C085E0D1
 :10E3C00004C083E00E94C5F080E00E94CFF07ECFC1
-:10E3D000843609F0C3C00E9480F0809309020E9435
+:10E3D000843609F0C5C00E9480F0809309020E9433
 :10E3E00080F080930802809107028E7F809307025D
 :10E3F0000E9480F0853429F4809107028160809327
 :10E400000702C6E0D1E06E012091080230910902B6
 :10E41000C601865091408217930730F40E9480F025
 :10E42000F60181936F01F0CF0E9480F0803209F0F5
-:10E4300008C18091070280FF2DC080910A0290914F
+:10E430000AC18091070280FF2DC080910A0290914D
 :10E440000B02880F991F90930B0280930A02E6E05B
 :10E45000F1E02091080230910902CF0186509140ED
-:10E460008217930708F078C0F999FECF80910A02CD
+:10E460008217930708F07AC0F999FECF80910A02CB
 :10E4700090910B0292BD81BD819180BDFA9AF99A6B
 :10E4800080910A0290910B02019690930B02809367
 :10E490000A02DFCF80910B0287FF02C01BBF01C0C1
@@ -77,30 +77,30 @@
 :10E4B0000B0280930A028091080280FF09C08091BC
 :10E4C0000802909109020196909309028093080234
 :10E4D000F894A0910A02B0910B02F999FECF07B609
-:10E4E00000FCFDCF4D01A12CB12CF401A0925B00EA
-:10E4F00000935700E89507B600FCFDCF20E030E020
-:10E50000AD01420F531F60E070E0898190E0982FC9
-:10E510008827E8818E0F911D0C01FA0160935B0042
-:10E5200010935700E89511242E5F3F4F2296211536
-:10E53000F1E03F0729F7309305012093040185E0BE
-:10E54000F401A0925B0080935700E89507B600FCA9
-:10E55000FDCFF0925700E89584E16DC0843709F053
-:10E560005AC00E9480F0809309020E9480F080933C
-:10E57000080280910A0290910B02880F991F9093D4
-:10E580000B0280930A020E9480F09091070285346A
-:10E5900011F4916001C09E7F909307020E9480F069
-:10E5A000803209F04AC084E10E9465F0C0E0D0E00A
-:10E5B0008091080290910902C817D90708F03DC060
-:10E5C0008091070280FF0BC0F999FECF80910A026B
-:10E5D00090910B0292BD81BDF89A80B50FC0E09179
-:10E5E0000A02F0910B0281FD02C0849107C0CF01A5
-:10E5F000A0E0B0E01196ABBFFC0187910E9465F0EE
-:10E6000080910A0290910B02019690930B028093E5
-:10E610000A022196CDCF853719F50E9480F080320D
-:10E6200081F484E10E9465F08EE10E9465F087E943
-:10E630000E9465F085E00E9465F080E10E9465F02F
-:10E6400045CE809102018F5F80930201853009F4ED
-:10E6500017B818B8E0910001F0910101099536CE84
-:0CE66000863709F033CEB0CEF894FFCF1F
+:10E4E00000FCFDCF429A4D01A12CB12CF401A09269
+:10E4F0005B0000935700E89507B600FCFDCF4298FB
+:10E5000020E030E0AD01420F531F60E070E08981F0
+:10E5100090E0982F8827E8818E0F911D0C01FA0159
+:10E5200060935B0010935700E89511242E5F3F4FD6
+:10E5300022962115F1E03F0729F73093050120933A
+:10E54000040185E0F401A0925B0080935700E895F8
+:10E5500007B600FCFDCFF0925700E89584E16DC04E
+:10E56000843709F05AC00E9480F0809309020E940B
+:10E5700080F08093080280910A0290910B02880F2C
+:10E58000991F90930B0280930A020E9480F0909151
+:10E590000702853411F4916001C09E7F90930702B9
+:10E5A0000E9480F0803209F04AC084E10E9465F048
+:10E5B000C0E0D0E08091080290910902C817D90705
+:10E5C00008F03DC08091070280FF0BC0F999FECF93
+:10E5D00080910A0290910B0292BD81BDF89A80B59C
+:10E5E0000FC0E0910A02F0910B0281FD02C08491FC
+:10E5F00007C0CF01A0E0B0E01196ABBFFC0187914E
+:10E600000E9465F080910A0290910B02019690930E
+:10E610000B0280930A022196CDCF853719F50E940F
+:10E6200080F0803281F484E10E9465F08EE10E94E6
+:10E6300065F087E90E9465F085E00E9465F080E161
+:10E640000E9465F043CE809102018F5F80930201AA
+:10E65000853009F417B818B8E0910001F091010174
+:10E66000099534CE863709F031CEAECEF894FFCF7F
 :040000031000E00009
 :00000001FF
diff --git a/software/nano-1284/bootloader-arduino/src/main.c b/software/nano-1284/bootloader-arduino/src/main.c
index b93774c..3162adc 100644
--- 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);
-- 
2.39.5