From 66e40248fe1f2bf18889fa51220984e9bd41f537 Mon Sep 17 00:00:00 2001
From: CommanderRedYT <ccommanderred@gmail.com>
Date: Tue, 14 Dec 2021 14:16:53 +0100
Subject: [PATCH] Do not accept update if time is already set by ntp

---
 main/espnowfunctions.cpp | 23 +++++++++++++++++++++++
 main/espnowfunctions.h   |  8 ++++++++
 2 files changed, 31 insertions(+)

diff --git a/main/espnowfunctions.cpp b/main/espnowfunctions.cpp
index 775bc88..1b5f25f 100644
--- a/main/espnowfunctions.cpp
+++ b/main/espnowfunctions.cpp
@@ -10,9 +10,20 @@ constexpr const char * const TAG = "BOBBY_ESP_NOW";
 
 #include "globals.h"
 #include "utils.h"
+#include "time_bobbycar.h"
 
 namespace espnow {
 
+uint16_t lastYear; // Used for esp-now timesync
+
+esp_now_settings_t::Enable DefaultEnable {
+    .receiveTimeStamp = true,
+};
+
+esp_now_settings_t esp_now_settings{
+    .enable = DefaultEnable,
+};
+
 std::deque<esp_now_message_t> message_queue{};
 std::list<esp_now_peer_info_t> peers{};
 uint8_t initialized{0};
@@ -110,6 +121,15 @@ void handle()
         return;
     }
 
+    if (esp_now_settings.enable.receiveTimeStamp)
+    {
+        const auto thisYear = int(espchrono::toDateTime(espchrono::utc_clock::now()).date.year());
+        if (abs(thisYear - espnow::lastYear) > 1)
+        {
+            esp_now_settings.enable.receiveTimeStamp = false;
+        }
+    }
+
     if(message_queue.size())
     {
         for (const esp_now_message_t &msg : message_queue)
@@ -119,6 +139,9 @@ void handle()
 
             if (msg.type == "T")
             {
+                if (!esp_now_settings.enable.receiveTimeStamp)
+                    return;
+
                 if (const auto result = cpputils::fromString<uint64_t>(msg.content); result)
                 {
                     onRecvTs(*result);
diff --git a/main/espnowfunctions.h b/main/espnowfunctions.h
index 5d7794b..512d8dd 100644
--- a/main/espnowfunctions.h
+++ b/main/espnowfunctions.h
@@ -7,12 +7,20 @@
 #include <esp_now.h>
 
 namespace espnow {
+extern uint16_t lastYear;
 constexpr const uint8_t broadcast_address[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 struct esp_now_message_t {
     const std::string content;
     const std::string type;
 };
 
+struct esp_now_settings_t {
+    struct Enable {
+        bool receiveTimeStamp;
+    } enable;
+}
+extern esp_now_settings;
+
 extern std::deque<esp_now_message_t> message_queue;
 extern std::list<esp_now_peer_info_t> peers;