avr: some more cleanup.

avr/att84_temp1.asm

@@ -263,10 +263,9 @@
 .dseg
 
 
-sramTimerProtocolEverySec: .byte 2
+#ifdef MODULES_LCD
-sramTimerWriteStats:       .byte 2
+  sramTimerWriteStats:       .byte 2
-sramTimerEnqueueMemStats:  .byte 2
+#endif
-sramTimerEnqueueSysStats:  .byte 2
 sramTimerEnqueueValues:    .byte 2
 sramTimerSI7021Measure:    .byte 2
 #ifdef MODULES_LCD
@@ -281,7 +280,7 @@ sramTimerSI7021Measure:    .byte 2
 
 ledA3Flash:    .db DDRA+0x20, PORTA+0x20, PINA+0x20, (1<<PORTA3)
 blinkPattern:  .db 2, 50, 0xff, 0xff   ; 1 short blink, 2s pause, restart
-blinkPattern2: .db 2, 2, 0xff, 0xff   ; 1 short blink, short pause, restart
+;blinkPattern2: .db 2, 2, 0xff, 0xff   ; 1 short blink, short pause, restart
 
 
 

avr/comproto_stats.asm

@@ -1,144 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2023 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-
-
-; ***************************************************************************
-; code
-
-.cseg
-
-
-; ---------------------------------------------------------------------------
-; Enqueue a COM Send stats packet.
-;
-; IN:
-; - R16: destination address
-; OUT:
-; - CFLAG: set if okay, clear otherwise
-; MODIFIED REGS: R16, R17, R20, X (R15, Y)
-
-CPRO_EnqueueComSendStats:
-  push r15
-    in r15, SREG
-    cli
-    push r16
-      rcall COM_AllocBufferAndGetXY ; (r16, r17, r21) -> Y=buffer, X=msg
-    pop r16
-    brcc CPRO_EnqueueComSendStats_error
-
-    ldi r17, CPRO_PAYLOAD_FLAGS_UID | (8<<CPRO_PAYLOAD_FLAGS_SHIFT_NUM) ; seconds + 8 bytes payload
-    ldi r18, CPRO_CMD_COMSENDSTATS
-    push xh
-      push xl
-        rcall cproBeginMsgWithVariablePayload  ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
-        lds r16, comStatsPacketsOut            ; packets out
-        st X+, r16
-        lds r16, comStatsPacketsOut+1
-        st X+, r16
-        lds r16, comStatsCollisions            ; collisions
-        st X+, r16
-        lds r16, comStatsCollisions+1
-        st X+, r16
-        lds r16, comStatsAborted               ; aborted
-        st X+, r16
-        lds r16, comStatsAborted+1
-        st X+, r16
-        lds r16, comStatsSendNoBuffer          ; sendNoBuffer
-        st X+, r16
-        lds r16, comStatsSendNoBuffer+1
-        st X+, r16
-      pop xl
-    pop xh
-    rcall comCalcAndAddChecksumByte            ; (R16, R17, R18, R19, X)
-  
-    ; mark buffer as enqueued with PRIO "important" (higher retry count)
-    ldi r20, COM_BUFFER_PRIO_IMPORTANT
-    rcall COM_EnqueuePacket      ; (R15, R16)
-    brcc CPRO_EnqueueComSendStats_error
-  pop r15
-  out SREG, r15
-  sec
-  ret
-CPRO_EnqueueComSendStats_error:
-  pop r15
-  out SREG, r15
-  clc
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; Enqueue a COM reception stats packet.
-;
-; IN:
-; - R16: destination address
-; OUT:
-; - CFLAG: set if okay, clear otherwise
-; MODIFIED REGS: R16, R17, R20, X (R15, Y)
-
-CPRO_EnqueueComRecvStats:
-  push r15
-    in r15, SREG
-    cli
-    push r16
-      rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
-    pop r16
-    brcc CPRO_EnqueueComRecvStats_error
-
-    ldi r17, CPRO_PAYLOAD_FLAGS_UID | (12<<CPRO_PAYLOAD_FLAGS_SHIFT_NUM) ; seconds + 6 bytes payload
-    ldi r18, CPRO_CMD_COMRECVSTATS
-    push xh
-      push xl
-        rcall cproBeginMsgWithVariablePayload   ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
-        lds r16, comStatsPacketsIn              ; packets in
-        st X+, r16                             
-        lds r16, comStatsPacketsIn+1
-        st X+, r16
-        lds r16, comStatsRecvCrcErrs            ; CRC errors
-        st X+, r16
-        lds r16, comStatsRecvCrcErrs+1
-        st X+, r16
-        lds r16, comStatsRecvErrs               ; IO errors
-        st X+, r16
-        lds r16, comStatsRecvErrs+1
-        st X+, r16
-        lds r16, comStatsRecvNoBuffer           ; no buffer
-        st X+, r16
-        lds r16, comStatsRecvNoBuffer+1
-        st X+, r16
-        lds r16, comStatsHandled                ; handled
-        st X+, r16
-        lds r16, comStatsHandled+1
-        st X+, r16
-        lds r16, comStatsMissed                 ; missed
-        st X+, r16
-        lds r16, comStatsMissed+1
-        st X+, r16
-      pop xl
-    pop xh
-    rcall comCalcAndAddChecksumByte             ; (R16, R17, R18, R19, X)
-  
-    ; mark buffer as enqueued with PRIO "important" (higher retry count)
-    ldi r20, COM_BUFFER_PRIO_IMPORTANT
-    rcall COM_EnqueuePacket      ; (R15, R16)
-    brcc CPRO_EnqueueComRecvStats_error
-  pop r15
-  out SREG, r15
-  sec
-  ret
-CPRO_EnqueueComRecvStats_error:
-  pop r15
-  out SREG, r15
-  clc
-  ret
-
-
-