Do not accept update if time is already set by ntp

This commit is contained in:
CommanderRedYT
2021-12-14 14:16:53 +01:00
parent 5d424a4377
commit 66e40248fe
2 changed files with 31 additions and 0 deletions

View File

@@ -10,9 +10,20 @@ constexpr const char * const TAG = "BOBBY_ESP_NOW";
#include "globals.h" #include "globals.h"
#include "utils.h" #include "utils.h"
#include "time_bobbycar.h"
namespace espnow { 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::deque<esp_now_message_t> message_queue{};
std::list<esp_now_peer_info_t> peers{}; std::list<esp_now_peer_info_t> peers{};
uint8_t initialized{0}; uint8_t initialized{0};
@@ -110,6 +121,15 @@ void handle()
return; 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()) if(message_queue.size())
{ {
for (const esp_now_message_t &msg : message_queue) for (const esp_now_message_t &msg : message_queue)
@@ -119,6 +139,9 @@ void handle()
if (msg.type == "T") if (msg.type == "T")
{ {
if (!esp_now_settings.enable.receiveTimeStamp)
return;
if (const auto result = cpputils::fromString<uint64_t>(msg.content); result) if (const auto result = cpputils::fromString<uint64_t>(msg.content); result)
{ {
onRecvTs(*result); onRecvTs(*result);

View File

@@ -7,12 +7,20 @@
#include <esp_now.h> #include <esp_now.h>
namespace espnow { namespace espnow {
extern uint16_t lastYear;
constexpr const uint8_t broadcast_address[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; constexpr const uint8_t broadcast_address[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
struct esp_now_message_t { struct esp_now_message_t {
const std::string content; const std::string content;
const std::string type; 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::deque<esp_now_message_t> message_queue;
extern std::list<esp_now_peer_info_t> peers; extern std::list<esp_now_peer_info_t> peers;