misc fixes

Keep extra storage entry so checksum is not ruined; clear API token if re-registering; blink faster for multi-packet send
CivicTechTO · Jul 2, 2024 · fae14a7 · fae14a7
1 parent e9566d7
commit fae14a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/noisemeter-device/noisemeter-device.ino b/noisemeter-device/noisemeter-device.ino
@@ -202,7 +202,7 @@ void loop() {
 
         // Only blink if there's multiple packets to send
         if (++packets.cbegin() != packets.cend())
-          bl.emplace(300);
+          bl.emplace(200);
 
         packets.remove_if([&api](const auto& pkt) {
           return pkt.count <= 0 || api.sendMeasurement(pkt);
@@ -281,6 +281,9 @@ std::optional<const char *> saveNetworkCreds(WebServer& httpServer)
     if (!ssid.isEmpty() && Creds.canStore(ssid) && Creds.canStore(psk)) {
       Creds.set(Storage::Entry::SSID, ssid);
       Creds.set(Storage::Entry::Passkey, psk);
+      if (!email.isEmpty())
+        Creds.set(Storage::Entry::Token, {});
+      Creds.set(Storage::Entry::Unused, {});
       Creds.commit();
 
       if (tryWifiConnection(WIFI_AP_STA, WIFI_NEW_CONNECT_TIMEOUT_SEC) == 0 && Timestamp::synchronize() == 0) {

diff --git a/noisemeter-device/storage.h b/noisemeter-device/storage.h
@@ -41,7 +41,8 @@ class Storage : protected EEPROMClass
         SSID      = Checksum + sizeof(uint32_t), /** User's WiFi SSID */
         Passkey   = SSID     + StringSize,       /** User's WiFi passkey */
         Token     = Passkey  + StringSize,       /** Device API token */
-        TotalSize = Token    + StringSize        /** Marks storage end address */
+        Unused    = Token    + StringSize,       /** Unused (used to be email) */
+        TotalSize = Unused   + StringSize        /** Marks storage end address */
     };
 
     /**