From dd356d810885d81824f0cb504ccea2ae954440aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Sun, 4 Dec 2016 20:44:10 +0100 Subject: [PATCH] Not using espressif8266_stage in default environment --- CHANGELOG.md | 3 +++ code/platformio.custom.ini | 28 +++++++++++--------- code/platformio.ini | 53 ++++++++++++++++++++------------------ 3 files changed, 47 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 865de85a..3b1fc597 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Added +- Added support for DS18B20 temperature sensor. Thanks to Francesco Boscarino +- Added reset command from console ### Changed +- Not using espressif8266_stage in default environment ### Deprecated diff --git a/code/platformio.custom.ini b/code/platformio.custom.ini index 61c4c3f0..3b434ed2 100644 --- a/code/platformio.custom.ini +++ b/code/platformio.custom.ini @@ -37,6 +37,18 @@ upload_speed = 115200 upload_port = "192.168.4.1" upload_flags = --auth=fibonacci --port 8266 +# ------------------------------------------------------------------------------ + +[env:node-debug] +include = common +board = nodemcuv2 +platform = espressif8266 +build_flags = -g -DNODEMCUV2 -DDEBUG_PORT=Serial +lib_ignore = + +[env:node-debug-ota] +include = env:node-debug,ota + [env:sonoff-debug] include = common board = esp01_1m @@ -69,19 +81,11 @@ build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DS20 [env:s20-debug-ota] include = env:s20-debug,ota -[env:node-debug] -include = common -board = nodemcuv2 -platform = espressif8266_stage -build_flags = -g -DNODEMCUV2 -DDEBUG_PORT=Serial -DENABLE_FAUXMO=1 -lib_ignore = - -[env:node-debug-ota] -include = env:node-debug,ota - - - +# ------------------------------------------------------------------------------ +[env:ac-device] +topic = /home/cellar/airconditioner/ip +include = env:s20-debug-ota [env:washer-device] topic = /home/cellar/washer/ip diff --git a/code/platformio.ini b/code/platformio.ini index 30dbc155..bbe389f0 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -23,21 +23,24 @@ lib_deps = https://github.com/jccprj/RemoteSwitch-arduino-library lib_ignore = FauxmoESP, ESPAsyncUDP +# ------------------------------------------------------------------------------ + [env:node-debug] -platform = espressif8266_stage +platform = espressif8266 framework = arduino +board = nodemcuv2 lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = nodemcuv2 -build_flags = -g -DNODEMCUV2 -DDEBUG_PORT=Serial -DENABLE_FAUXMO=1 +build_flags = -g -DNODEMCUV2 -DDEBUG_PORT=Serial [env:node-debug-ota] platform = espressif8266 framework = arduino +board = nodemcuv2 lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = nodemcuv2 build_flags = -g -DNODEMCUV2 -DDEBUG_PORT=Serial upload_speed = 115200 upload_port = "192.168.4.1" @@ -46,97 +49,97 @@ upload_flags = --auth=fibonacci --port 8266 [env:sonoff-debug] platform = espressif8266 framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = esp01_1m build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF [env:sonoff-debug-ota] platform = espressif8266 framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = esp01_1m build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF upload_speed = 115200 upload_port = "192.168.4.1" upload_flags = --auth=fibonacci --port 8266 -lib_ignore = ${common.lib_ignore} [env:sonoff-pow-debug] platform = espressif8266 framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = esp01_1m build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF_POW -lib_ignore = ${common.lib_ignore} [env:sonoff-pow-debug-ota] platform = espressif8266 framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = esp01_1m build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF_POW upload_speed = 115200 upload_port = "192.168.4.1" upload_flags = --auth=fibonacci --port 8266 -lib_ignore = ${common.lib_ignore} [env:slampher-debug] platform = espressif8266 framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = esp01_1m build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSLAMPHER -lib_ignore = ${common.lib_ignore} [env:slampher-debug-ota] platform = espressif8266 framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = esp01_1m build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSLAMPHER upload_speed = 115200 upload_port = "192.168.4.1" upload_flags = --auth=fibonacci --port 8266 -lib_ignore = ${common.lib_ignore} [env:s20-debug] platform = espressif8266 framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = esp01_1m build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DS20 -lib_ignore = ${common.lib_ignore} [env:s20-debug-ota] platform = espressif8266 framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = esp01_1m build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DS20 upload_speed = 115200 upload_port = "192.168.4.1" upload_flags = --auth=fibonacci --port 8266 - +# ------------------------------------------------------------------------------ [env:ac-device] topic = /home/cellar/airconditioner/ip platform = espressif8266 framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = esp01_1m build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DS20 upload_speed = 115200 upload_port = "192.168.4.1" @@ -146,10 +149,10 @@ upload_flags = --auth=fibonacci --port 8266 topic = /home/cellar/washer/ip platform = espressif8266 framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = esp01_1m upload_speed = 115200 upload_port = "192.168.4.1" upload_flags = --auth=fibonacci --port 8266 @@ -159,10 +162,10 @@ build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF -DENA topic = /home/studio/lamp/ip platform = espressif8266_stage framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} lib_ignore = extra_script = pio_hooks.py -board = esp01_1m build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF -DENABLE_FAUXMO=1 upload_speed = 115200 upload_port = "192.168.4.1" @@ -170,13 +173,13 @@ upload_flags = --auth=fibonacci --port 8266 [env:living-lamp-device] topic = /home/living/lamp/ip -platform = espressif8266 +platform = espressif8266_stage framework = arduino +board = esp01_1m lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} extra_script = pio_hooks.py -board = esp01_1m -build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF +build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF -DENABLE_FAUXMO=1 upload_speed = 115200 upload_port = "192.168.4.1" upload_flags = --auth=fibonacci --port 8266