PIO: Cleanup dependency naming (#6090)

2025-02-26 22:33:24 +00:00 · 2025-02-19 19:14:54 -05:00 · 2025-02-19 19:14:54 -05:00 · f1dc1b309a
commit f1dc1b309a
parent 337265a07f
8 changed files with 16 additions and 21 deletions
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@ -4,8 +4,8 @@ platform = platformio/nordicnrf52@^10.7.0
 extends = arduino_base
 platform_packages =
  ; our custom Git version until they merge our PR
-  framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
-  toolchain-gccarmnoneeabi@~1.90301.0
+  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
+  platformio/toolchain-gccarmnoneeabi@~1.90301.0

 build_type = debug
 build_flags =
--- a/arch/stm32/stm32.ini
+++ b/arch/stm32/stm32.ini
@ -1,6 +1,6 @@
 [stm32_base]
 extends = arduino_base
-platform = ststm32
+platform = platformio/ststm32
 platform_packages = platformio/framework-arduinoststm32@^4.20900.0

 build_type = release
--- a/variants/MakePython_nRF52840_eink/platformio.ini
+++ b/variants/MakePython_nRF52840_eink/platformio.ini
@ -5,13 +5,13 @@ board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_eink -D PRIVATE_HW
  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -D PIN_EINK_EN
+  -DEINK_DISPLAY_MODEL=GxEPD2_290_T5D
+  -DEINK_WIDTH=296
+  -DEINK_HEIGHT=128
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_eink>
 lib_deps = 
  ${nrf52840_base.lib_deps}
  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
  zinggjm/GxEPD2@^1.6.2
-  -DEINK_DISPLAY_MODEL=GxEPD2_290_T5D
-  -DEINK_WIDTH=296
-  -DEINK_HEIGHT=128
 debug_tool = jlink
 ;upload_port = /dev/ttyACM4
--- a/variants/icarus/platformio.ini
+++ b/variants/icarus/platformio.ini
@ -6,7 +6,7 @@ board_check = true
 board_build.mcu = esp32s3
 upload_protocol = esptool
 upload_speed = 921600
-platform_packages = framework-arduinoespressif32@https://github.com/PowerFeather/powerfeather-meshtastic-arduino-lib/releases/download/2.0.16a/esp32-2.0.16.zip
+platform_packages = platformio/framework-arduinoespressif32@https://github.com/PowerFeather/powerfeather-meshtastic-arduino-lib/releases/download/2.0.16a/esp32-2.0.16.zip
 lib_deps =
  ${esp32s3_base.lib_deps}
 build_unflags =
--- a/variants/my_esp32s3_diy_eink/platformio.ini
+++ b/variants/my_esp32s3_diy_eink/platformio.ini
@ -9,7 +9,7 @@ upload_protocol = esptool
 ;upload_port = /dev/ttyACM1
 upload_speed = 921600
 platform_packages =
-  tool-esptoolpy@^1.40801.0
+  platformio/tool-esptoolpy@^1.40801.0
 lib_deps =
  ${esp32_base.lib_deps}
  zinggjm/GxEPD2@^1.6.2
--- a/variants/my_esp32s3_diy_oled/platformio.ini
+++ b/variants/my_esp32s3_diy_oled/platformio.ini
@ -9,7 +9,7 @@ upload_protocol = esptool
 ;upload_port = /dev/ttyACM0
 upload_speed = 921600
 platform_packages =
-  tool-esptoolpy@^1.40801.0
+  platformio/tool-esptoolpy@^1.40801.0
 lib_deps =
  ${esp32_base.lib_deps}
  adafruit/Adafruit NeoPixel @ ^1.12.0
--- a/variants/trackerd/platformio.ini
+++ b/variants/trackerd/platformio.ini
@ -1,13 +1,8 @@
 [env:trackerd]
 extends = esp32_base
-;platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
-platform = espressif32
 board = pico32
 board_build.f_flash = 80000000L

 build_flags = 
  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/trackerd -D BSFILE=\"boards/dragino_lbt2.h\"
 ;board_build.partitions = no_ota.csv
-;platform_packages =
-;   platformio/framework-arduinoespressif32@3
-;platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.1-RC1