Add separat file for wifi and improve serial output

coffee-bin/coffee-bin.ino

@@ -31,42 +31,11 @@
 // Include librarie
 //#include "mqtt.h"
 #include "ota.h"
+#include "wifi.h"
 
 // Buttons
 ButtonDebounce button(0, 5000);
 
-void setupWifi() {
-  /*
-  // Connect to WiFi access point.
-  Serial.println(); Serial.println();
-  Serial.print("Connecting to ");
-  Serial.println(WLAN_SSID);
-
-  WiFi.begin(WLAN_SSID, WLAN_PASS);
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    Serial.print(".");
-  }
-  Serial.println();
-
-  Serial.println("WiFi connected");
-  Serial.println("IP address: "); Serial.println(WiFi.localIP());
-  */
-  WiFi.mode(WIFI_STA);
-  WiFi.begin(ssid, password);
-  while (WiFi.waitForConnectResult() != WL_CONNECTED) {
-    Serial.println("Connection Failed! Rebooting...");
-    delay(5000);
-    digitalWrite(led2, HIGH);
-    delay(20);  
-    digitalWrite(led1, LOW); 
-    ESP.restart();
-  }
-  Serial.println("Ready");
-  Serial.print("IP address: ");
-  Serial.println(WiFi.localIP());
-}
-
 void setupPins() {
   pinMode(led1, OUTPUT);
   pinMode(led2, OUTPUT);
@@ -79,7 +48,9 @@ void buttonChanged(int state){
 
 void setup() {
   Serial.begin(9600);
-  Serial.println("Booting");
+  delay(500);
+  Serial.println(F("::: Coffee-Bin booting :::"));
+
   setupWifi();
   setupOta();
   setupPins();

coffee-bin/mqtt.h

@@ -54,7 +54,7 @@ void MQTT_connect() {
     return;
   }
 
-  Serial.print("Connecting to MQTT... ");
+  Serial.print(F("Connecting to MQTT... "));
 
   uint8_t retries = 3;
   while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
@@ -68,10 +68,10 @@ void MQTT_connect() {
          while (1);
        }
   }
-  Serial.println("MQTT Connected!");
+  Serial.println(F("MQTT Connected!"));
 }
 
 void setupMqtt() {
-  Serial.println(F("Adafruit MQTT demo"));
+  Serial.println(F("\n=== MQTT"));
   mqtt.subscribe(&bin);
 }

coffee-bin/ota.h

@@ -1,25 +1,28 @@
 
 void setupOta() {
+  Serial.println(F("\n=== OTA"));
+  Serial.println(F("Waiting for updates ..."));
+
   ArduinoOTA.setPort(otaPort);
   ArduinoOTA.setHostname(otaHostName);
   ArduinoOTA.setPassword(otaPassword);
 
   ArduinoOTA.onStart([]() {
-    Serial.println("Start");
+    Serial.println(F("Start"));
   });
   ArduinoOTA.onEnd([]() {
-    Serial.println("\nEnd");
+    Serial.println(F("\nEnd"));
   });
   ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
     Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
   });
   ArduinoOTA.onError([](ota_error_t error) {
     Serial.printf("Error[%u]: ", error);
-    if (error == OTA_AUTH_ERROR) Serial.println("Auth Failed");
-    else if (error == OTA_BEGIN_ERROR) Serial.println("Begin Failed");
-    else if (error == OTA_CONNECT_ERROR) Serial.println("Connect Failed");
-    else if (error == OTA_RECEIVE_ERROR) Serial.println("Receive Failed");
-    else if (error == OTA_END_ERROR) Serial.println("End Failed");
+    if (error == OTA_AUTH_ERROR) Serial.println(F("Auth Failed"));
+    else if (error == OTA_BEGIN_ERROR) Serial.println(F("Begin Failed"));
+    else if (error == OTA_CONNECT_ERROR) Serial.println(F("Connect Failed"));
+    else if (error == OTA_RECEIVE_ERROR) Serial.println(F("Receive Failed"));
+    else if (error == OTA_END_ERROR) Serial.println(F("End Failed"));
   });
   ArduinoOTA.begin();
 }

coffee-bin/wifi.h

@@ -0,0 +1,28 @@
+
+// Create an ESP8266 WiFiClient class to connect to the MQTT server.
+WiFiClient client;
+// or... use WiFiFlientSecure for SSL
+//WiFiClientSecure client;
+
+void setupWifi() {
+  Serial.println(F("\n=== WiFi"));
+  Serial.print(F("Connecting to \""));
+  Serial.print(wifiSsid);
+  Serial.print(F("\"\t"));
+
+  WiFi.mode(WIFI_STA);
+  WiFi.begin(wifiSsid, wifiPassword);
+
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+    digitalWrite(led2, HIGH);
+    delay(20);  
+    digitalWrite(led1, LOW); 
+    Serial.print(F("."));
+  }
+  Serial.println();
+
+  Serial.println(F("Status\t\t\tWiFi connected!"));
+  Serial.print(F("IP address\t\t")); 
+  Serial.println(WiFi.localIP());
+}