From 1ecddd2789e061cf7ccdda46a40f606cc8a988f2 Mon Sep 17 00:00:00 2001
From: Christian Mittring <christian.mittring@student.uni-augsburg.de>
Date: Sun, 1 Apr 2018 09:11:43 +0200
Subject: [PATCH] [Fixed]: NTP Update Error

---
 LichtWecker/LichtWecker.ino |  7 ++++---
 LichtWecker/Uhr.ino         | 11 ++++++++---
 LichtWecker/ntp.ino         |  4 +++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/LichtWecker/LichtWecker.ino b/LichtWecker/LichtWecker.ino
index 492b526..3bee911 100644
--- a/LichtWecker/LichtWecker.ino
+++ b/LichtWecker/LichtWecker.ino
@@ -30,7 +30,7 @@ CRGB leds[NUM_LEDS];
 RTClib RTC;
 DS3231 Clock;
 //NTP Setup
-NTPtime NTPch("ch.pool.ntp.org");   // Choose server pool as required
+NTPtime NTPch("ntp2.uni-augsburg.de");   // Choose server pool as required
 
 //Display
 LiquidCrystal_I2C lcd(0x3f, 16, 2);
@@ -165,7 +165,7 @@ void setup() {
     Serial.print("IP address: ");
     Serial.println(WiFi.localIP());
     wifi_connected = true;
-    display_text("IP address",String(WiFi.localIP()));
+    display_text("IP address",WiFi.localIP().toString());
     delay(5000);
   }
   else{
@@ -209,6 +209,7 @@ void setup() {
   Serial.println("Alarm2 Set:" + String(A1Day) + ", " + String(A1Hour) + ", " + String(A1Minute) + ", " + String(AlarmBits) + ", " + String(A1Dy) + ", " + String(A1h12) + ", "); 
   
   show_green();
+  update_time_from_web();
   delay(1000);
   show_black();
 
@@ -269,7 +270,7 @@ void loop() {
    }
   test_pin();
   handleSleep(intervall, currentMillis);
-  if(m == 1)
+  if(m == 1 && s == 30)
   {
     update_time_from_web();
   }
diff --git a/LichtWecker/Uhr.ino b/LichtWecker/Uhr.ino
index 7bdf3c9..d9c0389 100644
--- a/LichtWecker/Uhr.ino
+++ b/LichtWecker/Uhr.ino
@@ -123,10 +123,15 @@ void display_year(int Day, int Month, int Year){
 void display_time(int Stunde, int Minute, int Sekunde){
   String Min = String(Minute);
   String Stu = String(Stunde);
+  String Sek = String(Sekunde);
   if (Minute < 10)
   {
     Min = "0" + Min;
   }
+  if (Sekunde < 10)
+  {
+    Sek = "0" + Sek;
+  }
   if (Stunde < 10)
   {
     Stu = "0" + Stu;
@@ -159,11 +164,11 @@ void display_time(int Stunde, int Minute, int Sekunde){
   {
       display_text("Alarm 2", "Minute: " + Min);
   }
-  else if (Sekunde % 2 == 0){
+  /*else if (Sekunde % 2 == 0){
       display_text(Stu + ":" + Min, get_alarm_string());
-  }
+  }*/
   else{
-    display_text(Stu + "." + Min, get_alarm_string());
+    display_text(Stu + ":" + Min + ":" + Sek, get_alarm_string());
   }
 }
 
diff --git a/LichtWecker/ntp.ino b/LichtWecker/ntp.ino
index ac153b8..e27fa0e 100644
--- a/LichtWecker/ntp.ino
+++ b/LichtWecker/ntp.ino
@@ -17,7 +17,7 @@ void update_time_from_web(){
       byte actualMonth = dateTime.month;
       byte actualday =dateTime.day;
       byte actualdayofWeek = dateTime.dayofWeek;
-      if (actualMinute != m){
+      if (actualMinute != m && actualday != 7 && actualMonth != 2 && actualyear != 2036){
         h = actualHour;
         m = actualMinute;
         s = actualsecond;
@@ -26,6 +26,8 @@ void update_time_from_web(){
         d = actualday;
         set_clock();
         Serial.println("Time Updated!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+        display_text("Update Time","");
+        delay_gui(1000);
       }
     }
   }