Merge development branch

MySensors.h

@@ -40,7 +40,7 @@
  * @def MY_NODE_TYPE
  * @brief Contain a string describing the class of sketch/node (gateway/repeater/sensor).
  */
-#if defined(MY_GATEWAY_SERIAL) || defined(MY_GATEWAY_W5100) || defined(MY_GATEWAY_ENC28J60) || defined(MY_GATEWAY_ESP8266) || defined(MY_GATEWAY_MQTT_CLIENT)
+#if defined(MY_GATEWAY_SERIAL) || defined(MY_GATEWAY_W5100) || defined(MY_GATEWAY_ENC28J60) || defined(MY_GATEWAY_ESP8266) || defined(MY_GATEWAY_LINUX) || defined(MY_GATEWAY_MQTT_CLIENT)
 	#define MY_GATEWAY_FEATURE
 	#define MY_IS_GATEWAY (true)
 	#define MY_NODE_TYPE "GW"
@@ -69,6 +69,24 @@
 	#include "core/MyHwATMega328.cpp"
 #elif defined(ARDUINO_ARCH_SAMD)
         #include "core/MyHwSAMD.cpp"
+#elif defined(__linux__)
+	// Remove PSTR macros from debug prints
+	#undef PSTR
+	#define PSTR(x) (x)
+	//#undef F
+	//#define F(x) (x)
+	#define PROGMEM
+	#define vsnprintf_P(...) vsnprintf( __VA_ARGS__ )
+	#define snprintf_P(...) snprintf( __VA_ARGS__ )
+	#define memcpy_P memcpy
+	#define pgm_read_dword(x) (*x)
+	#define pgm_read_byte_near(x) (*x)
+	#include "core/MyHwLinuxGeneric.cpp"
+	// Ugly hack
+	#ifdef LINUX_ARCH_RASPBERRYPI
+		#undef hwDigitalWrite
+		#define hwDigitalWrite(__pin, __value) (digitalWrite(__pin, __value))
+	#endif
 #endif
 
 // LEDS
@@ -141,14 +159,21 @@
 #endif
 
 // GATEWAY - TRANSPORT
+#if defined(MY_CONTROLLER_IP_ADDRESS) || defined(MY_CONTROLLER_URL_ADDRESS)
+	#define MY_GATEWAY_CLIENT_MODE
+#endif
+#if defined(MY_USE_UDP) && !defined(MY_GATEWAY_CLIENT_MODE)
+	#error You must specify MY_CONTROLLER_IP_ADDRESS or MY_CONTROLLER_URL_ADDRESS for UDP
+#endif
+
 #if defined(MY_GATEWAY_MQTT_CLIENT)
 	#if defined(MY_RADIO_FEATURE)
 		// We assume that a gateway having a radio also should act as repeater
 		#define MY_REPEATER_FEATURE
 	#endif
 	// GATEWAY - COMMON FUNCTIONS
-	// We only support MQTT Client using W5100 and ESP8266 at the moment
-	#if !(defined(MY_CONTROLLER_URL_ADDRESS) || defined(MY_CONTROLLER_IP_ADDRESS))
+	// We support MQTT Client using W5100, ESP8266 and Linux
+	#if !defined(MY_GATEWAY_CLIENT_MODE)
 		#error You must specify MY_CONTROLLER_IP_ADDRESS or MY_CONTROLLER_URL_ADDRESS
 	#endif
 
@@ -158,18 +183,25 @@
 	#if !defined(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX)
 		#error You must specify a topic subscribe prefix MY_MQTT_SUBSCRIBE_TOPIC_PREFIX for this MQTT client
 	#endif
-	#if !defined(MY_MQTT_CLIENT_ID)
+
+ 	#if !defined(MY_MQTT_CLIENT_ID)
 		#error You must define a unique MY_MQTT_CLIENT_ID for this MQTT client
 	#endif
 
-	#include "drivers/PubSubClient/PubSubClient.cpp"
 	#include "core/MyGatewayTransport.cpp"
+	#include "core/MyProtocolMySensors.cpp"
+
+	#if defined(MY_GATEWAY_LINUX)
+		#include "drivers/Linux/EthernetClient.h"
+		#include "drivers/Linux/EthernetServer.h"
+		#include "drivers/Linux/IPAddress.h"
+	#endif
+	#include "drivers/PubSubClient/PubSubClient.cpp"
 	#include "core/MyGatewayTransportMQTTClient.cpp"
 #elif defined(MY_GATEWAY_FEATURE)
 	// GATEWAY - COMMON FUNCTIONS
 	#include "core/MyGatewayTransport.cpp"
 
-	// We currently only support one protocol at the moment, enable it.
 	#include "core/MyProtocolMySensors.cpp"
 
 	// GATEWAY - CONFIGURATION
@@ -177,15 +209,18 @@
 		// We assume that a gateway having a radio also should act as repeater
 		#define MY_REPEATER_FEATURE
 	#endif
-	#if defined(MY_CONTROLLER_IP_ADDRESS)
-		#define MY_GATEWAY_CLIENT_MODE
-	#endif
 	#if !defined(MY_PORT)
 		#error You must define MY_PORT (controller or gatway port to open)
 	#endif
 	#if defined(MY_GATEWAY_ESP8266)
 		// GATEWAY - ESP8266
 		#include "core/MyGatewayTransportEthernet.cpp"
+	#elif defined(MY_GATEWAY_LINUX)
+		// GATEWAY - Generic Linux
+		#include "drivers/Linux/EthernetClient.h"
+		#include "drivers/Linux/EthernetServer.h"
+		#include "drivers/Linux/IPAddress.h"
+		#include "core/MyGatewayTransportEthernet.cpp"
 	#elif defined(MY_GATEWAY_W5100)
 		// GATEWAY - W5100
 		#include "core/MyGatewayTransportEthernet.cpp"
@@ -245,6 +280,10 @@
 		#include "drivers/AVR/DigitalIO/DigitalIO.h"
 	#endif
 
+ 	#if defined(MY_RADIO_NRF24) && defined(__linux__) && !defined(LINUX_ARCH_RASPBERRYPI)
+ 		#error No support for nRF24 radio on this platform
+ 	#endif
+
 	#include "core/MyTransport.cpp"
 	#if (defined(MY_RADIO_NRF24) && defined(MY_RADIO_RFM69)) || (defined(MY_RADIO_NRF24) && defined(MY_RS485)) || (defined(MY_RADIO_RFM69) && defined(MY_RS485))
 		#error Only one forward link driver can be activated
@@ -296,6 +335,8 @@
 #if !defined(MY_CORE_ONLY)
 	#if defined(ARDUINO_ARCH_ESP8266)
 		#include "core/MyMainESP8266.cpp"
+	#elif defined(__linux__)
+		#include "core/MyMainLinux.cpp"
 	#else
 		#include "core/MyMainDefault.cpp"
 	#endif