From d1aa419efe612bfd00256ed3259d123a3efe95d5 Mon Sep 17 00:00:00 2001 From: Mikael Falkvidd Date: Sat, 7 Apr 2018 10:42:52 +0200 Subject: [PATCH] Remove faulty wiring instructions from ESP gateways (#1100) This fixes https://github.com/mysensors/MySensors/issues/1096 https://www.mysensors.org/build/connect_radio has been updated to include GPIOn instructions (in addition to the existing Dn instructions). Thanks to RWoerz for reporting this discrepancy. Also, the "barebone" boot wiring has been moved to http://bit.do/stupidurl --- examples/GatewayESP8266/GatewayESP8266.ino | 28 +++++------------ .../GatewayESP8266MQTTClient.ino | 29 +++++------------- .../GatewayESP8266OTA/GatewayESP8266OTA.ino | 30 +++++-------------- 3 files changed, 23 insertions(+), 64 deletions(-) diff --git a/examples/GatewayESP8266/GatewayESP8266.ino b/examples/GatewayESP8266/GatewayESP8266.ino index 54af4dc..b7fef14 100644 --- a/examples/GatewayESP8266/GatewayESP8266.ino +++ b/examples/GatewayESP8266/GatewayESP8266.ino @@ -30,34 +30,20 @@ * * VERA CONFIGURATION: * Enter "ip-number:port" in the ip-field of the Arduino GW device. This will temporarily override any serial configuration for the Vera plugin. - * E.g. If you want to use the defualt values in this sketch enter: 192.168.178.66:5003 + * E.g. If you want to use the default values in this sketch enter: 192.168.178.66:5003 * * LED purposes: * - To use the feature, uncomment any of the MY_DEFAULT_xx_LED_PINs in your sketch, only the LEDs that is defined is used. - * - RX (green) - blink fast on radio message recieved. In inclusion mode will blink fast only on presentation recieved + * - RX (green) - blink fast on radio message recieved. In inclusion mode will blink fast only on presentation received * - TX (yellow) - blink fast on radio message transmitted. In inclusion mode will blink slowly - * - ERR (red) - fast blink on error during transmission error or recieve crc error + * - ERR (red) - fast blink on error during transmission error or receive crc error * - * See http://www.mysensors.org/build/esp8266_gateway for wiring instructions. - * nRF24L01+ ESP8266 - * VCC VCC - * CE GPIO4 - * CSN/CS GPIO15 - * SCK GPIO14 - * MISO GPIO12 - * MOSI GPIO13 - * GND GND + * See https://www.mysensors.org/build/connect_radio for wiring instructions. * - * Not all ESP8266 modules have all pins available on their external interface. - * This code has been tested on an ESP-12 module. - * The ESP8266 requires a certain pin configuration to download code, and another one to run code: - * - Connect REST (reset) via 10K pullup resistor to VCC, and via switch to GND ('reset switch') - * - Connect GPIO15 via 10K pulldown resistor to GND - * - Connect CH_PD via 10K resistor to VCC - * - Connect GPIO2 via 10K resistor to VCC - * - Connect GPIO0 via 10K resistor to VCC, and via switch to GND ('bootload switch') + * If you are using a "barebone" ESP8266, see + * https://www.mysensors.org/build/esp8266_gateway#wiring-for-barebone-esp8266 * - * Inclusion mode button: + * Inclusion mode button: * - Connect GPIO5 (=D1) via switch to GND ('inclusion switch') * * Hardware SHA204 signing is currently not supported! diff --git a/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino b/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino index 57fff44..9d2b49b 100644 --- a/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino +++ b/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino @@ -27,29 +27,16 @@ * * LED purposes: * - To use the feature, uncomment any of the MY_DEFAULT_xx_LED_PINs in your sketch - * - RX (green) - blink fast on radio message recieved. In inclusion mode will blink fast only on presentation recieved + * - RX (green) - blink fast on radio message recieved. In inclusion mode will blink fast only on presentation received * - TX (yellow) - blink fast on radio message transmitted. In inclusion mode will blink slowly - * - ERR (red) - fast blink on error during transmission error or recieve crc error + * - ERR (red) - fast blink on error during transmission error or receive crc error * - * See http://www.mysensors.org/build/esp8266_gateway for wiring instructions. - * nRF24L01+ ESP8266 - * VCC VCC - * CE GPIO4 - * CSN/CS GPIO15 - * SCK GPIO14 - * MISO GPIO12 - * MOSI GPIO13 + * See https://www.mysensors.org/build/connect_radio for wiring instructions. * - * Not all ESP8266 modules have all pins available on their external interface. - * This code has been tested on an ESP-12 module. - * The ESP8266 requires a certain pin configuration to download code, and another one to run code: - * - Connect REST (reset) via 10K pullup resistor to VCC, and via switch to GND ('reset switch') - * - Connect GPIO15 via 10K pulldown resistor to GND - * - Connect CH_PD via 10K resistor to VCC - * - Connect GPIO2 via 10K resistor to VCC - * - Connect GPIO0 via 10K resistor to VCC, and via switch to GND ('bootload switch') + * If you are using a "barebone" ESP8266, see + * https://www.mysensors.org/build/esp8266_gateway#wiring-for-barebone-esp8266 * - * Inclusion mode button: + * Inclusion mode button: * - Connect GPIO5 (=D1) via switch to GND ('inclusion switch') * * Hardware SHA204 signing is currently not supported! @@ -78,7 +65,7 @@ // Set MQTT client id #define MY_MQTT_CLIENT_ID "mysensors-1" -// Enable these if your MQTT broker requires usenrame/password +// Enable these if your MQTT broker requires username/password //#define MY_MQTT_USER "username" //#define MY_MQTT_PASSWORD "password" @@ -138,6 +125,6 @@ void presentation() void loop() { - // Send locally attech sensors data here + // Send locally attached sensors data here } diff --git a/examples/GatewayESP8266OTA/GatewayESP8266OTA.ino b/examples/GatewayESP8266OTA/GatewayESP8266OTA.ino index 76badfd..4a485f8 100644 --- a/examples/GatewayESP8266OTA/GatewayESP8266OTA.ino +++ b/examples/GatewayESP8266OTA/GatewayESP8266OTA.ino @@ -31,34 +31,20 @@ * * VERA CONFIGURATION: * Enter "ip-number:port" in the ip-field of the Arduino GW device. This will temporarily override any serial configuration for the Vera plugin. - * E.g. If you want to use the defualt values in this sketch enter: 192.168.178.66:5003 + * E.g. If you want to use the default values in this sketch enter: 192.168.178.66:5003 * * LED purposes: * - To use the feature, uncomment WITH_LEDS_BLINKING in MyConfig.h - * - RX (green) - blink fast on radio message recieved. In inclusion mode will blink fast only on presentation recieved + * - RX (green) - blink fast on radio message recieved. In inclusion mode will blink fast only on presentation received * - TX (yellow) - blink fast on radio message transmitted. In inclusion mode will blink slowly - * - ERR (red) - fast blink on error during transmission error or recieve crc error + * - ERR (red) - fast blink on error during transmission error or receive crc error * - * See http://www.mysensors.org/build/esp8266_gateway for wiring instructions. - * nRF24L01+ ESP8266 - * VCC VCC - * CE GPIO4 - * CSN/CS GPIO15 - * SCK GPIO14 - * MISO GPIO12 - * MOSI GPIO13 - * GND GND + * See https://www.mysensors.org/build/connect_radio for wiring instructions. * - * Not all ESP8266 modules have all pins available on their external interface. - * This code has been tested on an ESP-12 module. - * The ESP8266 requires a certain pin configuration to download code, and another one to run code: - * - Connect REST (reset) via 10K pullup resistor to VCC, and via switch to GND ('reset switch') - * - Connect GPIO15 via 10K pulldown resistor to GND - * - Connect CH_PD via 10K resistor to VCC - * - Connect GPIO2 via 10K resistor to VCC - * - Connect GPIO0 via 10K resistor to VCC, and via switch to GND ('bootload switch') + * If you are using a "barebone" ESP8266, see + * https://www.mysensors.org/build/esp8266_gateway#wiring-for-barebone-esp8266 * - * Inclusion mode button: + * Inclusion mode button: * - Connect GPIO5 via switch to GND ('inclusion switch') * * Hardware SHA204 signing is currently not supported! @@ -170,7 +156,7 @@ void presentation() void loop() { - // Send locally attech sensors data here + // Send locally attached sensors data here ArduinoOTA.handle(); }