diff --git a/avr/main.asm b/avr/main.asm index 9d3307a..07cba7d 100644 --- a/avr/main.asm +++ b/avr/main.asm @@ -58,6 +58,8 @@ main_loop: ; USED: depending on called routines initModules: + rcall Utils_Init + #ifdef MODULES_TIMER rcall Timer_Init #endif @@ -129,9 +131,6 @@ runModulesUntilIdle_ComEnd: - - - printSendStats: push r15 in r15, SREG ; debug @@ -162,6 +161,41 @@ printSendStats: ldi r18, 0 ldi r19, 2 rcall LCD_SetCursor + ldi zl, LOW(textUid) + ldi zh, HIGH(textUid) + rcall LCD_PrintFromFlash + push xh ; 1-4: UID + push xl + rcall Utils_ReadUid ; (R16, X) + pop xl + pop xh + push r18 + push r19 + mov r18, r20 + mov r19, r21 + rcall LCD_PrintHexWord + pop r19 + pop r18 + rcall LCD_PrintHexWord + + ldi r18, 0 + ldi r19, 3 + rcall LCD_SetCursor + ldi zl, LOW(textRandom) + ldi zh, HIGH(textRandom) + rcall LCD_PrintFromFlash + rcall Utils_PseudoRandom + rcall LCD_PrintHexByte + ldi r16, 32 + rcall LCD_PrintChar + lds r18, utilsSeed + lds r19, utilsSeed+1 + rcall LCD_PrintHexWord + + + ldi r18, 0 + ldi r19, 4 + rcall LCD_SetCursor ldi zl, LOW(textStatsPacketsIn) ldi zh, HIGH(textStatsPacketsIn) rcall LCD_PrintFromFlash @@ -170,7 +204,7 @@ printSendStats: rcall LCD_PrintHexWord ldi r18, 0 - ldi r19, 3 + ldi r19, 5 rcall LCD_SetCursor ldi zl, LOW(textStatsPacketsRecvErr) ldi zh, HIGH(textStatsPacketsRecvErr) @@ -181,7 +215,7 @@ printSendStats: ldi r18, 0 - ldi r19, 5 + ldi r19, 6 rcall LCD_SetCursor ldi zl, LOW(textStatsPacketsOut) ldi zh, HIGH(textStatsPacketsOut) @@ -191,7 +225,7 @@ printSendStats: rcall LCD_PrintHexWord ldi r18, 0 - ldi r19, 6 + ldi r19, 7 rcall LCD_SetCursor ldi zl, LOW(textStatsCollisions) ldi zh, HIGH(textStatsCollisions) @@ -199,16 +233,7 @@ printSendStats: lds r18, comStatsCollisions lds r19, comStatsCollisions+1 rcall LCD_PrintHexWord - - ldi r18, 0 - ldi r19, 7 - rcall LCD_SetCursor - ldi zl, LOW(textStatsAborted) - ldi zh, HIGH(textStatsAborted) - rcall LCD_PrintFromFlash - lds r18, comStatsAborted - lds r19, comStatsAborted+1 - rcall LCD_PrintHexWord + pop r15 out SREG, r15 ret @@ -221,6 +246,8 @@ textStatsPacketsRecvErr: .db "RecvErr: ", 0 textStatsPacketsOut: .db "Out : ", 0 textStatsCollisions: .db "Coll : ", 0 textStatsAborted: .db "Aborted: ", 0 +textUid: .db "UID : ", 0 +textRandom: .db "RANDOM : ", 0