Switched to WiFi

.cproject

@@ -25,8 +25,6 @@
 								<option id="it.baeyens.arduino.compiler.cpp.sketch.option.incpath.660768886" name="Include Paths (-I)" superClass="it.baeyens.arduino.compiler.cpp.sketch.option.incpath" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/arduino/core}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/arduino/variant}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Libraries/Ethernet}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Libraries/Ethernet/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Libraries/SPI}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Adafruit-GFX}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Metro}&quot;"/>
@@ -34,6 +32,8 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Streaming}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/TFT_ILI9341}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Touch-Screen}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Libraries/WiFi}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Libraries/WiFi/src}&quot;"/>
 								</option>
 								<inputType id="it.baeyens.arduino.compiler.cpp.sketch.input.505756577" name="CPP source files" superClass="it.baeyens.arduino.compiler.cpp.sketch.input"/>
 							</tool>
@@ -41,8 +41,6 @@
 								<option id="it.baeyens.arduino.compiler.c.sketch.option.incpath.2126801261" name="Include Paths (-I)" superClass="it.baeyens.arduino.compiler.c.sketch.option.incpath" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/arduino/core}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/arduino/variant}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Libraries/Ethernet}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Libraries/Ethernet/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Libraries/SPI}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Adafruit-GFX}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Metro}&quot;"/>
@@ -50,6 +48,8 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Streaming}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/TFT_ILI9341}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Touch-Screen}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Libraries/WiFi}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MqttMonitor/Libraries/WiFi/src}&quot;"/>
 								</option>
 								<inputType id="it.baeyens.arduino.compiler.c.sketch.input.575652065" name="C Source Files" superClass="it.baeyens.arduino.compiler.c.sketch.input"/>
 							</tool>

.project

@@ -26,16 +26,16 @@
 		<nature>it.baeyens.arduinonature</nature>
 	</natures>
 	<linkedResources>
-		<link>
-			<name>Libraries/Ethernet</name>
-			<type>2</type>
-			<locationURI>ArduinoLibPath/Ethernet</locationURI>
-		</link>
 		<link>
 			<name>Libraries/SPI</name>
 			<type>2</type>
 			<locationURI>ArduinoHardwareLibPath/SPI</locationURI>
 		</link>
+		<link>
+			<name>Libraries/WiFi</name>
+			<type>2</type>
+			<locationURI>ArduinoLibPath/WiFi</locationURI>
+		</link>
 		<link>
 			<name>arduino/core</name>
 			<type>2</type>

.settings/org.eclipse.cdt.core.prefs

@@ -154,10 +154,10 @@ environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.DTS/value=0
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.LOCAL/delimiter=\:
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.LOCAL/operation=replace
-environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.LOCAL/value=1457087444
+environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.LOCAL/value=1457277262
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.UTC/delimiter=\:
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.UTC/operation=replace
-environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.UTC/value=1457083844
+environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.UTC/value=1457273662
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.ZONE/delimiter=\:
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.ZONE/operation=replace
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/A.EXTRA.TIME.ZONE/value=3600
@@ -370,7 +370,7 @@ environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/JANTJE.
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/JANTJE.BUILD_VARIANT/value=mega
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/JANTJE.COM_PORT/delimiter=\:
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/JANTJE.COM_PORT/operation=replace
-environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/JANTJE.COM_PORT/value=/dev/tty.usbmodem33
+environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/JANTJE.COM_PORT/value=/dev/tty.usbmodem36
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/JANTJE.COM_PROGMR/delimiter=\:
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/JANTJE.COM_PROGMR/operation=replace
 environment/project/it.baeyens.arduino.core.toolChain.release.1898938335/JANTJE.COM_PROGMR/value=Default

mqttclient.cpp

@@ -8,7 +8,8 @@
 #include "mqttclient.h"
 
 #include <Streaming.h>
-#include <Ethernet.h>
+#include <WiFi.h>
+#include <WiFiUDP.h>
 #include <Metro.h>
 #include <PubSubClient.h>
 #include "hmi.h"
@@ -22,10 +23,15 @@ static const char ALARM_TOPIC[] = "IoT/Alarm/Monitor";
 
 void callback(char* topic, byte* payload, unsigned int length);
 
-static uint8_t MAC[]     = { 0x90, 0xA2, 0xDA, 0x00, 0x51, 0x08 };
+char ssid[] = "MessWLAN";
-const static char BROKER[] = "192.168.75.1";
+char pass[] = "UNVmpwbr6heQnMQ7ykXT";
-EthernetClient ethernetClient;
+const uint8_t WIFI_ENABLE_PIN = 3;
-PubSubClient mqttClient = PubSubClient(BROKER, 1883, callback, ethernetClient);
+
+// static uint8_t MAC[]     = { 0x90, 0xA2, 0xDA, 0x00, 0x51, 0x08 };
+// const static char BROKER[] = "192.168.75.1";
+const static char BROKER[] = "mqttbroker";
+WiFiClient wifiClient;
+PubSubClient mqttClient = PubSubClient(BROKER, 1883, callback, wifiClient);
 uint8_t disconnectState = 0;
 uint32_t disconnectTime = 0;
 Metro minute = Metro(60000);
@@ -76,22 +82,62 @@ void callback(char* topic, byte* payload, unsigned int length) {
 	}
 }
 
+void printWifiStatus() {
+  // print the SSID of the network you're attached to:
+  Serial.print("SSID: ");
+  Serial.println(WiFi.SSID());
+
+  // print your WiFi shield's IP address:
+  IPAddress ip = WiFi.localIP();
+  Serial.print("IP Address: ");
+  Serial.println(ip);
+
+  // print the received signal strength:
+  long rssi = WiFi.RSSI();
+  Serial.print("signal strength (RSSI):");
+  Serial.print(rssi);
+  Serial.println(" dBm");
+}
 
 void MqttClientNS::begin() {
-	Ethernet.begin(MAC);
+	pinMode(WIFI_ENABLE_PIN, INPUT_PULLUP);
-	Serial << "Got IP address: " << Ethernet.localIP() << endl;
+	delay(500);
+	bool wifiEnabled = (digitalRead(WIFI_ENABLE_PIN) != 0);
+
+	// Ethernet.begin(MAC);
+	// Serial << "Got IP address: " << Ethernet.localIP() << endl;
+	if (wifiEnabled) {
+		// check for the presence of the shield:
+		if (WiFi.status() == WL_NO_SHIELD) {
+			Serial.println("WiFi shield not present");
+			while(true);
+		}
+
+		int status = WL_IDLE_STATUS;
+		while ( status != WL_CONNECTED) {
+			Serial.print("Attempting to connect to SSID: ");
+			Serial.println(ssid);
+			status = WiFi.begin(ssid, pass);
+
+			// wait 10 seconds for connection:
+			delay(10000);
+		}
+	    Serial.println("Connected.");
+
+	    printWifiStatus();
 
 		disconnectState = 3;
 		disconnectTime = millis();
+	}
 }
 
 void MqttClientNS::exec() {
-	if (minute.check() == 1) {
+//	if (minute.check() == 1) {
-		byte r = Ethernet.maintain();
+//		byte r = Ethernet.maintain();
-		Serial << "Ethernet.maintain: " << r << endl;
+//		Serial << "Ethernet.maintain: " << r << endl;
-		if ((r == DHCP_CHECK_REBIND_FAIL) || (r == DHCP_CHECK_RENEW_FAIL)) {
+//		if ((r == DHCP_CHECK_REBIND_FAIL) || (r == DHCP_CHECK_RENEW_FAIL)) {
-		}
+//		}
-	}
+//	}
 
 	if ((disconnectState == 0) && (! mqttClient.loop())) {
 		disconnectState = 1;