avr: new com2 and timer stack basically works again.

avr/main.asm

@@ -128,6 +128,10 @@ initModules:
   rcall SI7021_Init
 #endif
 
+#ifdef MODULES_STATS
+  rcall Stats_Init
+#endif
+
   ; done
   ret
 
@@ -163,6 +167,10 @@ runModulesUntilIdle_Com:
   brne runModulesUntilIdle_Com
 runModulesUntilIdle_ComEnd:  
   
+#endif
+
+#ifdef MODULES_STATS
+  rcall Stats_Run
 #endif
 
   ; add more modules here
@@ -253,6 +261,7 @@ printTimerMark:
 
 
 printSendStats:
+#if 0
   in r15, SREG ; debug
   push r15
     cli
@@ -291,8 +300,7 @@ printSendStats:
   out SREG, r15
   ret
 
-#if 0
-printSendStats:
+#else
   in r15, SREG ; debug
   push r15
     cli
@@ -323,14 +331,12 @@ printSendStats:
     ldi zl, LOW(textAddress)
     ldi zh, HIGH(textAddress)
     rcall LCD_PrintFromFlash
-    lds r16, comAddress
+    lds r16, com2Address
     rcall LCD_PrintHexByte
     ldi r16, 32
     rcall LCD_PrintChar
     lds r16, cproMode
     rcall LCD_PrintHexByte
-    lds r16, cproAddressWaitCounter
-    rcall LCD_PrintHexByte
     ldi r16, 32
     rcall LCD_PrintChar
     lds r16, cproAddrRangeBegin
@@ -358,8 +364,8 @@ printSendStats:
     ldi zl, LOW(textStatsPacketsIn)
     ldi zh, HIGH(textStatsPacketsIn)
     rcall LCD_PrintFromFlash
-    lds r18, comStatsPacketsIn
-    lds r19, comStatsPacketsIn+1
+    lds r18, com2StatsPacketsIn
+    lds r19, com2StatsPacketsIn+1
     rcall LCD_PrintHexWord
   
     ldi r18, 0
@@ -368,15 +374,14 @@ printSendStats:
     ldi zl, LOW(textStatsPacketsOut)
     ldi zh, HIGH(textStatsPacketsOut)
     rcall LCD_PrintFromFlash
-    lds r18, comStatsPacketsOut
-    lds r19, comStatsPacketsOut+1
+    lds r18, com2StatsPacketsOut
+    lds r19, com2StatsPacketsOut+1
     rcall LCD_PrintHexWord
 #endif
  
   pop r15
   out SREG, r15
   ret
-#endif ; if 0
 #endif