Diff: main.cpp

Revision:

11:376bfcdda0d4

Parent:

10:e62222c46ee9

--- a/main.cpp	Thu Mar 28 09:55:48 2019 +0000
+++ b/main.cpp	Sat May 08 16:23:46 2021 +0000
@@ -3,8 +3,9 @@
 #include "ESP8266.h"
 #include "Board.h"
 #include "SD.h"
+//#include "RTC.h"
 
-//DS3231 rtc(D14, D15);
+DS3231 rtc(D14, D15);
 //time_t epoch_time = 0;
 
 int hour;
@@ -14,12 +15,94 @@
 int dayOfWeek;
 int date;
 int month;
-int year;  
-   
+int year; 
+ 
+
+void RTC_Init()
+{
+    rtc.setI2Cfrequency(400000);
+    //RTC.writeRegister(DS3231_Aging_Offset,0); // uncomment to set Aging Offset 1LSB = approx. 0.1 ppm according from datasheet = 0.05 ppm @ 21 °C from my measurments
+    rtc.convertTemperature(); 
+    int reg=rtc.readRegister(DS3231_Aging_Offset);
+    if (reg>127)
+        {reg=reg-256;}
+  
+    rtc.OSF();
+//    pc.printf("Aging offset : %i\r\n",reg);       
+//    pc.printf("OSF flag : %i",rtc.OSF());
+//    pc.printf("\r\n");
+}
+
+void RTC_actualize()
+{
+
+    rtc.readDateTime(&dayOfWeek,&date,&month,&year,&hour,&minute,&second);
+    snprintf(actual_time, 30, "%02i.%02i.%02i %02i:%02i:%02i ",date,month,year,hour,minute,second);
+}
 
+void RTC_set()
+{
+/*
+    DS3231 rtc(D14, D15);
+    rtc.setI2Cfrequency(400000);
+    //RTC.writeRegister(DS3231_Aging_Offset,0); // uncomment to set Aging Offset 1LSB = approx. 0.1 ppm according from datasheet = 0.05 ppm @ 21 °C from my measurments
+    rtc.convertTemperature(); 
+    int reg=rtc.readRegister(DS3231_Aging_Offset);
+    if (reg>127)
+        {reg=reg-256;}
+ 
+    rtc.OSF();
+ */ 
+/*
+    ds3231_cntl_stat_t rtc_control_status = {0,0}; 
+    
+    rtc.set_cntl_stat_reg(rtc_control_status);
+*/    
+    wifi.getServerDateTime(&dayOfWeek,&date,&month,&year,&hour,&minute,&second);
+    pc.printf("date time : %02i / %02i-%02i-%02i %02i:%02i:%02i",dayOfWeek,date,month,year,hour,minute,second);
+    rtc.setTime(hour,minute,second);        // uncomment to set time
+    rtc.setDate(dayOfWeek,date,month,year); // uncomment to set date
+}
 
 int main()
 {
+//    __disable_irq();    // Disable Interrupts
+//    RTC_Init();
+    RTC_Init();
+    wifi.Init();
+//    rfm.Init();
+    bt.Init();
+//    __enable_irq();    // Disable Interrupts
+
+    RTC_actualize();
+    rfm.Init();
+//    SDcard.Read();
+//    rtc.setDate(7,6,4,2019);
+    while(1)
+    {
+        wifi.CheckSettings();
+        if(rfm.ReceivedMessage())
+            RTC_actualize();
+//        if(wifi.actualizeActualTime())
+//            RTC_set();
+    }
+}
+/*
+int main()
+{
+    rtcClock.Init();
+    wifi.Init();
+    bt.Init();
+    rfm.Init();
+    while(1)
+    {
+        wifi.CheckSettings();
+    }
+}
+*/
+/*
+int main()
+{
     DS3231 rtc(D14,D15);
 
     
@@ -33,7 +116,7 @@
     pc.printf("Aging offset : %i\r\n",reg);       
     pc.printf("OSF flag : %i",rtc.OSF());
     pc.printf("\r\n");
-/*    
+    
      rtc.readDate(&date,&month,&year);
      pc.printf("date : %02i-%02i-%02i",date,month,year);
      pc.printf("\r\n");
@@ -52,7 +135,7 @@
      
      pc.printf("temperature :%6.2f",rtc.readTemp());
      pc.printf("\r\n");
-*/
+
     wifi.Init();
     bt.Init();
     rfm.Init();
@@ -65,6 +148,7 @@
         wait(0.5);
     }
 }
+*/
 
 /*
 int main()