diff --git a/avr/apps/reportsensors/main.asm b/avr/apps/reportsensors/main.asm index a01bac5..027da1f 100644 --- a/avr/apps/reportsensors/main.asm +++ b/avr/apps/reportsensors/main.asm @@ -11,7 +11,7 @@ ; *************************************************************************** ; defines -.equ APP_REPORT_SENSORS_INTERVAL_SECS = 60 +.equ APP_REPORT_SENSORS_INTERVAL_SECS = 120 @@ -78,39 +78,39 @@ AppReportSensors_OnEverySecond_store: #ifdef MODULES_SI7021 cpi r16, 1 breq AppReportSensors_OnEverySecond_measureValue1 - cpi r16, 19 + cpi r16, 11 breq AppReportSensors_OnEverySecond_measureValue2 - cpi r16, 39 + cpi r16, 16 breq AppReportSensors_OnEverySecond_sendValue1 - cpi r16, 49 + cpi r16, 21 breq AppReportSensors_OnEverySecond_sendValue2 #endif #ifdef MODULES_SGP40 - cpi r16, 27 + cpi r16, 32 breq AppReportSensors_OnEverySecond_measureValue4 - cpi r16, 55 + cpi r16, 42 breq AppReportSensors_OnEverySecond_sendValue4 #endif #ifdef MODULES_SGP30 - cpi r16, 29 + cpi r16, 53 breq AppReportSensors_OnEverySecond_measureValue5 - cpi r16, 57 + cpi r16, 63 breq AppReportSensors_OnEverySecond_sendValue5 - cpi r16, 59 + cpi r16, 73 breq AppReportSensors_OnEverySecond_sendValue6 #endif #ifdef MODULES_DS18B20 - cpi r16, 9 + cpi r16, 84 breq AppReportSensors_OnEverySecond_sendValue3 #endif #ifdef MODULES_CCS811 - cpi r16, 31 + cpi r16, 94 breq AppReportSensors_OnEverySecond_sendCCS811_TVOC - cpi r16, 35 + cpi r16, 104 breq AppReportSensors_OnEverySecond_sendCCS811_CO2 #endif diff --git a/avr/apps/stats/main.asm b/avr/apps/stats/main.asm index 45b9091..a669c49 100644 --- a/avr/apps/stats/main.asm +++ b/avr/apps/stats/main.asm @@ -11,7 +11,7 @@ ; *************************************************************************** ; defines -.equ APP_STATS_INTERVAL_MINS = 11 +.equ APP_STATS_INTERVAL_MINS = 31 @@ -77,26 +77,38 @@ AppStats_OnEveryMinute_store: ldi yh, HIGH(netInterfaceData) cpi r16, 1 breq AppStats_OnEveryMinute_sendDevice - cpi r16, 2 - breq AppStats_OnEveryMinute_sendPacketsIn cpi r16, 3 - breq AppStats_OnEveryMinute_sendPacketsOut - cpi r16, 4 - breq AppStats_OnEveryMinute_sendContentErrs + breq AppStats_OnEveryMinute_sendPacketsIn cpi r16, 5 - breq AppStats_OnEveryMinute_sendIoErrs + breq AppStats_OnEveryMinute_sendPacketsOut cpi r16, 6 - breq AppStats_OnEveryMinute_sendNoBufErrs + breq AppStats_OnEveryMinute_sendDevice cpi r16, 7 + breq AppStats_OnEveryMinute_sendContentErrs + cpi r16, 9 + breq AppStats_OnEveryMinute_sendIoErrs + cpi r16, 10 + breq AppStats_OnEveryMinute_sendDevice + cpi r16, 11 + breq AppStats_OnEveryMinute_sendNoBufErrs + cpi r16, 13 breq AppStats_OnEveryMinute_sendCollisionErrs - cpi r16, 8 + cpi r16, 14 + breq AppStats_OnEveryMinute_sendDevice + cpi r16, 15 breq AppStats_OnEveryMinute_sendBusyErrs #ifdef MODULES_HEAP - cpi r16, 9 + cpi r16, 17 breq AppStats_OnEveryMinute_sendHeapUsed - cpi r16, 10 + cpi r16, 19 breq AppStats_OnEveryMinute_sendHeapfree #endif + cpi r16, 18 + breq AppStats_OnEveryMinute_sendDevice + cpi r16, 23 + breq AppStats_OnEveryMinute_sendDevice + cpi r16, 28 + breq AppStats_OnEveryMinute_sendDevice AppStats_OnEveryMinute_sendDevice: rjmp AppNetwork_SendDevice