Fix response to EOF record

Loading Hex file was terminated prematurely (as soon as record type 1
was recognized), leading to a false error message in dsmtk.
Now checksum of EOF record is checked and if correct, proper 'G' code
is sent back.

Author: OlekMazur

command_1W.asm

@@ -25,7 +25,7 @@ endif
 command_1wire_transfer:
 	mov P1, #11111011b	; OW_GND do masy, jedynki gdzie indziej
 command_1wire_transfer_loop:
-	acall get_hex_or_char
+	bcall get_hex_or_char
 	jnc command_1wire_send_byte
 	jnz command_1wire_handle_char
 	; C=1, A=0 -> koniec

library.asm

@@ -13,7 +13,7 @@
 ; You should have received a copy of the GNU General Public License
 ; along with Programator. If not, see <https://www.gnu.org/licenses/>.
 ;
-; Copyright (c) 2022, 2024 Aleksander Mazur
+; Copyright (c) 2022, 2024, 2025 Aleksander Mazur
 ;
 ; Funkcje pomocnicze, głównie do obsługi wejścia (poleceń)
 
@@ -303,20 +303,25 @@ receive_hex_rec2:
 	acall receive_hex_byte
 	jc receive_hex_rec_error_H	; nie hex
 	; A = typ rekordu (0 - dane, 1 - koniec)
+	mov R6, A
+	; w R6 policzymy sobie sumę kontrolną
+	add A, R7
+	add A, R4
+	add A, R5
+	xch A, R6
 	jz receive_hex_rec_payload
+	cjne A, #1, receive_hex_rec_error_R
+receive_hex_rec_check_sum:
+	; wszystkie bajty odebrane, teraz powinna być suma kontrolna
+	acall receive_hex_byte
+	jc receive_hex_rec_error_H	; nie hex
+	add A, R6
 	setb C
-	dec A
-	jz ret7	; A=0 i C=1 oznacza EOF
-	; nieprawidłowy typ rekordu
-	mov A, #'R'
+	jz ret7	;	suma OK? to C=1 i A=0
+	mov A, #'S'
 ret7:
 	ret
 receive_hex_rec_payload:
-	; w R6 policzymy sobie sumę kontrolną
-	mov A, R7
-	add A, R4
-	add A, R5
-	mov R6, A
 	mov R0, #input	; R0 = pozycja w buforze
 	mov A, R7
 	jz receive_hex_rec_checksum
@@ -329,14 +334,12 @@ receive_hex_rec_loop:
 	inc R0
 	djnz R3, receive_hex_rec_loop
 receive_hex_rec_checksum:
-	; wszystkie bajty odebrane, teraz powinna być suma kontrolna
-	acall receive_hex_byte
-	jc receive_hex_rec_error_H	; nie hex
-	add A, R6
-	jnz receive_hex_rec_error_S
+	acall receive_hex_rec_check_sum
+	jnz ret9
+	; rekord wczytany poprawnie
 	mov R0, #input
-receive_hex_rec_eof:
 	clr C
+ret9:
 	ret
 receive_hex_rec_error_H:
 	; C=1
@@ -346,9 +349,9 @@ receive_hex_rec_error_L:
 	setb C
 	mov A, #'L'
 	ret
-receive_hex_rec_error_S:
+receive_hex_rec_error_R:
 	setb C
-	mov A, #'S'
+	mov A, #'R'
 	ret
 
 ;-----------------------------------------------------------
@@ -379,14 +382,13 @@ load_hex_file:
 	acall ensure_no_args
 load_hex_file_loop:
 	acall receive_hex_rec
-	jc load_hex_file_check
+	jc load_hex_rec_check
 	; pod R0 jest R7 bajtów do zapisu pod adres R4:R5
 	; (adres z R4:R5 jest w dziedzinie specyficznej dla callbacka)
 	mov A, R7
 	jz load_hex_rec_empty	; zabezpieczenie przed rekordem o zerowej długości
 	clr A
 	acall jmp_dptr
-load_hex_file_check:
 	jz ret8
 load_hex_file_error:
 	; w A jest znak ACK/NAK
@@ -395,6 +397,11 @@ load_hex_file_error:
 load_hex_rec_empty:
 	mov A, #'G'
 	sjmp load_hex_file_error
+load_hex_rec_check:
+	; C=1 i A=0 -> EOF; wypisujemy G i wychodzimy
+	jnz load_hex_file_error
+	mov A, #'G'
+	ajmp uart_send_char
 
 ;-----------------------------------------------------------
 ; Dekoduje liczbę szesnastkową podaną w ASCII do rejestrów R2:R3.

main.asm

@@ -717,7 +717,7 @@ endif
 if	USE_AVR
 s_welcome3:	db	"AVR"
 endif
-s_welcome4:	db	" PROGRAMMER VERSION 1.1  Copyright (c) 2022-2024 Aleksander Mazur",0
+s_welcome4:	db	" PROGRAMMER VERSION 1.2  Copyright (c) 2022-2025 Aleksander Mazur",0
 
 if	USE_HELP_DESC
 if	USE_HELP
@@ -739,9 +739,9 @@ s_help_LR:	db	"Load internal RAM",0
 s_help_VR:	db	"Verify internal RAM",0
 endif
 if	ICP51_W79EX051
-s_help_D:	db	"Dump W79EX051 memory",0
-s_help_V:	db	"Verify W79EX051 memory",0
-s_help_LB:	db	"Load W79EX051 memory blindly",0
+s_help_D:	db	"Dump W79EX051",0
+s_help_V:	db	"Verify W79EX051",0
+s_help_LB:	db	"Load W79EX051 blindly",0
 s_help_K:	db	"Klear W79EX051: 26=erase all, 22=AP flash (default), 62=NVM",0
 s_help_NR:	db	"Reset W79EX051 & enter ICP mode",0
 s_help_NT:	db	"Transfer to/from W79EX051 (no reset): NT 0000S0BRJ FB00S0CRZ RJ",0