Merge pull request #241 from mysensors/fix-w5100-gateway-pins

Fix w5100 mqtt gateway default pin setting

libraries/MySensors/examples/GatewayW5100MQTTClient/GatewayW5100MQTTClient.ino

@@ -75,6 +75,23 @@
 // Set MQTT client id
 #define MY_MQTT_CLIENT_ID "mysensors-1"
 
+// W5100 Ethernet module SPI enable (optional if using a shield/module that manages SPI_EN signal)
+//#define MY_W5100_SPI_EN 4  
+
+// Enable Soft SPI for NRF radio (note different radio wiring is required)
+// The W5100 ethernet module seems to have a hard time co-operate with 
+// radio on the same spi bus.
+#if !defined(MY_W5100_SPI_EN)
+  #define MY_SOFTSPI
+  #define MY_SOFT_SPI_SCK_PIN 14
+  #define MY_SOFT_SPI_MISO_PIN 16
+  #define MY_SOFT_SPI_MOSI_PIN 15
+#endif  
+
+// When W5100 is connected we have to move CE/CSN pins for NRF radio
+#define MY_RF24_CE_PIN 5
+#define MY_RF24_CS_PIN 6
+
 // Enable these if your MQTT broker requires usenrame/password
 //#define MY_MQTT_USER "username"
 //#define MY_MQTT_PASSWORD "password"

libraries/MySensors/keywords.txt

@@ -99,4 +99,8 @@ MY_W5100_SPI_EN LITERAL1
 MY_RS485	LITERAL1
 MY_RS485_BAUD_RATE	LITERAL1
 MY_RS485_MAX_MESSAGE_LENGTH	LITERAL1
-MY_INCLUSION_BUTTON_EXTERNAL_PULLUP	LITERAL1
+MY_INCLUSION_BUTTON_EXTERNAL_PULLUP	LITERAL1
+MY_W5100_SPI_EN	LITERAL1
+MY_MQTT_TOPIC_PREFIX	LITERAL1
+MY_MQTT_CLIENT_ID	LITERAL1
+MY_GATEWAY_MQTT_CLIENT	LITERAL1