Add Blues VIN voltage reporting to daily report and dashboards

Co-authored-by: dorkmo <[email protected]>

Author: Copilot

TankAlarm-112025-Client-BluesOpta/TankAlarm-112025-Client-BluesOpta.ino

@@ -277,6 +277,7 @@ static void setRelayState(uint8_t relayNum, bool state);
 static void initializeRelays();
 static void triggerRemoteRelays(const char *targetClient, uint8_t relayMask, bool activate);
 static int getRelayPin(uint8_t relayIndex);
+static float readNotecardVinVoltage();
 
 void setup() {
   Serial.begin(115200);
@@ -1368,6 +1369,9 @@ static void sendDailyReport() {
   uint8_t part = 0;
   bool queuedAny = false;
 
+  // Read VIN voltage once for the daily report
+  float vinVoltage = readNotecardVinVoltage();
+
   while (tankCursor < eligibleCount) {
     DynamicJsonDocument doc(1024);
     doc["client"] = gDeviceUID;
@@ -1376,6 +1380,11 @@ static void sendDailyReport() {
     doc["time"] = reportEpoch;
     doc["part"] = static_cast<uint8_t>(part + 1);
 
+    // Include VIN voltage in the first part of the daily report
+    if (part == 0 && vinVoltage > 0.0f) {
+      doc["vinVoltage"] = vinVoltage;
+    }
+
     JsonArray tanks = doc.createNestedArray("tanks");
     bool addedTank = false;
 
@@ -1844,3 +1853,41 @@ static void triggerRemoteRelays(const char *targetClient, uint8_t relayMask, boo
     }
   }
 }
+
+// ============================================================================
+// Notecard VIN Voltage Reading
+// ============================================================================
+
+static float readNotecardVinVoltage() {
+  J *req = notecard.newRequest("card.voltage");
+  if (!req) {
+    Serial.println(F("Failed to create card.voltage request"));
+    return -1.0f;
+  }
+
+  J *rsp = notecard.requestAndResponse(req);
+  if (!rsp) {
+    Serial.println(F("No response from card.voltage"));
+    return -1.0f;
+  }
+
+  // Check for error response
+  const char *err = JGetString(rsp, "err");
+  if (err && strlen(err) > 0) {
+    Serial.print(F("card.voltage error: "));
+    Serial.println(err);
+    notecard.deleteResponse(rsp);
+    return -1.0f;
+  }
+
+  float voltage = (float)JGetNumber(rsp, "value");
+  notecard.deleteResponse(rsp);
+
+  if (voltage > 0.0f) {
+    Serial.print(F("Notecard VIN voltage: "));
+    Serial.print(voltage);
+    Serial.println(F(" V"));
+  }
+
+  return voltage;
+}

TankAlarm-112025-Server-BluesOpta/TankAlarm-112025-Server-BluesOpta.ino

@@ -182,6 +182,20 @@ struct TankRecord {
   double smsAlertTimestamps[10];  // Track last 10 SMS alerts per tank
 };
 
+// Per-client metadata (VIN voltage, etc.)
+#ifndef MAX_CLIENT_METADATA
+#define MAX_CLIENT_METADATA 20
+#endif
+
+struct ClientMetadata {
+  char clientUid[48];
+  float vinVoltage;          // Blues Notecard VIN voltage from daily report
+  double vinVoltageEpoch;    // When the VIN voltage was last updated
+};
+
+static ClientMetadata gClientMetadata[MAX_CLIENT_METADATA];
+static uint8_t gClientMetadataCount = 0;
+
 static ServerConfig gConfig;
 static bool gConfigDirty = false;
 
@@ -1089,6 +1103,7 @@ static const char DASHBOARD_HTML[] PROGMEM = R"HTML(
             <th>Site</th>
             <th>Tank</th>
             <th>Level</th>
+            <th>VIN Voltage</th>
             <th>Status</th>
             <th>Updated</th>
             <th>Refresh</th>
@@ -1202,11 +1217,12 @@ static const char DASHBOARD_HTML[] PROGMEM = R"HTML(
               percent: client.percent,
               alarm: client.alarm,
               alarmType: client.alarmType,
-              lastUpdate: client.lastUpdate
+              lastUpdate: client.lastUpdate,
+              vinVoltage: client.vinVoltage
             });
             return;
           }
-          tanks.forEach(tank => {
+          tanks.forEach((tank, idx) => {
             rows.push({
               client: client.client,
               site: client.site,
@@ -1216,20 +1232,28 @@ static const char DASHBOARD_HTML[] PROGMEM = R"HTML(
               percent: tank.percent,
               alarm: tank.alarm,
               alarmType: tank.alarmType || client.alarmType,
-              lastUpdate: tank.lastUpdate
+              lastUpdate: tank.lastUpdate,
+              vinVoltage: idx === 0 ? client.vinVoltage : null  // Only show VIN on first tank per client
             });
           });
         });
         return rows;
       }
 
+      function formatVoltage(voltage) {
+        if (typeof voltage !== 'number' || !isFinite(voltage) || voltage <= 0) {
+          return '--';
+        }
+        return voltage.toFixed(2) + ' V';
+      }
+
       function renderTankRows() {
         const tbody = els.tankBody;
         tbody.innerHTML = '';
         const rows = state.tanks;
         if (!rows.length) {
           const tr = document.createElement('tr');
-          tr.innerHTML = '<td colspan="7">No telemetry available</td>';
+          tr.innerHTML = '<td colspan="8">No telemetry available</td>';
           tbody.appendChild(tr);
           return;
         }
@@ -1241,6 +1265,7 @@ static const char DASHBOARD_HTML[] PROGMEM = R"HTML(
             <td>${row.site || '--'}</td>
             <td>${row.label || 'Tank'} #${row.tank || '?'}</td>
             <td>${formatLevel(row.levelInches)}</td>
+            <td>${formatVoltage(row.vinVoltage)}</td>
             <td>${statusBadge(row)}</td>
             <td>${formatEpoch(row.lastUpdate)}</td>
             <td>${refreshButton(row)}</td>`;
@@ -3210,6 +3235,17 @@ static void sendClientDataJson(EthernetClient &client) {
       clientObj["site"] = rec.site;
       clientObj["alarm"] = false;
       clientObj["lastUpdate"] = 0.0;
+      
+      // Add VIN voltage from client metadata if available
+      for (uint8_t j = 0; j < gClientMetadataCount; ++j) {
+        if (strcmp(gClientMetadata[j].clientUid, rec.clientUid) == 0) {
+          if (gClientMetadata[j].vinVoltage > 0.0f) {
+            clientObj["vinVoltage"] = gClientMetadata[j].vinVoltage;
+            clientObj["vinVoltageEpoch"] = gClientMetadata[j].vinVoltageEpoch;
+          }
+          break;
+        }
+      }
     }
 
     const char *existingSite = clientObj.containsKey("site") ? clientObj["site"].as<const char *>() : nullptr;
@@ -3610,9 +3646,39 @@ static void handleAlarm(JsonDocument &doc, double epoch) {
 }
 
 static void handleDaily(JsonDocument &doc, double epoch) {
-  (void)doc;
-  (void)epoch;
-  // Daily reports are persisted in sendDailyEmail; nothing to do for inbound ack
+  // Extract VIN voltage from daily report if present
+  const char *clientUid = doc["client"] | "";
+  if (clientUid && strlen(clientUid) > 0) {
+    // Check if this is part 1 of the daily report (which contains vinVoltage)
+    uint8_t part = doc["part"].as<uint8_t>();
+    if (part == 1 && doc.containsKey("vinVoltage")) {
+      float vinVoltage = doc["vinVoltage"].as<float>();
+      if (vinVoltage > 0.0f) {
+        // Find or create client metadata entry
+        ClientMetadata *meta = nullptr;
+        for (uint8_t i = 0; i < gClientMetadataCount; ++i) {
+          if (strcmp(gClientMetadata[i].clientUid, clientUid) == 0) {
+            meta = &gClientMetadata[i];
+            break;
+          }
+        }
+        if (!meta && gClientMetadataCount < MAX_CLIENT_METADATA) {
+          meta = &gClientMetadata[gClientMetadataCount++];
+          memset(meta, 0, sizeof(ClientMetadata));
+          strlcpy(meta->clientUid, clientUid, sizeof(meta->clientUid));
+        }
+        if (meta) {
+          meta->vinVoltage = vinVoltage;
+          meta->vinVoltageEpoch = (epoch > 0.0) ? epoch : currentEpoch();
+          Serial.print(F("VIN voltage received from "));
+          Serial.print(clientUid);
+          Serial.print(F(": "));
+          Serial.print(vinVoltage);
+          Serial.println(F(" V"));
+        }
+      }
+    }
+  }
 }
 
 static TankRecord *upsertTankRecord(const char *clientUid, uint8_t tankNumber) {
@@ -3804,6 +3870,16 @@ static void publishViewerSummary() {
     obj["alarm"] = gTankRecords[i].alarmActive;
     obj["alarmType"] = gTankRecords[i].alarmType;
     obj["lastUpdate"] = gTankRecords[i].lastUpdateEpoch;
+    
+    // Add VIN voltage from client metadata if available
+    for (uint8_t j = 0; j < gClientMetadataCount; ++j) {
+      if (strcmp(gClientMetadata[j].clientUid, gTankRecords[i].clientUid) == 0) {
+        if (gClientMetadata[j].vinVoltage > 0.0f) {
+          obj["vinVoltage"] = gClientMetadata[j].vinVoltage;
+        }
+        break;
+      }
+    }
   }
 
   String json;

TankAlarm-112025-Viewer-BluesOpta/TankAlarm-112025-Viewer-BluesOpta.ino

@@ -113,6 +113,7 @@ struct TankRecord {
   bool alarmActive;
   char alarmType[24];
   double lastUpdateEpoch;
+  float vinVoltage;  // Blues Notecard VIN voltage
 };
 
 static const size_t TANK_JSON_CAPACITY = JSON_ARRAY_SIZE(MAX_TANK_RECORDS) + (MAX_TANK_RECORDS * JSON_OBJECT_SIZE(10)) + 768;
@@ -238,6 +239,7 @@ static const char VIEWER_DASHBOARD_HTML[] PROGMEM = R"HTML(
             <th>Site</th>
             <th>Tank</th>
             <th>Level (ft/in)</th>
+            <th>VIN Voltage</th>
             <th>24hr Change</th>
             <th>Updated</th>
           </tr>
@@ -372,7 +374,7 @@ static const char VIEWER_DASHBOARD_HTML[] PROGMEM = R"HTML(
         const rows = state.selected ? state.tanks.filter(t => t.client === state.selected) : state.tanks;
         if (!rows.length) {
           const tr = document.createElement('tr');
-          tr.innerHTML = '<td colspan="5">No tank data available</td>';
+          tr.innerHTML = '<td colspan="6">No tank data available</td>';
           tbody.appendChild(tr);
           return;
         }
@@ -383,12 +385,20 @@ static const char VIEWER_DASHBOARD_HTML[] PROGMEM = R"HTML(
             <td>${escapeHtml(tank.site, '--')}</td>
             <td>${escapeHtml(tank.label || 'Tank')} #${escapeHtml((tank.tank ?? '?'))}</td>
             <td>${formatFeetInches(tank.levelInches)}</td>
+            <td>${formatVoltage(tank.vinVoltage)}</td>
             <td>--</td>
             <td>${formatEpoch(tank.lastUpdate)}</td>`;
           tbody.appendChild(tr);
         });
       }
 
+      function formatVoltage(voltage) {
+        if (typeof voltage !== 'number' || !isFinite(voltage) || voltage <= 0) {
+          return '--';
+        }
+        return voltage.toFixed(2) + ' V';
+      }
+
       function statusBadge(tank) {
         if (!tank.alarm) {
           return '<span class="status-pill ok">Normal</span>';
@@ -815,6 +825,9 @@ static void sendTankJson(EthernetClient &client) {
     obj["alarm"] = gTankRecords[i].alarmActive;
     obj["alarmType"] = gTankRecords[i].alarmType;
     obj["lastUpdate"] = gTankRecords[i].lastUpdateEpoch;
+    if (gTankRecords[i].vinVoltage > 0.0f) {
+      obj["vinVoltage"] = gTankRecords[i].vinVoltage;
+    }
   }
 
   String body;
@@ -900,6 +913,7 @@ static void handleViewerSummary(JsonDocument &doc, double epoch) {
       rec.alarmActive = item["alarm"].as<bool>();
       strlcpy(rec.alarmType, item["alarmType"] | (rec.alarmActive ? "alarm" : "clear"), sizeof(rec.alarmType));
       rec.lastUpdateEpoch = item["lastUpdate"].as<double>();
+      rec.vinVoltage = item["vinVoltage"].as<float>();
     }
   }