From 7cd79a3ffd4bb3a4b1385a653a8dfe0de55bd1ea Mon Sep 17 00:00:00 2001
From: Jochen Vothknecht <jochen3120@gmail.com>
Date: Tue, 12 Apr 2022 23:32:15 +0200
Subject: [PATCH] Finishing and testing SNTP and birth-metrics code

---
 CLC-qthing/SiliconTorch/Metrics.cpp | 30 +++++++++++++++++++++++++++++
 CLC-qthing/SpiderLib/SNTP.cpp       |  7 +++++--
 CLC-qthing/device_main.cpp          | 15 +++++----------
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/CLC-qthing/SiliconTorch/Metrics.cpp b/CLC-qthing/SiliconTorch/Metrics.cpp
index 0f876e4..ebca6d2 100644
--- a/CLC-qthing/SiliconTorch/Metrics.cpp
+++ b/CLC-qthing/SiliconTorch/Metrics.cpp
@@ -18,6 +18,9 @@
 #include <climits>
 #include <cinttypes>
 
+// project specific
+#include "../SpiderLib/SNTP.hpp"
+
 
 using namespace qthing;
 using json = nlohmann::json;
@@ -53,6 +56,33 @@ namespace SiliconTorch {
       lifeTimeSaved = uptime_ms();
 
 
+      nvs_get_u64(this->nvs, "birth", &this->birth);
+      lifeTimeSaved = uptime_ms();
+
+      if (this->birth > 0) {
+        ESP_LOGI(TAG, "Found my birth timestamp[ %lld ]", this->birth);
+
+        SpiderLib::SNTP::instance().registerTimeSyncHandler([&](){
+          uint64_t now = (uint64_t)std::time(NULL);
+
+          float age = (float)(now - this->birth);
+          age /= 24.0f * 60.0f * 60.0f;
+
+          ESP_LOGI(TAG, "I'm at least days[ %.2f ] old", age);
+        });
+      } else {
+        SpiderLib::SNTP::instance().registerTimeSyncHandler([&](){
+
+          this->birth = (uint64_t)std::time(NULL);
+
+          esp_err_t err = nvs_set_u64(this->nvs, "birth", this->birth);
+
+          if (err == ESP_OK) ESP_LOGI(TAG, "Just carved my birth timestamp[ %lld ] 🎂 into silicon", this->birth);
+          else ESP_LOGE(TAG, "Couldn't save birth time: error[ %d ]", err);
+        });
+      }
+
+
       char taskName[64];
       snprintf(taskName, sizeof(taskName), "Metrics[%i]", nextTask++);  // TODO: increment thread-safe!
 
diff --git a/CLC-qthing/SpiderLib/SNTP.cpp b/CLC-qthing/SpiderLib/SNTP.cpp
index 3bd5615..575ae29 100644
--- a/CLC-qthing/SpiderLib/SNTP.cpp
+++ b/CLC-qthing/SpiderLib/SNTP.cpp
@@ -56,8 +56,12 @@ namespace SpiderLib {
 
   SNTP::SNTP() {
 
+    const char* server = "pool.ntp.org";  // TODO: make configurable!
+
+    ESP_LOGI(TAG, "Starting synchronization against server[ %s ]", server);
+
     sntp_setoperatingmode(SNTP_OPMODE_POLL);
-    sntp_setservername(0, "pool.ntp.org");  // TODO: make configurable!
+    sntp_setservername(0, server);
     sntp_init();
 
     setenv("TZ", "CET-1CEST,M3.5.0,M10.5.0/3", 1);  // germany
@@ -91,5 +95,4 @@ namespace SpiderLib {
 
 
 
-
 }
diff --git a/CLC-qthing/device_main.cpp b/CLC-qthing/device_main.cpp
index c0f0509..819cb8a 100644
--- a/CLC-qthing/device_main.cpp
+++ b/CLC-qthing/device_main.cpp
@@ -12,7 +12,7 @@
 
 // ### LIBS FOR TESTING ###
 #include <cstdlib>
-#include "SpiderLib/SNTP.hpp"
+//#include "SpiderLib/SNTP.hpp"
 #include "SiliconTorch/CyanBusCRC.hpp"
 #include "SiliconTorch/CyanBusTOUT.hpp"
 // ###     END LIBS     ###
@@ -25,13 +25,8 @@ CyanLight::CyanLightControl* ctrl;
 
 void device_main() {
 
-  SpiderLib::SNTP& ntp = SpiderLib::SNTP::instance();
 
-  ntp.registerTimeSyncHandler([](){
-    ESP_LOGE("EVENT…", "…HANDLER()!");
-  });
-
-  qthing::enable_wifi();
+  /*qthing::enable_wifi();
   cfg.apply();
 
   return;
@@ -50,16 +45,16 @@ void device_main() {
 
   ESP_LOGW("CheckCRC", "CRC of str[ %s ] is crc[ %s ]", buffer, SiliconTorch::Impl::checkCRC(buffer, L) ? "true" : "false");
 
-  return;
+  return; */
 
-  SiliconTorch::CyanBusTOUT::CyanBus cyanBus(13, 14, 12, 15);  // Pinout of CyanStripe
+  /* SiliconTorch::CyanBusTOUT::CyanBus cyanBus(13, 14, 12, 15);  // Pinout of CyanStripe
 
   // TODO: ???
 
 
   cfg.apply();
 
-  return;
+  return; */
 
   ctrl = new CyanLight::CyanLightControl(1);
   ctrl->addChannel(26);
-- 
GitLab