data point every minute; ota separation for rev4; access point fixes

New access point passkey!

Author: tcsullivan

noisemeter-device/access-point.cpp

@@ -56,8 +56,10 @@ void AccessPoint::run()
     networkScanCount = WiFi.scanNetworks();
 
     WiFi.mode(WIFI_AP);
+    delay(250);
     WiFi.softAPConfig(IP, IP, Netmask);
     WiFi.softAP(SSID, Passkey);
+    delay(250);
 
     dns.start(DNSPort, "*", IP);
 

noisemeter-device/access-point.h

@@ -43,7 +43,7 @@ class AccessPoint : public RequestHandler
     /** Hard-coded SSID for the access point. */
     static constexpr auto SSID = "tRacket_Setup";
     /** Hard-coded passkey for the access point. */
-    static constexpr auto Passkey = "noise123";
+    static constexpr auto Passkey = "tracket1234";
 
 public:
     /**

noisemeter-device/noisemeter-device.ino

@@ -42,12 +42,14 @@ HWCDC USBSerial;
 constexpr auto WIFI_CONNECT_TIMEOUT_SEC = MIN_TO_SEC(2);
 /** Maximum number of seconds to try making new WiFi connection. */
 constexpr auto WIFI_NEW_CONNECT_TIMEOUT_SEC = 20;
-/** Specifies how frequently to upload data points to the server. */
-constexpr auto UPLOAD_INTERVAL_SEC = MIN_TO_SEC(5);
+/** Minimum number of packets required before upload. */
+constexpr auto UPLOAD_PACKET_MIN = 5;
+/** Specifies how frequently to create a packet w/ min/mean/max stats. */
+constexpr auto PACKET_INTERVAL_SEC = MIN_TO_SEC(1);
 /** Specifies how frequently to check for OTA updates from our server. */
 constexpr auto OTA_INTERVAL_SEC = HR_TO_SEC(24);
 /** Maximum number of data packets to retain when WiFi is unavailable. */
-constexpr auto MAX_SAVED_PACKETS = DAY_TO_SEC(14) / UPLOAD_INTERVAL_SEC;
+constexpr auto MAX_SAVED_PACKETS = DAY_TO_SEC(14) / PACKET_INTERVAL_SEC;
 
 /** Storage instance to manage stored credentials. */
 static Storage Creds;
@@ -63,6 +65,8 @@ static bool firstSend;
  */
 void printReadingToConsole(double reading);
 
+void otaUpdateCheck(API&);
+
 /**
  * Callback for AccessPoint that verifies credentials and attempts registration.
  * @param ssid The name of the network to connect to
@@ -167,77 +171,74 @@ void setup()
 
 void loop()
 {
-#ifndef UPLOAD_DISABLED
-  static int wakeupCount = 0;
+  auto lastWake = xTaskGetTickCount();
 
-  vTaskDelay(pdMS_TO_TICKS(SEC_TO_MS(UPLOAD_INTERVAL_SEC)));
+  auto readyCount = packets.size();
+  if (readyCount == MAX_SAVED_PACKETS) {
+    SERIAL.println("Discarded a packet!");
+    packets.pop_back();
+  }
 
+  // Timestamp current packet, then immediately create new packet for ongoing
+  // samples to feed into.
   packets.front().timestamp = Timestamp();
   packets.emplace_front();
 
-  if (WiFi.status() != WL_CONNECTED) {
-    SERIAL.println("Attempting WiFi reconnect...");
-    WiFi.reconnect();
-    delay(5000);
-  }
-
-  if (WiFi.status() == WL_CONNECTED) {
-    API api (buildDeviceId(), Creds.get(Storage::Entry::Token));
+#ifndef UPLOAD_DISABLED
+  static int otaCountdown = 0; // zero to force check on first upload
 
-    if (firstSend) {
-      const bool success = api.sendMeasurementWithDiagnostics(
-        packets.back(), NOISEMETER_VERSION, String(millis() / 1000));
+  otaCountdown -= PACKET_INTERVAL_SEC;
 
-      if (success) {
-        packets.pop_back();
-        firstSend = false;
-      }
+  if (readyCount >= UPLOAD_PACKET_MIN) {
+    if (WiFi.status() != WL_CONNECTED) {
+      SERIAL.println("Attempting WiFi reconnect...");
+      WiFi.reconnect();
+      delay(5000);
     }
 
-    const auto size = packets.size();
-    if (size > 1) {
-      if (size == 2 && api.sendMeasurement(packets.back())) {
-        packets.pop_back();
-      } else if (size > 2 && api.sendMeasurements(packets, ++packets.cbegin())) {
-        packets.erase(++packets.cbegin(), packets.cend());
-      } else {
-        SERIAL.print(size - 1);
-        SERIAL.println(" packets still need to be sent!");
+    if (WiFi.status() == WL_CONNECTED) {
+      API api (buildDeviceId(), Creds.get(Storage::Entry::Token));
+
+      if (firstSend) {
+        const bool success = api.sendMeasurementWithDiagnostics(
+          packets.back(), NOISEMETER_VERSION, String(millis() / 1000));
 
-        if (size >= MAX_SAVED_PACKETS) {
-          SERIAL.println("Discarded a packet!");
+        if (success) {
           packets.pop_back();
+          readyCount--;
+          firstSend = false;
         }
       }
-    }
+
+      if (readyCount == 1) {
+        if (api.sendMeasurement(packets.back())) {
+          packets.pop_back();
+          readyCount = 0;
+        }
+      } else {
+        if (api.sendMeasurements(packets, ++packets.cbegin())) {
+          packets.erase(++packets.cbegin(), packets.cend());
+          readyCount = 0;
+        }
+      }
+
+      if (readyCount > 0) {
+        SERIAL.print(readyCount);
+        SERIAL.println(" packets still need to be sent!");
+      }
 
 #if defined(BOARD_REV4) || defined(BOARD_REV123)
-    // We have WiFi: also check for software updates
-    if (++wakeupCount >= OTA_INTERVAL_SEC / UPLOAD_INTERVAL_SEC) {
-      wakeupCount = 0;
-      SERIAL.println("Checking for updates...");
-
-      const auto ota = api.getLatestSoftware();
-      if (ota) {
-        if (ota->version.compareTo(NOISEMETER_VERSION) > 0
-#if defined(BOARD_REV123)
-            && ota->version.startsWith("0.3.")
-#endif // defined(BOARD_REV123)
-        ) {
-          SERIAL.print(ota->version);
-          SERIAL.println(" available!");
-
-          if (downloadOTAUpdate(ota->url, api.rootCertificate())) {
-            SERIAL.println("Download success! Restarting...");
-            delay(1000);
-            ESP.restart();
-          } else { SERIAL.println("Update download failed."); }
-        } /*else { SERIAL.println("No new updates."); }*/
-      } else { SERIAL.println("Failed to reach update server!"); }
-    }
+      // We have WiFi: also check for software updates
+      if (otaCountdown <= 0) {
+        otaCountdown = OTA_INTERVAL_SEC;
+        otaUpdateCheck(api);
+      }
 #endif // defined(BOARD_REV4) || defined(BOARD_REV123)
+    }
   }
 #endif // !UPLOAD_DISABLED
+
+  vTaskDelayUntil(&lastWake, pdMS_TO_TICKS(SEC_TO_MS(PACKET_INTERVAL_SEC)));
 }
 
 void measurementHandler(void *)
@@ -268,6 +269,29 @@ void printReadingToConsole(double reading)
   SERIAL.println(output);
 }
 
+void otaUpdateCheck(API& api)
+{
+  SERIAL.println("Checking for updates...");
+
+  const auto ota = api.getLatestSoftware();
+  if (ota) {
+    if (ota->version.compareTo(NOISEMETER_VERSION) > 0
+#if defined(BOARD_REV123)
+        && ota->version.startsWith("0.3.")
+#endif // defined(BOARD_REV123)
+    ) {
+      SERIAL.print(ota->version);
+      SERIAL.println(" available!");
+
+      if (downloadOTAUpdate(ota->url, api.rootCertificate())) {
+        SERIAL.println("Download success! Restarting...");
+        delay(1000);
+        ESP.restart();
+      } else { SERIAL.println("Update download failed."); }
+    } /*else { SERIAL.println("No new updates."); }*/
+  } else { SERIAL.println("Failed to reach update server!"); }
+}
+
 std::optional<const char *> saveNetworkCreds(String ssid, String psk, String email)
 {
   // Confirm that the given credentials will fit in the allocated EEPROM space.

platformio.ini

@@ -50,7 +50,7 @@ extra_scripts = build_hooks.py
 board = esp32-c3-devkitm-1
 board_build.f_cpu = 160000000L
 board_build.flash_mode = qio
-build_flags = ${env.build_flags} -DBOARD_REV123 -DNOISEMETER_VERSION=\"0.3.0\"
+build_flags = ${env.build_flags} -DBOARD_REV123 -DNOISEMETER_VERSION=\"0.3.1\"
 
 [env:breadboard]
 board = upesy_wroom