rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-20 09:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

PIO: Fix ESP32 sub-variant inheritance (#8983)

Browse Source
This commit is contained in:
Austin
2025-12-15 20:04:03 -05:00
committed by GitHub
parent 024ac74f5c
commit eafa8c7b47
22 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
variants/esp32c3/diy/esp32c3_super_mini/platformio.ini
View File

@@ -4,7 +4,7 @@
extends = esp32c3_base extends = esp32c3_base
board = esp32-c3-devkitm-1 board = esp32-c3-devkitm-1
build_flags = build_flags =
${esp32_base.build_flags} ${esp32c3_base.build_flags}
-D PRIVATE_HW -D PRIVATE_HW
-I variants/esp32c3/diy/esp32c3_super_mini -I variants/esp32c3/diy/esp32c3_super_mini
-D ARDUINO_USB_MODE=1 -D ARDUINO_USB_MODE=1

2
variants/esp32c3/hackerboxes_esp32c3_oled/platformio.ini
View File

@@ -3,7 +3,7 @@ extends = esp32c3_base
board = esp32-c3-devkitm-1 board = esp32-c3-devkitm-1
board_level = extra board_level = extra
build_flags = build_flags =
${esp32_base.build_flags} ${esp32c3_base.build_flags}
-D PRIVATE_HW -D PRIVATE_HW
-D ARDUINO_USB_MODE=1 -D ARDUINO_USB_MODE=1
-D ARDUINO_USB_CDC_ON_BOOT=1 -D ARDUINO_USB_CDC_ON_BOOT=1

2
variants/esp32c3/heltec_esp32c3/platformio.ini
View File

@@ -3,7 +3,7 @@ extends = esp32c3_base
board = esp32-c3-devkitm-1 board = esp32-c3-devkitm-1
board_level = pr board_level = pr
build_flags = build_flags =
${esp32_base.build_flags} ${esp32c3_base.build_flags}
-D HELTEC_HT62 -D HELTEC_HT62
-I variants/esp32c3/heltec_esp32c3 -I variants/esp32c3/heltec_esp32c3
monitor_speed = 115200 monitor_speed = 115200

2
variants/esp32c3/heltec_hru_3601/platformio.ini
View File

@@ -2,7 +2,7 @@
extends = esp32c3_base extends = esp32c3_base
board = adafruit_qtpy_esp32c3 board = adafruit_qtpy_esp32c3
build_flags = build_flags =
${esp32_base.build_flags} ${esp32c3_base.build_flags}
-D HELTEC_HRU_3601 -D HELTEC_HRU_3601
-I variants/esp32c3/heltec_hru_3601 -I variants/esp32c3/heltec_hru_3601
lib_deps = ${esp32c3_base.lib_deps} lib_deps = ${esp32c3_base.lib_deps}

2
variants/esp32c3/m5stack-stamp-c3/platformio.ini
View File

@@ -3,7 +3,7 @@ extends = esp32c3_base
board = esp32-c3-devkitm-1 board = esp32-c3-devkitm-1
board_level = extra board_level = extra
build_flags = build_flags =
${esp32_base.build_flags} ${esp32c3_base.build_flags}
-D PRIVATE_HW -D PRIVATE_HW
-I variants/esp32c3/m5stack-stamp-c3 -I variants/esp32c3/m5stack-stamp-c3
monitor_speed = 115200 monitor_speed = 115200

4
variants/esp32s3/bpi_picow_esp32_s3/platformio.ini
View File

@@ -8,9 +8,9 @@ board_level = extra
upload_protocol = esptool upload_protocol = esptool
;upload_port = /dev/ttyACM2 ;upload_port = /dev/ttyACM2
lib_deps = lib_deps =
${esp32_base.lib_deps} ${esp32s3_base.lib_deps}
caveman99/ESP32 Codec2@^1.0.1 caveman99/ESP32 Codec2@^1.0.1
build_flags = build_flags =
${esp32_base.build_flags} ${esp32s3_base.build_flags}
-D PRIVATE_HW -D PRIVATE_HW
-I variants/esp32s3/bpi_picow_esp32_s3 -I variants/esp32s3/bpi_picow_esp32_s3

4
variants/esp32s3/diy/my_esp32s3_diy_eink/platformio.ini
View File

@@ -9,14 +9,14 @@ upload_protocol = esptool
;upload_port = /dev/ttyACM1 ;upload_port = /dev/ttyACM1
upload_speed = 921600 upload_speed = 921600
lib_deps = lib_deps =
${esp32_base.lib_deps} ${esp32s3_base.lib_deps}
zinggjm/GxEPD2@^1.6.2 zinggjm/GxEPD2@^1.6.2
adafruit/Adafruit NeoPixel @ ^1.12.0 adafruit/Adafruit NeoPixel @ ^1.12.0
build_unflags = build_unflags =
${esp32s3_base.build_unflags} ${esp32s3_base.build_unflags}
-DARDUINO_USB_MODE=1 -DARDUINO_USB_MODE=1
build_flags = build_flags =
${esp32_base.build_flags} ${esp32s3_base.build_flags}
-D PRIVATE_HW -D PRIVATE_HW
-I variants/esp32s3/diy/my_esp32s3_diy_eink -I variants/esp32s3/diy/my_esp32s3_diy_eink
-Dmy -Dmy

4
variants/esp32s3/diy/my_esp32s3_diy_oled/platformio.ini
View File

@@ -9,13 +9,13 @@ upload_protocol = esptool
;upload_port = /dev/ttyACM0 ;upload_port = /dev/ttyACM0
upload_speed = 921600 upload_speed = 921600
lib_deps = lib_deps =
${esp32_base.lib_deps} ${esp32s3_base.lib_deps}
adafruit/Adafruit NeoPixel @ ^1.12.0 adafruit/Adafruit NeoPixel @ ^1.12.0
build_unflags = build_unflags =
${esp32s3_base.build_unflags} ${esp32s3_base.build_unflags}
-DARDUINO_USB_MODE=1 -DARDUINO_USB_MODE=1
build_flags = build_flags =
${esp32_base.build_flags} ${esp32s3_base.build_flags}
-D PRIVATE_HW -D PRIVATE_HW
-I variants/esp32s3/diy/my_esp32s3_diy_oled -I variants/esp32s3/diy/my_esp32s3_diy_oled
-DBOARD_HAS_PSRAM -DBOARD_HAS_PSRAM

2
variants/esp32s3/heltec_vision_master_e213/platformio.ini
View File

@@ -27,7 +27,7 @@ board = heltec_vision_master_e213
board_level = pr board_level = pr
board_build.partitions = default_8MB.csv board_build.partitions = default_8MB.csv
build_src_filter = build_src_filter =
${esp32_base.build_src_filter} ${esp32s3_base.build_src_filter}
${inkhud.build_src_filter} ${inkhud.build_src_filter}
build_flags = build_flags =
${esp32s3_base.build_flags} ${esp32s3_base.build_flags}

2
variants/esp32s3/heltec_vision_master_e290/platformio.ini
View File

@@ -29,7 +29,7 @@ extends = esp32s3_base, inkhud
board = heltec_vision_master_e290 board = heltec_vision_master_e290
board_build.partitions = default_8MB.csv board_build.partitions = default_8MB.csv
build_src_filter = build_src_filter =
${esp32_base.build_src_filter} ${esp32s3_base.build_src_filter}
${inkhud.build_src_filter} ${inkhud.build_src_filter}
build_flags = build_flags =
${esp32s3_base.build_flags} ${esp32s3_base.build_flags}

2
variants/esp32s3/heltec_wireless_paper/platformio.ini
View File

@@ -27,7 +27,7 @@ extends = esp32s3_base, inkhud
board = heltec_wifi_lora_32_V3 board = heltec_wifi_lora_32_V3
board_build.partitions = default_8MB.csv board_build.partitions = default_8MB.csv
build_src_filter = build_src_filter =
${esp32_base.build_src_filter} ${esp32s3_base.build_src_filter}
${inkhud.build_src_filter} ${inkhud.build_src_filter}
build_flags = build_flags =
${esp32s3_base.build_flags} ${esp32s3_base.build_flags}

2
variants/esp32s3/link32_s3_v1/platformio.ini
View File

@@ -3,7 +3,7 @@ extends = esp32s3_base
board = esp32-s3-devkitc-1 board = esp32-s3-devkitc-1
board_level = extra board_level = extra
build_flags = build_flags =
${esp32_base.build_flags} ${esp32s3_base.build_flags}
-D LINK_32 -D LINK_32
-I variants/esp32s3/link32_s3_v1 -I variants/esp32s3/link32_s3_v1
-DARDUINO_USB_CDC_ON_BOOT -DARDUINO_USB_CDC_ON_BOOT

4
variants/esp32s3/m5stack_cores3/platformio.ini
View File

@@ -6,8 +6,8 @@ board_check = true
board_build.partitions = default_16MB.csv board_build.partitions = default_16MB.csv
upload_protocol = esptool upload_protocol = esptool
build_flags = build_flags =
${esp32_base.build_flags} ${esp32s3_base.build_flags}
-D PRIVATE_HW -D PRIVATE_HW
-D M5STACK_CORES3 -D M5STACK_CORES3
-I variants/esp32s3/m5stack_cores3 -I variants/esp32s3/m5stack_cores3
lib_deps = ${esp32_base.lib_deps} lib_deps = ${esp32s3_base.lib_deps}

4
variants/esp32s3/mesh-tab/platformio.ini
View File

@@ -46,9 +46,9 @@ build_flags = ${esp32s3_base.build_flags}
-D VIEW_320x240 -D VIEW_320x240
-D USE_PACKET_API -D USE_PACKET_API
-I variants/esp32s3/mesh-tab -I variants/esp32s3/mesh-tab
build_src_filter = ${esp32_base.build_src_filter} build_src_filter = ${esp32s3_base.build_src_filter}
lib_deps = lib_deps =
${esp32_base.lib_deps} ${esp32s3_base.lib_deps}
${device-ui_base.lib_deps} ${device-ui_base.lib_deps}
lovyan03/LovyanGFX@^1.2.0 lovyan03/LovyanGFX@^1.2.0

2
variants/esp32s3/nibble_esp32/platformio.ini
View File

@@ -3,6 +3,6 @@ extends = esp32s3_base
board = esp32-s3-zero board = esp32-s3-zero
board_level = extra board_level = extra
build_flags = build_flags =
${esp32_base.build_flags} ${esp32s3_base.build_flags}
-D PRIVATE_HW -D PRIVATE_HW
-I variants/esp32s3/nibble_esp32 -I variants/esp32s3/nibble_esp32

2
variants/esp32s3/rak3312/platformio.ini
View File

@@ -6,6 +6,6 @@ board_check = true
upload_protocol = esptool upload_protocol = esptool
build_flags = build_flags =
${esp32_base.build_flags} ${esp32s3_base.build_flags}
-D RAK3312 -D RAK3312
-I variants/esp32s3/rak3312 -I variants/esp32s3/rak3312

2
variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
View File

@@ -8,7 +8,7 @@ upload_protocol = esptool
board_build.partitions = default_8MB.csv board_build.partitions = default_8MB.csv
build_flags = build_flags =
${esp32_base.build_flags} ${esp32s3_base.build_flags}
-D RAK3312 -D RAK3312
-D RAK_WISMESH_TAP_V2 -D RAK_WISMESH_TAP_V2
-I variants/esp32s3/rak_wismesh_tap_v2 -I variants/esp32s3/rak_wismesh_tap_v2

2
variants/esp32s3/seeed-sensecap-indicator/platformio.ini
View File

@@ -9,7 +9,7 @@ board_check = true
board_build.partitions = partition-table-8MB.csv board_build.partitions = partition-table-8MB.csv
upload_protocol = esptool upload_protocol = esptool
build_flags = ${esp32_base.build_flags} build_flags = ${esp32s3_base.build_flags}
-Ivariants/esp32s3/seeed-sensecap-indicator -Ivariants/esp32s3/seeed-sensecap-indicator
-DSENSECAP_INDICATOR -DSENSECAP_INDICATOR
-DCONFIG_ARDUHAL_LOG_COLORS -DCONFIG_ARDUHAL_LOG_COLORS

2
variants/esp32s3/t-deck-pro/platformio.ini
View File

@@ -5,7 +5,7 @@ board_check = true
upload_protocol = esptool upload_protocol = esptool
build_flags = build_flags =
${esp32_base.build_flags} -I variants/esp32s3/t-deck-pro ${esp32s3_base.build_flags} -I variants/esp32s3/t-deck-pro
-D T_DECK_PRO -D T_DECK_PRO
-D USE_EINK -D USE_EINK
-D EINK_DISPLAY_MODEL=GxEPD2_310_GDEQ031T10 -D EINK_DISPLAY_MODEL=GxEPD2_310_GDEQ031T10

2
variants/esp32s3/t-watch-s3/platformio.ini
View File

@@ -6,7 +6,7 @@ board_check = true
board_build.partitions = default_16MB.csv board_build.partitions = default_16MB.csv
upload_protocol = esptool upload_protocol = esptool
build_flags = ${esp32_base.build_flags} build_flags = ${esp32s3_base.build_flags}
-DT_WATCH_S3 -DT_WATCH_S3
-Ivariants/esp32s3/t-watch-s3 -Ivariants/esp32s3/t-watch-s3
-DPCF8563_RTC=0x51 -DPCF8563_RTC=0x51

4
variants/esp32s3/tlora_t3s3_epaper/platformio.ini
View File

@@ -5,7 +5,7 @@ board_check = true
upload_protocol = esptool upload_protocol = esptool
build_flags = build_flags =
${esp32_base.build_flags} ${esp32s3_base.build_flags}
-D TLORA_T3S3_EPAPER -D TLORA_T3S3_EPAPER
-I variants/esp32s3/tlora_t3s3_epaper -I variants/esp32s3/tlora_t3s3_epaper
-DUSE_EINK -DUSE_EINK
@@ -28,7 +28,7 @@ board = tlora-t3s3-v1
board_check = true board_check = true
upload_protocol = esptool upload_protocol = esptool
build_src_filter = build_src_filter =
${esp32_base.build_src_filter} ${esp32s3_base.build_src_filter}
${inkhud.build_src_filter} ${inkhud.build_src_filter}
build_flags = build_flags =
${esp32s3_base.build_flags} ${esp32s3_base.build_flags}

4
variants/esp32s3/tlora_t3s3_v1/platformio.ini
View File

@@ -5,4 +5,6 @@ board_check = true
upload_protocol = esptool upload_protocol = esptool
build_flags = build_flags =
${esp32_base.build_flags} -D TLORA_T3S3_V1 -I variants/esp32s3/tlora_t3s3_v1 ${esp32s3_base.build_flags}
-D TLORA_T3S3_V1
-I variants/esp32s3/tlora_t3s3_v1