Update cyclic.cpp

src/cyclic.cpp

@@ -9,8 +9,14 @@ static const char TAG[] = __FILE__;
 
 Ticker housekeeper;
 
+#if (HAS_SDS011)
+extern boolean isSDS011Active;
+#endif
+
 void housekeeping() {
+  static int counter = 0;
   xTaskNotifyFromISR(irqHandlerTask, CYCLIC_IRQ, eSetBits, NULL);
+ESP_LOGI( TAG, "in Housekeeping(): %d", counter++);
 }
 
 // do all housekeeping
@@ -18,7 +24,6 @@ void doHousekeeping() {
 
   // update uptime counter
   uptime();
-
   // check if update mode trigger switch was set
   if (RTC_runmode == RUNMODE_UPDATE) {
     // check battery status if we can before doing ota
@@ -112,6 +117,113 @@ void doHousekeeping() {
   }
 #endif
 
+#if (HAS_SDS011)
+    if ( isSDS011Active ) {
+        ESP_LOGD(TAG, "SDS011: go to sleep");
+        sds011_loop();
+    }
+    else {
+        ESP_LOGD(TAG, "SDS011: wakeup");
+        sds011_wakeup();
+    }
+#endif
+
+} // doHousekeeping()
+
+// uptime counter 64bit to prevent millis() rollover after 49 days
+uint64_t uptime() {
+  static uint32_t low32, high32;
+  uint32_t new_low32 = millis();
+  if (new_low32 < low32)
+    high32++;
+  low32 = new_low32;
+  return (uint64_t)high32 << 32 | low32;
+}
+
+uint32_t getFreeRAM() {
+#ifndef BOARD_HAS_PSRAM
+  return ESP.getFreeHeap();
+#else
+  return ESP.getFreePsram();
+#endif
+}
+
+void reset_counters() {
+#if ((WIFICOUNTER) || (BLECOUNTER))
+  macs.clear();   // clear all macs container
+  macs_total = 0; // reset all counters
+  macs_wifi = 0;
+  macs_ble = 0;
+#ifdef HAS_DISPLAY
+  oledPlotCurve(0, true);
+#endif
+
+#endif
+}
+#endif
+
+#if (defined HAS_DCF77 || defined HAS_IF482)
+  ESP_LOGD(TAG, "Clockloop %d bytes left | Taskstate = %d",
+           uxTaskGetStackHighWaterMark(ClockTask), eTaskGetState(ClockTask));
+#endif
+
+#if (HAS_LED != NOT_A_PIN) || defined(HAS_RGB_LED)
+  ESP_LOGD(TAG, "LEDloop %d bytes left | Taskstate = %d",
+           uxTaskGetStackHighWaterMark(ledLoopTask),
+           eTaskGetState(ledLoopTask));
+#endif
+
+// read battery voltage into global variable
+#if (defined BAT_MEASURE_ADC || defined HAS_PMU)
+  batt_voltage = read_voltage();
+  if (batt_voltage == 0xffff)
+    ESP_LOGI(TAG, "Battery: external power");
+  else
+    ESP_LOGI(TAG, "Battery: %dmV", batt_voltage);
+#ifdef HAS_PMU
+  AXP192_showstatus();
+#endif
+#endif
+
+// display BME680/280 sensor data
+#if (HAS_BME)
+#ifdef HAS_BME680
+  ESP_LOGI(TAG, "BME680 Temp: %.2f°C | IAQ: %.2f | IAQacc: %d",
+           bme_status.temperature, bme_status.iaq, bme_status.iaq_accuracy);
+#elif defined HAS_BME280
+  ESP_LOGI(TAG, "BME280 Temp: %.2f°C | Humidity: %.2f | Pressure: %.0f",
+           bme_status.temperature, bme_status.humidity, bme_status.pressure);
+#elif defined HAS_BMP180
+  ESP_LOGI(TAG, "BMP180 Temp: %.2f°C | Pressure: %.0f", bme_status.temperature,
+           bme_status.pressure);
+#endif
+#endif
+
+  // check free heap memory
+  if (ESP.getMinFreeHeap() <= MEM_LOW) {
+    ESP_LOGI(TAG,
+             "Memory full, counter cleared (heap low water mark = %d Bytes / "
+             "free heap = %d bytes)",
+             ESP.getMinFreeHeap(), ESP.getFreeHeap());
+    reset_counters(); // clear macs container and reset all counters
+    get_salt();       // get new salt for salting hashes
+
+    if (ESP.getMinFreeHeap() <= MEM_LOW) // check again
+      do_reset(true);                    // memory leak, reset device
+  }
+
+// check free PSRAM memory
+#ifdef BOARD_HAS_PSRAM
+  if (ESP.getMinFreePsram() <= MEM_LOW) {
+    ESP_LOGI(TAG, "PSRAM full, counter cleared");
+    reset_counters(); // clear macs container and reset all counters
+    get_salt();       // get new salt for salting hashes
+
+    if (ESP.getMinFreePsram() <= MEM_LOW) // check again
+      do_reset(true);                     // memory leak, reset device
+  }
+#endif
+
 } // doHousekeeping()
 
 // uptime counter 64bit to prevent millis() rollover after 49 days
@@ -143,4 +255,4 @@ void reset_counters() {
 #endif
 
 #endif
-}
+}