Merge branch 'main' of github.com:CivicTechTO/proj-noisemeter-device …

…into access-point-update
CivicTechTO · Jul 22, 2024 · 512eb22 · 512eb22
2 parents c6f1226 + 6768b30
commit 512eb22
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/noisemeter-device/noisemeter-device.ino b/noisemeter-device/noisemeter-device.ino
@@ -204,7 +204,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);
@@ -276,6 +276,7 @@ std::optional<const char *> saveNetworkCreds(String ssid, String psk, String ema
   if (!ssid.isEmpty() && Creds.canStore(ssid) && Creds.canStore(psk)) {
     Creds.set(Storage::Entry::SSID, ssid);
     Creds.set(Storage::Entry::Passkey, psk);
+    Creds.set(Storage::Entry::Unused, {});
     Creds.commit();
 
     if (tryWifiConnection(WIFI_AP_STA, WIFI_NEW_CONNECT_TIMEOUT_SEC) == 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 */
     };
 
     /**

diff --git a/noisemeter-device/timestamp.h b/noisemeter-device/timestamp.h
@@ -24,8 +24,8 @@
 
 #define SEC_TO_MS(s)  (s * 1000)
 #define MIN_TO_SEC(m) (m * 60)
-#define HR_TO_SEC(h)  MIN_TO_SEC(60)
-#define DAY_TO_SEC(h) HR_TO_SEC(24)
+#define HR_TO_SEC(h)  (h * MIN_TO_SEC(60))
+#define DAY_TO_SEC(d) (d * HR_TO_SEC(24))
 
 /** Maximum number of milliseconds to wait for NTP sync to succeed. */
 constexpr auto NTP_CONNECT_TIMEOUT_MS = SEC_TO_MS(20);