From eec544d1b8696d90939a8f19acac877f29aa8cde Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Thu, 5 Sep 2024 18:50:43 +0200
Subject: [PATCH] avr: send firmware version in FLASH_READY and DEVICE
 messages.

---
 avr/modules/comproto/msg_device.asm | 10 +++++-----
 avr/modules/flash/flash_ready.asm   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/avr/modules/comproto/msg_device.asm b/avr/modules/comproto/msg_device.asm
index 31a6fe7..5f01bbd 100644
--- a/avr/modules/comproto/msg_device.asm
+++ b/avr/modules/comproto/msg_device.asm
@@ -26,21 +26,21 @@
 ; REGS: R3, R4, R16, R17, R18, X (R19, R20, R21)
 
 CPRO_WriteDevice:
-  ldi r17, COM2_PAYLOAD_FLAGS_UID | (8<<COM2_PAYLOAD_FLAGS_SHIFT_NUM)
+  ldi r17, COM2_PAYLOAD_FLAGS_UID | (12<<COM2_PAYLOAD_FLAGS_SHIFT_NUM)
   ldi r18, CPRO_CMD_DEVICE
   rcall COM2_BeginMsgWithVariablePayload    ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
   push yh
     push yl
-      ldi zh, HIGH(devInfoBlock*2)          ; 6-13: devInfoBlock
+      ldi zh, HIGH(devInfoBlock*2)          ; 6-17: devInfoBlock
       ldi zl, LOW(devInfoBlock*2)
-      ldi r18, 8
+      ldi r18, 12
       rcall Utils_CopyFromFlash             ; (R17, R18, X, Y)
     pop yl
   pop yh
 
-  sbiw xh:xl, 16 ; go back to beginning of message (1 byte dst addr, 1 byte length, 14 bytes payload)
+  sbiw xh:xl, 20 ; go back to beginning of message (1 byte dst addr, 1 byte length, 14 bytes payload)
   rcall com2CalcAndAddChecksumByte           ; (R16, R17, R18, R19, R20, X)
-  sbiw xh:xl, 17 ; go back to beginning of message (1 byte dst addr, 1 byte length, 14 bytes payload, 1 byte crc)
+  sbiw xh:xl, 21 ; go back to beginning of message (1 byte dst addr, 1 byte length, 14 bytes payload, 1 byte crc)
   ret
 
 
diff --git a/avr/modules/flash/flash_ready.asm b/avr/modules/flash/flash_ready.asm
index fd20949..8194e7d 100644
--- a/avr/modules/flash/flash_ready.asm
+++ b/avr/modules/flash/flash_ready.asm
@@ -29,7 +29,7 @@
 flashWriteFlashReady:
   ldi r16, 0xff
   st X+, r16  ; dest address (unused)
-  ldi r16, 16 ; msg code+src address+14 payload bytes
+  ldi r16, 20 ; msg code+src address+18 payload bytes
   st X+, r16  ; msg len
   ldi r16, CPRO_CMD_FLASH_READY
   st X+, r16  ; msg code
@@ -42,9 +42,9 @@ flashWriteFlashReady:
   ldi r18, 4
   rcall Utils_Copy_SDRAM
   
-  ldi zl, low(devInfoBlock*2) ; 8 bytes
+  ldi zl, low(devInfoBlock*2) ; 12 bytes
   ldi zh, HIGH(devInfoBlock*2)
-  ldi r18, 8
+  ldi r18, 12
   rcall Utils_CopyFromFlash
 
   ldi r16, LOW(PAGESIZE*2)   ; 2 bytes
@@ -52,9 +52,9 @@ flashWriteFlashReady:
   ldi r16, HIGH(PAGESIZE*2)
   st X+, r16
   
-  sbiw xh:xl, 18 ; go back to beginning of message
+  sbiw xh:xl, 22 ; go back to beginning of message
   rcall com2CalcAndAddChecksumByte ; (R16, R17, R18, R19, R20, X)
-  sbiw xh:xl, 19 ; go back to beginning of message
+  sbiw xh:xl, 23 ; go back to beginning of message
   ret