working on esp32 stimawifi

platformio/stima_v3/stimawifi/src/arduino_thread.cpp

@@ -1,4 +1,22 @@
-#include "arduino_thread.h"
+//#include "arduino_thread.h"
+#include "stimawifi.h"
+
+void printLocalTime()
+{
+  struct tm timeinfo;
+  if(!getLocalTime(&timeinfo)){
+    LOGE("No time available (yet)");
+    return;
+  }
+  Serial.println(&timeinfo, "%y %m %d  %H:%M:%S");
+}
+
+// Callback function (get's called when time adjusts via NTP)
+void timeavailable(struct timeval *t)
+{
+  LOGN("Got time adjustment from NTP!");
+  printLocalTime();
+}
 
 void analogWriteFreq(const double frequency){
   //analogWriteFrequency(frequency);
@@ -180,7 +198,6 @@ String  rmap_get_remote_config(){
   url+="/default/json/";     // get one station, default boards
 
   frtosLog.notice(F("readRmapRemoteConfig url: %s"),url.c_str());  
-  //http.begin("http://rmap.cc/stations/pat1/luftdaten/json/");
   http.begin(espClient,url.c_str());
 
   int httpCode = http.GET();
@@ -329,7 +346,6 @@ int  rmap_config(const String payload){
   int ii = 0;
 
   if (! (payload == String())) {
-    //StaticJsonDocument<2900> jsonBuffer;
     DynamicJsonDocument doc(4000);
     status = 3;
     DeserializationError error = deserializeJson(doc,payload);
@@ -974,8 +990,19 @@ void setup() {
 
   sntp_setoperatingmode(SNTP_OPMODE_POLL);
   sntp_setservername(0, ntp_server);
-  sntp_init();
+  // set notification call-back function
+  sntp_set_time_sync_notification_cb( timeavailable );
+
+  configTime(3600, 0, ntp_server);
+
+  if (esp_netif_sntp_sync_wait(pdMS_TO_TICKS(30000)) != ESP_OK) {
+    LOGE("Failed to update system time within 30s timeout");
+  }
+  printLocalTime();
+
+  //sntp_init();
   // wait for time to be set
+  /*
   time_t now = 0;
   struct tm timeinfo = { 0 };
   int retry = 0;
@@ -986,7 +1013,7 @@ void setup() {
     time(&now);
     localtime_r(&now, &timeinfo);
   }
-
+  
   if(retry >= retry_count) {
     if (oledpresent){
       u8g2.clearBuffer();
@@ -1003,10 +1030,11 @@ void setup() {
     delay(1000);
     reboot(); //300 seconds timeout - reset board
   }
-
-  frtosLog.notice(F("Time: %s"),ctime(&now));
-  setTime(now);
-
+  */
+
+  time_t datetime = now();
+  frtosLog.notice(F("Time: %s"),ctime(&datetime));
+
   frtosLog.notice(F("mqtt server: %s"),rmap_mqtt_server);
 
   mqttclient.setServer(rmap_mqtt_server, 1883);

platformio/stima_v3/stimawifi/src/arduino_thread.h

@@ -1,4 +1,15 @@
-#include "stimawifi.h"
+#include <WiFi.h>
+#include <ESPmDNS.h>
+#include <WebServer.h>
+#include <HTTPClient.h>
+//#include <ESP32httpUpdate.h>
+#include <LittleFS.h>
+#include "esp_netif_sntp.h"
+#include "esp_netif.h"
+#include "esp_sntp.h"
+#include <TimeAlarms.h>
+#include <WiFiManager.h>          //https://github.com/tzapu/WiFiManager
+#include <LOLIN_I2C_BUTTON.h>
 
 #ifndef ARDUINO_THREAD_H_
 #define ARDUINO_THREAD_H_

platformio/stima_v3/stimawifi/src/measure_thread.cpp

@@ -1,4 +1,4 @@
-#include "measure_thread.h"
+#include "stimawifi.h"
 
 void enqueueMqttMessage(char* values, const char* timerange, const char* level, Queue* MqttQueue ) {
 

platformio/stima_v3/stimawifi/src/measure_thread.h

@@ -1,4 +1,4 @@
-#include "stimawifi.h"
+#include <SensorDriverb.h>
 
 #ifndef MEASURE_THREAD_H_
 #define MEASURE_THREAD_H_

platformio/stima_v3/stimawifi/src/publish_thread.cpp

@@ -1,4 +1,4 @@
-#include "publish_thread.h"
+#include "stimawifi.h"
 
 bool publish_maint() {
 

platformio/stima_v3/stimawifi/src/publish_thread.h

@@ -1,4 +1,4 @@
-#include "stimawifi.h"
+#include <PubSubClient.h>
 
 #ifndef PUBLISH_THREAD_H_
 #define PUBLISH_THREAD_H_

platformio/stima_v3/stimawifi/src/stimawifi.h

@@ -1,43 +1,27 @@
 
-#ifndef STIMAWIFI_H_
-#define STIMAWIFI_H_
-
 #include "Arduino.h"
 #include "stimawifi-config.h"
 #include "typedef.h"
 #include <frtosLog.h>
-#include <WiFi.h>
-#include <ESPmDNS.h>
-#include <WebServer.h>
-#include <HTTPClient.h>
-//#include <ESP32httpUpdate.h>
-#include <LittleFS.h>
 #include "thread.hpp"
 //#include "critical.hpp"
 #include "ticks.hpp"
 #include "queue.hpp"
-//needed for library
 #include <DNSServer.h>
 //#include <WebSocketsServer.h>
 //#include "EspHtmlTemplateProcessor.h"
-#include <WiFiManager.h>          //https://github.com/tzapu/WiFiManager
 #include <ArduinoJson.h>          //https://github.com/bblanchon/ArduinoJson
-#include <PubSubClient.h>
-#include <TimeAlarms.h>
 #include <Wire.h>
-#include <SensorDriverb.h>
 #include <U8g2lib.h>
 #include "time.h"
-#include <LOLIN_I2C_BUTTON.h>
-#include <WiFiUdp.h>
-#include "ozgps.h"
-#include "esp_sntp.h"
-//#include "esp_netif_sntp.h"
+
 #include "udp_thread.h"
 #include "measure_thread.h"
 #include "publish_thread.h"
 #include "arduino_thread.h"
-#include "USB.h"
+
+#ifndef STIMAWIFI_H_
+#define STIMAWIFI_H_
 
 //////////////// REMOVE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 extern String readconfig_rmap();

platformio/stima_v3/stimawifi/src/stimawifi.ino

@@ -60,7 +60,7 @@ char rmap_longitude[11] = "";
 char rmap_latitude[11] = "";
 char rmap_network[31] = "";
 char rmap_server[41] = "rmap.cc";
-char ntp_server[41] = "0.europe.pool.ntp.org";
+char ntp_server[41] = "europe.pool.ntp.org";
 char rmap_mqtt_server[41] = "rmap.cc";
 int  rmap_sampletime = DEFAULT_SAMPLETIME;
 char rmap_user[10] = "";

platformio/stima_v3/stimawifi/src/udp_thread.cpp

@@ -1,4 +1,4 @@
-#include "udp_thread.h"
+#include "stimawifi.h"
 
 void doUdp(void){
 

platformio/stima_v3/stimawifi/src/udp_thread.h

@@ -1,4 +1,5 @@
-#include "stimawifi.h"
+#include <WiFiUdp.h>
+#include "ozgps.h"
 
 #ifndef UDP_THREAD_H_
 #define UDP_THREAD_H_