feat: get epoch time from websocket server (closes #7)

FKMTime · Jun 6, 2024 · c3c27a8 · c3c27a8
1 parent 9fe290d
commit c3c27a8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/firmware/src/radio/radio.hpp b/firmware/src/radio/radio.hpp
@@ -24,7 +24,7 @@ void initWifi() {
   wm.setConnectRetries(10);
   wm.setConnectTimeout(3);
 
-  bool res = wm.autoConnect(generatedDeviceName, WIFI_PASSWORD);;
+  bool res = wm.autoConnect(generatedDeviceName, WIFI_PASSWORD);
   if (res) {
     Logger.printf("Connected!\n");
   } else {

diff --git a/firmware/src/radio/websocket.hpp b/firmware/src/radio/websocket.hpp
@@ -135,6 +135,11 @@ void parseDeviceSettings(JsonChildDocument doc) {
   stateHasChanged = true;
 }
 
+void parseEpochTime(JsonChildDocument doc) {
+  epochBase = doc["current_epoch"];
+  epochBase -= millis() / 1000;
+}
+
 void parseStartUpdate(JsonChildDocument doc) {
   if (update) {
     ESP.restart();
@@ -279,6 +284,8 @@ void webSocketEvent(WStype_t type, uint8_t *payload, size_t length) {
       parseApiError(doc["api_error"]);
     } else if (doc.containsKey("test_packet")) {
       parseTestPacket(doc["test_packet"]);
+    } else if (doc.containsKey("epoch_time")) {
+      parseEpochTime(doc["epoch_time"]);
     }
   } else if (type == WStype_BIN) {
     parseUpdateData(payload, length);

diff --git a/firmware/src/state.hpp b/firmware/src/state.hpp
@@ -127,14 +127,7 @@ void readState(bool skipEpoch = false) {
 }
 
 void initState() {
-  struct tm timeinfo;
-  if (!getLocalTime(&timeinfo)) {
-    Logger.println("Failed to obtain time");
-  }
-  time_t epoch;
-  time(&epoch);
-
-  uuid.seed(epoch, getEspId());
+  uuid.seed(getEpoch(), getEspId());
 
   readState();
   if (state.solveTime > 0) {

diff --git a/firmware/src/utils.hpp b/firmware/src/utils.hpp
@@ -74,15 +74,10 @@ void sendAddDevice() {
   webSocket.sendTXT(json);
 }
 
+unsigned long epochBase = 0;
 unsigned long getEpoch() {
-  struct tm timeinfo;
-  if (!getLocalTime(&timeinfo)) {
-    Logger.println("Failed to obtain time");
-  }
-  time_t epoch;
-  time(&epoch);
-
-  return epoch;
+  if (epochBase == 0) return 0;
+  return epochBase + (millis() / 1000);
 }
 
 void clearDisplay(uint8_t filler = 255) {