remove onWiFiConnect()

src/AlarmClock.cpp

@@ -100,6 +100,7 @@ bool AlarmClock::isNTPExpired(void) {
 }
 
 bool AlarmClock::updateNTPTime(void) {
+    ESP_LOGI(TAG, "Getting time over NTP.");
     sntp_setoperatingmode(SNTP_OPMODE_POLL);
     sntp_setservername(0, "de.pool.ntp.org");
     sntp_init();

src/main.cpp

@@ -217,16 +217,20 @@ void setup() {
   rotary.registerCallback(rotation);
   rotary.begin(rotaryPinA, rotaryPinB, rotaryPinButton);
 
+/*  udp.beginMulticast(udpMulticastAddress, udpMulticastPort);*/
+
   lastActive = millis();
 }
 
 
-void onWiFiConnect() {
+//This function is called when the MQTT-Server is connected
-    if (!alarmclock.isTimeValid()) {
+void onMqttConnect(bool sessionPresent) {
-        ESP_LOGI(TAG, "Time is not set yet. Connecting to WiFi and getting time over NTP.");
+  DEBUG_PRINTLN(__func__);
-        alarmclock.updateNTPTime();
-    }
   
+  //Subscribe to the delay topic
+  iot.mqtt.subscribe(commandTopic.c_str(), 0);
+  //Trigger the transmission of the current state.
+  transmitStatus();
   esp_sleep_wakeup_cause_t wakeup_reason = esp_sleep_get_wakeup_cause();
   if (wakeup_reason == ESP_SLEEP_WAKEUP_EXT1) {
     uint64_t wakeup_pinmask = esp_sleep_get_ext1_wakeup_status();
@@ -235,19 +239,6 @@ void onWiFiConnect() {
       sensorON = true;
     }
   }
-
-/*  udp.beginMulticast(udpMulticastAddress, udpMulticastPort);*/
-}
-
-
-//This function is called when the MQTT-Server is connected
-void onMqttConnect(bool sessionPresent) {
-  DEBUG_PRINTLN(__func__);
-  
-  //Subscribe to the delay topic
-  iot.mqtt.subscribe(commandTopic.c_str(), 0);
-  //Trigger the transmission of the current state.
-  transmitStatus();
   lastTransmit = millis();
 }
 

src/main.h

@@ -4,7 +4,6 @@
 void resetToFactoryDefaults();
 void setup();
 void onMqttConnect(bool sessionPresent);
-void onWiFiConnect();
 void transmitStatus();
 void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total);
 void suspend(uint32_t secondsToSleep);