Merge branch 'master' into relay2

This commit is contained in:
Patrick Haßel 2025-09-08 08:59:49 +02:00
commit f1896d5c54
2 changed files with 32 additions and 28 deletions

View File

@ -9,12 +9,12 @@ lib_deps = bblanchon/ArduinoJson @ 7.4.2
[Sonoff4ChPro] [Sonoff4ChPro]
platform = espressif8266 platform = espressif8266
board = esp8285 board = esp8285
build_flags = -D Sonoff4ChPro -D WIFI_HOSTNAME_FALLBACK=\"PatrixSonoff4ChPro\" build_flags = -D Sonoff4ChPro
[GosundSP111] [GosundSP111]
platform = espressif8266 platform = espressif8266
board = esp8285 board = esp8285
build_flags = -D GosundSP111 -D WIFI_HOSTNAME_FALLBACK=\"PatrixGosundSP111\" build_flags = -D GosundSP111
[ESP32_TEST] [ESP32_TEST]
platform = espressif32 platform = espressif32
@ -24,18 +24,6 @@ debug_tool = esp-prog
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
build_flags = -D ESP32_TESTBOARD -D CORE_DEBUG_LEVEL=0 build_flags = -D ESP32_TESTBOARD -D CORE_DEBUG_LEVEL=0
[env:Sonoff4ChPro]
platform = ${Sonoff4ChPro.platform}
board = ${Sonoff4ChPro.board}
framework = ${common.framework}
upload_speed = ${common.upload_speed}
monitor_speed = ${common.monitor_speed}
build.filesystem = ${common.build.filesystem}
lib_deps = ${common.lib_deps}
upload_protocol = espota
upload_port = 10.0.0.178
build_flags = ${Sonoff4ChPro.build_flags}
[env:Sonoff4ChPro_ESP32] [env:Sonoff4ChPro_ESP32]
platform = ${ESP32_TEST.platform} platform = ${ESP32_TEST.platform}
board = ${ESP32_TEST.board} board = ${ESP32_TEST.board}
@ -47,17 +35,7 @@ debug_tool = ${ESP32_TEST.debug_tool}
monitor_filters = ${ESP32_TEST.monitor_filters} monitor_filters = ${ESP32_TEST.monitor_filters}
build.filesystem = ${common.build.filesystem} build.filesystem = ${common.build.filesystem}
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
build_flags = ${Sonoff4ChPro.build_flags} ${ESP32_TEST.build_flags} build_flags = ${Sonoff4ChPro.build_flags} -D WIFI_HOSTNAME_FALLBACK=\"PatrixSonoff4ChPro_ESP32\" ${ESP32_TEST.build_flags}
[env:GosundSP111]
platform = ${GosundSP111.platform}
board = ${GosundSP111.board}
framework = ${common.framework}
upload_speed = ${common.upload_speed}
monitor_speed = ${common.monitor_speed}
build.filesystem = ${common.build.filesystem}
lib_deps = ${common.lib_deps}
build_flags = ${GosundSP111.build_flags}
[env:GosundSP111_ESP32] [env:GosundSP111_ESP32]
platform = ${ESP32_TEST.platform} platform = ${ESP32_TEST.platform}
@ -70,4 +48,28 @@ debug_tool = ${ESP32_TEST.debug_tool}
monitor_filters = ${ESP32_TEST.monitor_filters} monitor_filters = ${ESP32_TEST.monitor_filters}
build.filesystem = ${common.build.filesystem} build.filesystem = ${common.build.filesystem}
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
build_flags = ${GosundSP111.build_flags} ${ESP32_TEST.build_flags} build_flags = ${GosundSP111.build_flags} -D WIFI_HOSTNAME_FALLBACK=\"PatrixGosundSP111_ESP32\" ${ESP32_TEST.build_flags}
[env:Greenhouse]
platform = ${Sonoff4ChPro.platform}
board = ${Sonoff4ChPro.board}
framework = ${common.framework}
upload_speed = ${common.upload_speed}
monitor_speed = ${common.monitor_speed}
build.filesystem = ${common.build.filesystem}
lib_deps = ${common.lib_deps}
upload_protocol = espota
upload_port = 10.0.0.178
build_flags = ${Sonoff4ChPro.build_flags} -D WIFI_HOSTNAME_FALLBACK=\"Greenhouse\"
[env:InfraredHeater]
platform = ${GosundSP111.platform}
board = ${GosundSP111.board}
framework = ${common.framework}
upload_speed = ${common.upload_speed}
monitor_speed = ${common.monitor_speed}
build.filesystem = ${common.build.filesystem}
lib_deps = ${common.lib_deps}
upload_protocol = espota
upload_port = 10.0.0.179
build_flags = ${GosundSP111.build_flags} -D WIFI_HOSTNAME_FALLBACK=\"Heater\"

View File

@ -7,8 +7,10 @@ minify index.html | sed 's|http://10.42.0.204||g' > index.html.min || exit 2
#curl -s 'http://10.42.0.204/upload/index' -F "file=@index.html.min" #curl -s 'http://10.42.0.204/upload/index' -F "file=@index.html.min"
#curl -s 'http://10.42.0.204/upload/icon' -F "file=@icon.svg" #curl -s 'http://10.42.0.204/upload/icon' -F "file=@icon.svg"
#curl -s 'http://10.0.0.178/upload/index' -F "file=@index.html.min" # Greenhouse
curl -s 'http://10.0.0.178/upload/index' -F "file=@index.html.min"
#curl -s 'http://10.0.0.178/upload/icon' -F "file=@icon.svg" #curl -s 'http://10.0.0.178/upload/icon' -F "file=@icon.svg"
curl -s 'http://10.0.0.179/upload/index' -F "file=@index.html.min" # InfraredHeater
#curl -s 'http://10.0.0.179/upload/index' -F "file=@index.html.min"
#curl -s 'http://10.0.0.179/upload/icon' -F "file=@icon.svg" #curl -s 'http://10.0.0.179/upload/icon' -F "file=@icon.svg"