diff --git a/avr/apps/stats/main.asm b/avr/apps/stats/main.asm index e3cb904..f0b0a76 100644 --- a/avr/apps/stats/main.asm +++ b/avr/apps/stats/main.asm @@ -53,6 +53,15 @@ AppStats_Fini: ; AppStats_OnEveryMinute: + push r15 + in r15, SREG + cli + rcall AppStats_OnEveryMinute_noIrq + out SREG, r15 + pop r15 + ret + +AppStats_OnEveryMinute_noIrq: ldi yl, LOW(netInterfaceData) ldi yh, HIGH(netInterfaceData) rcall AppNetwork_SendRxdStats ; debug diff --git a/avr/devices/n20/main.asm b/avr/devices/n20/main.asm index 8efd2b8..5dc6bce 100644 --- a/avr/devices/n20/main.asm +++ b/avr/devices/n20/main.asm @@ -44,7 +44,7 @@ ; --------------------------------------------------------------------------- ; generic -.equ NET_BUFFERS_NUM = 6 +.equ NET_BUFFERS_NUM = 4 .equ NET_BUFFERS_SIZE = 32 @@ -57,21 +57,21 @@ #define MODULES_LED_SIMPLE #define MODULES_NETWORK #define MODULES_UART_BITBANG -#define MODULES_TWI_MASTER +;#define MODULES_TWI_MASTER ;#define MODULES_LCD ;#define LCD_MINIMAL_FONT -#define MODULES_SI7021 +;#define MODULES_SI7021 ;#define MODULES_STATS ;#define MODULES_OWI_MASTER ;#define MODULES_DS18B20 -#define MODULES_MOTION +;#define MODULES_MOTION ;#define MODULES_TCRT1000 ;#define MODULES_CCS811 #define APPS_NETWORK -#define APPS_MOTION +;#define APPS_MOTION ;#define APPS_DOOR -#define APPS_REPORTSENSORS +;#define APPS_REPORTSENSORS #define APPS_STATS diff --git a/avr/modules/uart_bitbang2/iface.asm b/avr/modules/uart_bitbang2/iface.asm index b814def..5bfcbde 100644 --- a/avr/modules/uart_bitbang2/iface.asm +++ b/avr/modules/uart_bitbang2/iface.asm @@ -25,8 +25,7 @@ .dseg -uart_bitbang_iface: .byte NET_IFACE_SIZE - +uart_bitbang_iface: .byte NET_IFACE_SIZE @@ -198,7 +197,7 @@ uartBitbang_receiveNextPkg_end: uartBitbang_receiveAndCheckPkg: ldd r16, Y+NET_IFACE_OFFS_ADDRESS - ldi r17, (NET_BUFFERS_SIZE-2) + ldi r17, (NET_BUFFERS_SIZE-4) push xl push xh rcall uartBitbang_ReceivePacketIntoBuffer ; (r16, r17, r18, r19, r20, r21, r22, X)