-
+
diff --git a/code/ota.py b/code/ota.py
index 0cd6a12c..a52ea7e0 100755
--- a/code/ota.py
+++ b/code/ota.py
@@ -15,6 +15,7 @@ import socket
import subprocess
import sys
import time
+import os
from zeroconf import ServiceBrowser, ServiceStateChange, Zeroconf
@@ -232,13 +233,24 @@ def boardname(board):
def store(device, env):
source = ".pioenvs/%s/firmware.elf" % env
destination = ".pioenvs/elfs/%s.elf" % boardname(device).lower()
+
+ dst_dir = os.path.dirname(destination)
+ if not os.path.exists(dst_dir):
+ os.mkdir(dst_dir)
+
shutil.move(source, destination)
def run(device, env):
print("Building and flashing image over-the-air...")
- command = "ESPURNA_IP=\"%s\" ESPURNA_BOARD=\"%s\" ESPURNA_AUTH=\"%s\" ESPURNA_FLAGS=\"%s\" platformio run --silent --environment %s -t upload"
- command = command % (device['ip'], device['board'], device['auth'], device['flags'], env)
- subprocess.check_call(command, shell=True)
+ environ = os.environ.copy()
+ environ["ESPURNA_IP"] = device["ip"]
+ environ["ESPURNA_BOARD"] = device["board"]
+ environ["ESPURNA_AUTH"] = device["auth"]
+ environ["ESPURNA_FLAGS"] = device["flags"]
+
+ command = ("platformio", "run", "--silent", "--environment", env, "-t", "upload")
+ subprocess.check_call(command, env=environ)
+
store(device, env)
# -------------------------------------------------------------------------------
@@ -308,6 +320,8 @@ if __name__ == '__main__':
if len(queue) == 0:
sys.exit(0)
+ queue = sorted(queue, key=lambda device: device.get('board', ''))
+
# Flash eash board
for board in queue:
@@ -315,7 +329,7 @@ if __name__ == '__main__':
if args.core > 0:
board['flags'] = "-DESPURNA_CORE " + board['flags']
- env = "esp8266-%sm-ota" % board['size']
+ env = "esp8266-%dm-ota" % board['size']
# Summary
print()
diff --git a/code/platformio.ini b/code/platformio.ini
index 24cbf693..d00c48d1 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -18,6 +18,7 @@ platform_150 = espressif8266@1.5.0
platform_160 = espressif8266@1.6.0
platform_173 = espressif8266@1.7.3
platform_180 = espressif8266@1.8.0
+platform_latest = ${common.platform_180}
platform = ${common.platform_150}
# ------------------------------------------------------------------------------
@@ -193,7 +194,7 @@ monitor_speed = ${common.monitor_speed}
extra_scripts = ${common.extra_scripts}
[env:travis02]
-platform = ${common.platform_173}
+platform = ${common.platform_latest}
framework = ${common.framework}
board = ${common.board_4m}
board_build.flash_mode = ${common.flash_mode}
@@ -204,7 +205,7 @@ monitor_speed = ${common.monitor_speed}
extra_scripts = ${common.extra_scripts}
[env:travis03]
-platform = ${common.platform_173}
+platform = ${common.platform_latest}
framework = ${common.framework}
board = ${common.board_4m}
board_build.flash_mode = ${common.flash_mode}
@@ -2202,6 +2203,32 @@ upload_port = ${common.upload_port}
upload_flags = ${common.upload_flags}
extra_scripts = ${common.extra_scripts}
+[env:iwoole-led-table-lamp]
+platform = ${common.platform}
+framework = ${common.framework}
+board = ${common.board_1m}
+board_build.flash_mode = ${common.flash_mode}
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags_1m0m} -DIWOOLE_LED_TABLE_LAMP
+monitor_speed = ${common.monitor_speed}
+extra_scripts = ${common.extra_scripts}
+
+[env:iwoole-led-table-lamp-ota]
+platform = ${common.platform}
+framework = ${common.framework}
+board = ${common.board_1m}
+board_build.flash_mode = ${common.flash_mode}
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags_1m0m} -DIWOOLE_LED_TABLE_LAMP
+upload_speed = ${common.upload_speed}
+upload_port = ${common.upload_port}
+upload_flags = ${common.upload_flags}
+monitor_speed = ${common.monitor_speed}
+extra_scripts = ${common.extra_scripts}
+
+
# ------------------------------------------------------------------------------
# GENERIC OTA ENVIRONMENTS
# ------------------------------------------------------------------------------
diff --git a/images/devices/aithinker-ai-light.jpg b/images/devices/aithinker-ai-light.jpg
index 535c61de..584c3a9d 100644
Binary files a/images/devices/aithinker-ai-light.jpg and b/images/devices/aithinker-ai-light.jpg differ
diff --git a/images/devices/arilux-al-lc01.jpg b/images/devices/arilux-al-lc01.jpg
index de036d83..5de40342 100644
Binary files a/images/devices/arilux-al-lc01.jpg and b/images/devices/arilux-al-lc01.jpg differ
diff --git a/images/devices/arilux-al-lc06.jpg b/images/devices/arilux-al-lc06.jpg
index df173391..49451f55 100644
Binary files a/images/devices/arilux-al-lc06.jpg and b/images/devices/arilux-al-lc06.jpg differ
diff --git a/images/devices/arilux-e27.jpg b/images/devices/arilux-e27.jpg
index 3dbe44ab..2675a777 100644
Binary files a/images/devices/arilux-e27.jpg and b/images/devices/arilux-e27.jpg differ
diff --git a/images/devices/authometion-lyt8266.jpg b/images/devices/authometion-lyt8266.jpg
index 12f37544..851cd311 100644
Binary files a/images/devices/authometion-lyt8266.jpg and b/images/devices/authometion-lyt8266.jpg differ
diff --git a/images/devices/electrodragon-wifi-iot.jpg b/images/devices/electrodragon-wifi-iot.jpg
index 4d567edd..34abdcf1 100644
Binary files a/images/devices/electrodragon-wifi-iot.jpg and b/images/devices/electrodragon-wifi-iot.jpg differ
diff --git a/images/devices/exs-wifi-relay-v31.jpg b/images/devices/exs-wifi-relay-v31.jpg
index fda8d78c..4f8eeab4 100644
Binary files a/images/devices/exs-wifi-relay-v31.jpg and b/images/devices/exs-wifi-relay-v31.jpg differ
diff --git a/images/devices/geiger_espurna_configuration.png b/images/devices/geiger_espurna_configuration.png
index 1316084d..d85c4060 100644
Binary files a/images/devices/geiger_espurna_configuration.png and b/images/devices/geiger_espurna_configuration.png differ
diff --git a/images/devices/geiger_espurna_status.png b/images/devices/geiger_espurna_status.png
index 26bd8185..429c550c 100644
Binary files a/images/devices/geiger_espurna_status.png and b/images/devices/geiger_espurna_status.png differ
diff --git a/images/devices/geiger_grafana_dashboard.png b/images/devices/geiger_grafana_dashboard.png
index d997f7a4..5bc6765e 100644
Binary files a/images/devices/geiger_grafana_dashboard.png and b/images/devices/geiger_grafana_dashboard.png differ
diff --git a/images/devices/geiger_scope_following_pulses.png b/images/devices/geiger_scope_following_pulses.png
index 63fd5b5a..303b784d 100755
Binary files a/images/devices/geiger_scope_following_pulses.png and b/images/devices/geiger_scope_following_pulses.png differ
diff --git a/images/devices/geiger_scope_single_pulse.png b/images/devices/geiger_scope_single_pulse.png
index d5d38782..cdf8e2c2 100755
Binary files a/images/devices/geiger_scope_single_pulse.png and b/images/devices/geiger_scope_single_pulse.png differ
diff --git a/images/devices/geiger_wiring_diagram.png b/images/devices/geiger_wiring_diagram.png
index 730a0845..a07ba496 100644
Binary files a/images/devices/geiger_wiring_diagram.png and b/images/devices/geiger_wiring_diagram.png differ
diff --git a/images/devices/generic-ag-l4-1.jpg b/images/devices/generic-ag-l4-1.jpg
index 6b7eec4d..64ffdccc 100644
Binary files a/images/devices/generic-ag-l4-1.jpg and b/images/devices/generic-ag-l4-1.jpg differ
diff --git a/images/devices/generic-ag-l4-2.jpg b/images/devices/generic-ag-l4-2.jpg
index a6f96338..c24e1ae1 100644
Binary files a/images/devices/generic-ag-l4-2.jpg and b/images/devices/generic-ag-l4-2.jpg differ
diff --git a/images/devices/generic-ag-l4-3.jpg b/images/devices/generic-ag-l4-3.jpg
index 7f4c5d6e..76f09d3e 100644
Binary files a/images/devices/generic-ag-l4-3.jpg and b/images/devices/generic-ag-l4-3.jpg differ
diff --git a/images/devices/generic-ag-l4-4.jpg b/images/devices/generic-ag-l4-4.jpg
index 8e39d6d3..d2b538f4 100644
Binary files a/images/devices/generic-ag-l4-4.jpg and b/images/devices/generic-ag-l4-4.jpg differ
diff --git a/images/devices/generic-ag-l4-5.jpg b/images/devices/generic-ag-l4-5.jpg
index ed8b285f..a62f7815 100644
Binary files a/images/devices/generic-ag-l4-5.jpg and b/images/devices/generic-ag-l4-5.jpg differ
diff --git a/images/devices/generic-geiger-diy.png b/images/devices/generic-geiger-diy.png
index 1f083897..d2cb9f95 100644
Binary files a/images/devices/generic-geiger-diy.png and b/images/devices/generic-geiger-diy.png differ
diff --git a/images/devices/generic-relay-40.jpg b/images/devices/generic-relay-40.jpg
index 62a9144d..68a91f2a 100644
Binary files a/images/devices/generic-relay-40.jpg and b/images/devices/generic-relay-40.jpg differ
diff --git a/images/devices/generic-rgbled-10.jpg b/images/devices/generic-rgbled-10.jpg
index 24e8ad65..d368d39a 100644
Binary files a/images/devices/generic-rgbled-10.jpg and b/images/devices/generic-rgbled-10.jpg differ
diff --git a/images/devices/generic-v9261f.jpg b/images/devices/generic-v9261f.jpg
index 3fd12208..1569ebab 100644
Binary files a/images/devices/generic-v9261f.jpg and b/images/devices/generic-v9261f.jpg differ
diff --git a/images/devices/heygo-hy02.jpg b/images/devices/heygo-hy02.jpg
index 4bda4563..64995593 100644
Binary files a/images/devices/heygo-hy02.jpg and b/images/devices/heygo-hy02.jpg differ
diff --git a/images/devices/huacanxing-h801.jpg b/images/devices/huacanxing-h801.jpg
index 4f15cf5d..4472ff1f 100644
Binary files a/images/devices/huacanxing-h801.jpg and b/images/devices/huacanxing-h801.jpg differ
diff --git a/images/devices/intermittech-quinled-2.6.jpg b/images/devices/intermittech-quinled-2.6.jpg
index 6c491b93..84b5475e 100644
Binary files a/images/devices/intermittech-quinled-2.6.jpg and b/images/devices/intermittech-quinled-2.6.jpg differ
diff --git a/images/devices/itead-1ch-inching.jpg b/images/devices/itead-1ch-inching.jpg
index 74920b7e..71e7f2ef 100644
Binary files a/images/devices/itead-1ch-inching.jpg and b/images/devices/itead-1ch-inching.jpg differ
diff --git a/images/devices/itead-bn-sz01.jpg b/images/devices/itead-bn-sz01.jpg
index 1b1055f1..071b84b4 100644
Binary files a/images/devices/itead-bn-sz01.jpg and b/images/devices/itead-bn-sz01.jpg differ
diff --git a/images/devices/itead-motor.jpg b/images/devices/itead-motor.jpg
index 20bdc183..e29d3346 100644
Binary files a/images/devices/itead-motor.jpg and b/images/devices/itead-motor.jpg differ
diff --git a/images/devices/itead-s20.jpg b/images/devices/itead-s20.jpg
index 9c620610..99ab344d 100644
Binary files a/images/devices/itead-s20.jpg and b/images/devices/itead-s20.jpg differ
diff --git a/images/devices/itead-s26.jpg b/images/devices/itead-s26.jpg
index 9f102635..1bf1682e 100644
Binary files a/images/devices/itead-s26.jpg and b/images/devices/itead-s26.jpg differ
diff --git a/images/devices/itead-slampher.jpg b/images/devices/itead-slampher.jpg
index 1f406bbd..e31c004f 100644
Binary files a/images/devices/itead-slampher.jpg and b/images/devices/itead-slampher.jpg differ
diff --git a/images/devices/itead-sonoff-4ch-pro.jpg b/images/devices/itead-sonoff-4ch-pro.jpg
index 632ad0ff..ba10966a 100644
Binary files a/images/devices/itead-sonoff-4ch-pro.jpg and b/images/devices/itead-sonoff-4ch-pro.jpg differ
diff --git a/images/devices/itead-sonoff-4ch.jpg b/images/devices/itead-sonoff-4ch.jpg
index ecb3477e..b0fc108b 100644
Binary files a/images/devices/itead-sonoff-4ch.jpg and b/images/devices/itead-sonoff-4ch.jpg differ
diff --git a/images/devices/itead-sonoff-b1.jpg b/images/devices/itead-sonoff-b1.jpg
index 3b8b7315..e338d094 100644
Binary files a/images/devices/itead-sonoff-b1.jpg and b/images/devices/itead-sonoff-b1.jpg differ
diff --git a/images/devices/itead-sonoff-basic.jpg b/images/devices/itead-sonoff-basic.jpg
index 9e7008d8..bf52a349 100644
Binary files a/images/devices/itead-sonoff-basic.jpg and b/images/devices/itead-sonoff-basic.jpg differ
diff --git a/images/devices/itead-sonoff-dual.jpg b/images/devices/itead-sonoff-dual.jpg
index f9439cbf..8f4db5b7 100644
Binary files a/images/devices/itead-sonoff-dual.jpg and b/images/devices/itead-sonoff-dual.jpg differ
diff --git a/images/devices/itead-sonoff-ifan02.jpg b/images/devices/itead-sonoff-ifan02.jpg
index 2627cf4d..cbb0cb92 100644
Binary files a/images/devices/itead-sonoff-ifan02.jpg and b/images/devices/itead-sonoff-ifan02.jpg differ
diff --git a/images/devices/itead-sonoff-led.jpg b/images/devices/itead-sonoff-led.jpg
index 051d84cd..0edcf16a 100644
Binary files a/images/devices/itead-sonoff-led.jpg and b/images/devices/itead-sonoff-led.jpg differ
diff --git a/images/devices/itead-sonoff-pow.jpg b/images/devices/itead-sonoff-pow.jpg
index fa5e61dd..fda2fc5b 100644
Binary files a/images/devices/itead-sonoff-pow.jpg and b/images/devices/itead-sonoff-pow.jpg differ
diff --git a/images/devices/itead-sonoff-rf.jpg b/images/devices/itead-sonoff-rf.jpg
index b86bd0fe..50224d0a 100644
Binary files a/images/devices/itead-sonoff-rf.jpg and b/images/devices/itead-sonoff-rf.jpg differ
diff --git a/images/devices/itead-sonoff-sv.jpg b/images/devices/itead-sonoff-sv.jpg
index 3b3514c1..33189872 100644
Binary files a/images/devices/itead-sonoff-sv.jpg and b/images/devices/itead-sonoff-sv.jpg differ
diff --git a/images/devices/itead-sonoff-t1.jpg b/images/devices/itead-sonoff-t1.jpg
index a081afbd..233c1d11 100644
Binary files a/images/devices/itead-sonoff-t1.jpg and b/images/devices/itead-sonoff-t1.jpg differ
diff --git a/images/devices/itead-sonoff-th.jpg b/images/devices/itead-sonoff-th.jpg
index ee3c64ae..24ffd316 100644
Binary files a/images/devices/itead-sonoff-th.jpg and b/images/devices/itead-sonoff-th.jpg differ
diff --git a/images/devices/jangoe-wifi-relay.jpg b/images/devices/jangoe-wifi-relay.jpg
index 1d317921..5b60dd53 100644
Binary files a/images/devices/jangoe-wifi-relay.jpg and b/images/devices/jangoe-wifi-relay.jpg differ
diff --git a/images/devices/jorgegarcia-wifi-relays.jpg b/images/devices/jorgegarcia-wifi-relays.jpg
index 7aa64595..c653a902 100644
Binary files a/images/devices/jorgegarcia-wifi-relays.jpg and b/images/devices/jorgegarcia-wifi-relays.jpg differ
diff --git a/images/devices/kmc-70011.jpg b/images/devices/kmc-70011.jpg
index ed07a7d0..c58ab298 100644
Binary files a/images/devices/kmc-70011.jpg and b/images/devices/kmc-70011.jpg differ
diff --git a/images/devices/lingan-swa1.jpg b/images/devices/lingan-swa1.jpg
index 122a6967..708de71e 100644
Binary files a/images/devices/lingan-swa1.jpg and b/images/devices/lingan-swa1.jpg differ
diff --git a/images/devices/lohas-9w.jpg b/images/devices/lohas-9w.jpg
index 2c85f215..7cecfddd 100644
Binary files a/images/devices/lohas-9w.jpg and b/images/devices/lohas-9w.jpg differ
diff --git a/images/devices/magichome-led-controller.jpg b/images/devices/magichome-led-controller.jpg
index b8604977..290d7320 100644
Binary files a/images/devices/magichome-led-controller.jpg and b/images/devices/magichome-led-controller.jpg differ
diff --git a/images/devices/mancavemade-esp-live.jpg b/images/devices/mancavemade-esp-live.jpg
index bfe3b379..f0645292 100644
Binary files a/images/devices/mancavemade-esp-live.jpg and b/images/devices/mancavemade-esp-live.jpg differ
diff --git a/images/devices/neo-coolcam-wifi.jpg b/images/devices/neo-coolcam-wifi.jpg
index db894a24..3d07a4a8 100644
Binary files a/images/devices/neo-coolcam-wifi.jpg and b/images/devices/neo-coolcam-wifi.jpg differ
diff --git a/images/devices/nodemcu-lolin-v3.jpg b/images/devices/nodemcu-lolin-v3.jpg
index e9392742..677c17a2 100644
Binary files a/images/devices/nodemcu-lolin-v3.jpg and b/images/devices/nodemcu-lolin-v3.jpg differ
diff --git a/images/devices/openenergymonitor-mqtt-relay.jpg b/images/devices/openenergymonitor-mqtt-relay.jpg
index 5563f234..43c38546 100644
Binary files a/images/devices/openenergymonitor-mqtt-relay.jpg and b/images/devices/openenergymonitor-mqtt-relay.jpg differ
diff --git a/images/devices/schuko-wifi-plug.jpg b/images/devices/schuko-wifi-plug.jpg
index d4fef2be..2ae71b89 100644
Binary files a/images/devices/schuko-wifi-plug.jpg and b/images/devices/schuko-wifi-plug.jpg differ
diff --git a/images/devices/tinkerman-espurna-h.jpg b/images/devices/tinkerman-espurna-h.jpg
index 29400268..e33a4b02 100644
Binary files a/images/devices/tinkerman-espurna-h.jpg and b/images/devices/tinkerman-espurna-h.jpg differ
diff --git a/images/devices/tonbux-powerstrip02.jpg b/images/devices/tonbux-powerstrip02.jpg
index 070955e4..1a8c143a 100644
Binary files a/images/devices/tonbux-powerstrip02.jpg and b/images/devices/tonbux-powerstrip02.jpg differ
diff --git a/images/devices/wemos-d1-mini-relayshield.jpg b/images/devices/wemos-d1-mini-relayshield.jpg
index a57c03bd..cb963e56 100644
Binary files a/images/devices/wemos-d1-mini-relayshield.jpg and b/images/devices/wemos-d1-mini-relayshield.jpg differ
diff --git a/images/devices/wion-50055.jpg b/images/devices/wion-50055.jpg
index 1a78abd2..24b1be5c 100644
Binary files a/images/devices/wion-50055.jpg and b/images/devices/wion-50055.jpg differ
diff --git a/images/devices/witty-cloud.jpg b/images/devices/witty-cloud.jpg
index c343f940..220ea9cc 100644
Binary files a/images/devices/witty-cloud.jpg and b/images/devices/witty-cloud.jpg differ
diff --git a/images/devices/workchoice-ecoplug.jpg b/images/devices/workchoice-ecoplug.jpg
index 49929ed8..8273de30 100644
Binary files a/images/devices/workchoice-ecoplug.jpg and b/images/devices/workchoice-ecoplug.jpg differ
diff --git a/images/devices/xenon-sm-pw702u.jpg b/images/devices/xenon-sm-pw702u.jpg
index 93173820..330368d2 100644
Binary files a/images/devices/xenon-sm-pw702u.jpg and b/images/devices/xenon-sm-pw702u.jpg differ