From 0ced49f6dd59127f640300fd3a7ad0c41bf16714 Mon Sep 17 00:00:00 2001 From: Henrik Ekblad Date: Fri, 6 Nov 2015 19:07:37 +0100 Subject: [PATCH 1/2] Fix default pin defines for the W5100 mqtt gateway --- .../GatewayW5100MQTTClient.ino | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libraries/MySensors/examples/GatewayW5100MQTTClient/GatewayW5100MQTTClient.ino b/libraries/MySensors/examples/GatewayW5100MQTTClient/GatewayW5100MQTTClient.ino index 462dc0d..bc90abb 100644 --- a/libraries/MySensors/examples/GatewayW5100MQTTClient/GatewayW5100MQTTClient.ino +++ b/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" From f82423c74bd7a99eeb1c209ab7ddfcb3ea6313bb Mon Sep 17 00:00:00 2001 From: Henrik Ekblad Date: Fri, 6 Nov 2015 19:10:41 +0100 Subject: [PATCH 2/2] Add missing MQTT LITERAL1 to keyworkds. --- libraries/MySensors/keywords.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/MySensors/keywords.txt b/libraries/MySensors/keywords.txt index 16050c7..ce8fc80 100644 --- a/libraries/MySensors/keywords.txt +++ b/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 \ No newline at end of file +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 \ No newline at end of file