Merge branch 'master' into dev

README.md

@@ -54,7 +54,7 @@ It uses the Arduino Core for ESP8266 framework and a number of 3rd party librari
 * **Sonoff RF Bridge** support
     * Multiple virtual switches (tested with up to 16)
     * MQTT-to-RF two-way bridge (no need to learn codes)
-    * Support for https://github.com/rhx/RF-Bridge-EFM8BB1 custom firmware
+    * Support for https://github.com/Portisch/RF-Bridge-EFM8BB1 custom firmware
 * Support for different **sensors**
     * Environment
         * **DHT11 / DHT22 / DHT21 / AM2301 / Itead's SI7021**

code/platformio.ini

@@ -749,7 +749,7 @@ upload_flags = --auth=fibonacci --port 8266
 monitor_baud = 115200
 extra_scripts = ${common.extra_scripts}
 
-[env:jangoe-wifi-relay]
+[env:jangoe-wifi-relay-nc]
 platform = ${common.platform}
 framework = arduino
 board = esp12e
@@ -759,7 +759,7 @@ build_flags = ${common.build_flags} -DJANGOE_WIFI_RELAY_NC
 monitor_baud = 115200
 extra_scripts = ${common.extra_scripts}
 
-[env:jangoe-wifi-relay-ota]
+[env:jangoe-wifi-relay-nc-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp12e
@@ -772,6 +772,29 @@ upload_flags = --auth=fibonacci --port 8266
 monitor_baud = 115200
 extra_scripts = ${common.extra_scripts}
 
+[env:jangoe-wifi-relay-no]
+platform = ${common.platform}
+framework = arduino
+board = esp12e
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags} -DJANGOE_WIFI_RELAY_NO
+monitor_baud = 115200
+extra_scripts = ${common.extra_scripts}
+
+[env:jangoe-wifi-relay-no-ota]
+platform = ${common.platform}
+framework = arduino
+board = esp12e
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags} -DJANGOE_WIFI_RELAY_NO
+upload_speed = 115200
+upload_port = "192.168.4.1"
+upload_flags = --auth=fibonacci --port 8266
+monitor_baud = 115200
+extra_scripts = ${common.extra_scripts}
+
 [env:openenergymonitor-mqtt-relay]
 platform = ${common.platform}
 framework = arduino