Skip to content

Commit c098b1c

Browse files
committed
Merge branch 'master' into ebus
2 parents a12cc0c + e10d397 commit c098b1c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ This section lists adapter hardware revisions together with specifics for each o
9999
- RESET_PIN: TO-EBUS (GPIO20)
100100
- trimmer is replaced by PWM setting in web interface
101101

102-
### v6.1
102+
### v6.1 and newer
103103
- firmware file: firmware-HW_v5.x.bin
104104
- RESET_PIN: TO-EBUS (GPIO20)
105105
- added missing via in v6.0

Diff for: platformio.ini

+6-3
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,21 @@ lib_deps =
1616
https://github.com/prampec/IotWebConf#v3.2.1
1717
heman/AsyncMqttClient-esphome@^2.1.0
1818
bblanchon/ArduinoJson@^7.2.0
19+
build_flags =
20+
-DIOTWEBCONF_CONFIG_DONT_USE_MDNS=1
21+
-DIOTWEBCONF_PASSWORD_LEN=64
1922

2023
[env:esp12e]
2124
platform = espressif8266
2225
board = esp12e
2326
monitor_speed = 2400
2427
upload_speed = 921600
2528
build_flags =
29+
${env.build_flags}
2630
-DRESET_PIN=5
2731
-DTX_DISABLE_PIN=5
2832
-DBusSer=Serial
2933
-DDebugSer=Serial1
30-
-DIOTWEBCONF_CONFIG_DONT_USE_MDNS=1
3134

3235
lib_deps =
3336
${env.lib_deps}
@@ -42,11 +45,11 @@ upload_protocol = espota
4245
[env:esp12e-v3]
4346
extends = env:esp12e
4447
build_flags =
48+
${env.build_flags}
4549
-DRESET_PIN=5
4650
-DTX_DISABLE_PIN=2
4751
-DBusSer=Serial
4852
-DDebugSer=Serial1
49-
-DIOTWEBCONF_CONFIG_DONT_USE_MDNS=1
5053

5154
[env:esp12e-v3-ota]
5255
extends = env:esp12e-v3
@@ -57,14 +60,14 @@ upload_protocol = espota
5760
5861
board = esp32-c3-devkitm-1
5962
build_flags =
63+
${env.build_flags}
6064
-DRESET_PIN=20
6165
-DPWM_PIN=6
6266
-DARDUINO_USB_MODE=1
6367
-DARDUINO_USB_CDC_ON_BOOT=1
6468
-DBusSer=Serial1
6569
-DDebugSer=Serial
6670
-DSTATUS_LED_PIN=3
67-
-DIOTWEBCONF_CONFIG_DONT_USE_MDNS=1
6871

6972
monitor_filters = esp32_exception_decoder
7073
lib_deps =

0 commit comments

Comments
 (0)