Merge branch 'development' into development

libraries/MySensors/core/MyGatewayTransportEthernet.cpp

@@ -156,7 +156,11 @@ bool gatewayTransportSend(MyMessage &message)
 			ret = _ethernetServer.endPacket();
 		#else
 			EthernetClient client;
-			if (client.connect(_ethernetControllerIP, MY_PORT)) {
+			#if defined(MY_CONTROLLER_URL_ADDRESS)
+				if (client.connect(MY_CONTROLLER_URL_ADDRESS, MY_PORT)) {
+			#else
+				if (client.connect(_ethernetControllerIP, MY_PORT)) {
+			#endif
 				client.write(_ethernetMsg, strlen(_ethernetMsg));
 				client.stop();
 			}

libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp

@@ -28,12 +28,16 @@
 uint8_t protocolH2i(char c);
 
 
-IPAddress _brokerIp(MY_CONTROLLER_IP_ADDRESS);
+#if defined MY_CONTROLLER_IP_ADDRESS
+  IPAddress _brokerIp(MY_CONTROLLER_IP_ADDRESS);
+#endif
 
 #if defined(MY_GATEWAY_ESP8266)
 	#define EthernetClient WiFiClient
-	IPAddress _gatewayIp(MY_IP_GATEWAY_ADDRESS);
-	IPAddress _subnetIp(MY_IP_SUBNET_ADDRESS);
+	#if defined(MY_IP_ADDRESS)
+ 		IPAddress _gatewayIp(MY_IP_GATEWAY_ADDRESS);
+ 		IPAddress _subnetIp(MY_IP_SUBNET_ADDRESS);
+ 	#endif
 #else
 	byte _clientMAC[] = { MY_MAC_ADDRESS };
 #endif
@@ -44,6 +48,7 @@ IPAddress _brokerIp(MY_CONTROLLER_IP_ADDRESS);
 
 EthernetClient _ethClient;
 PubSubClient _client(_ethClient);
+bool _connecting = true;
 bool _available = false;
 char _convBuffer[MAX_PAYLOAD*2+1];
 char _fmtBuffer[MY_GATEWAY_MAX_SEND_LENGTH];
@@ -150,7 +155,13 @@ bool reconnectMQTT() {
 }
 
 bool gatewayTransportInit() {
-	_client.setServer(_brokerIp, MY_PORT);
+	_connecting = true;
+	#if defined(MY_CONTROLLER_IP_ADDRESS)
+		_client.setServer(_brokerIp, MY_PORT);
+	#else
+		_client.setServer(MY_CONTROLLER_URL_ADDRESS, MY_PORT);
+	#endif
+
 	_client.setCallback(incomingMQTT);
 
   	#if defined(MY_GATEWAY_ESP8266)
@@ -164,30 +175,42 @@ bool gatewayTransportInit() {
 			MY_SERIALDEVICE.print(".");
 			yield();
 		}
-		MY_SERIALDEVICE.print(F("IP: "));
+		MY_SERIALDEVICE.print("IP: ");
 		MY_SERIALDEVICE.println(WiFi.localIP());
 	#else
 		#ifdef MY_IP_ADDRESS
 			Ethernet.begin(_clientMAC, _clientIp);
-			MY_SERIALDEVICE.print(F("IP: "));
-			MY_SERIALDEVICE.println(Ethernet.localIP());
 		#else
 			// Get IP address from DHCP
-			Ethernet.begin(_clientMAC);
-			MY_SERIALDEVICE.print(F("IP: "));
+			if (!Ethernet.begin(_clientMAC))
+			{
+				MY_SERIALDEVICE.print("DHCP FAILURE...");
+				_connecting = false;
+				return false;
+			}
+			MY_SERIALDEVICE.print("IP: ");
 			MY_SERIALDEVICE.println(Ethernet.localIP());
-		#endif /* IP_ADDRESS_DHCP */
+		#endif
+
 		// give the Ethernet interface a second to initialize
 		// TODO: use HW delay
 		wait(1000);
 	#endif
+	_connecting = false;
 	return true;
 }
 
 
 bool gatewayTransportAvailable() {
+	if (_connecting)
+		return false;
+
+	//keep lease on dhcp address
+	//Ethernet.maintain();
 	if (!_client.connected()) {
-		reconnectMQTT();
+		//reinitialise client
+		if (gatewayTransportInit())
+			reconnectMQTT();
 		return false;
 	}
 	_client.loop();

libraries/MySensors/core/MySensorCore.cpp

@@ -123,8 +123,6 @@ void _begin() {
 	#elif defined(MY_RADIO_FEATURE)
 		// Read settings from eeprom
 		hwReadConfigBlock((void*)&_nc, (void*)EEPROM_NODE_ID_ADDRESS, sizeof(NodeConfig));
-		// Read latest received controller configuration from EEPROM
-		hwReadConfigBlock((void*)&_cc, (void*)EEPROM_CONTROLLER_CONFIG_ADDRESS, sizeof(ControllerConfig));
 		#ifdef MY_OTA_FIRMWARE_FEATURE
 			// Read firmware config from EEPROM, i.e. type, version, CRC, blocks
 			hwReadConfigBlock((void*)&_fc, (void*)EEPROM_FIRMWARE_TYPE_ADDRESS, sizeof(NodeFirmwareConfig));