Skip to content

Commit 2cd35e7

Browse files
authored
Update PlatformIO build script templates (#118)
Adds support for new package with precompiled SDK libraries
1 parent 4e9db61 commit 2cd35e7

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

configs/pio_end.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"ESP32",
33
("F_CPU", "$BOARD_F_CPU"),
44
("ARDUINO", 10812),
5-
("ARDUINO_VARIANT", '\\"%s\\"' % env.BoardConfig().get("build.variant").replace('"', "")),
6-
("ARDUINO_BOARD", '\\"%s\\"' % env.BoardConfig().get("name").replace('"', "")),
7-
"ARDUINO_PARTITION_%s" % basename(env.BoardConfig().get(
5+
("ARDUINO_VARIANT", '\\"%s\\"' % board_config.get("build.variant").replace('"', "")),
6+
("ARDUINO_BOARD", '\\"%s\\"' % board_config.get("name").replace('"', "")),
7+
"ARDUINO_PARTITION_%s" % basename(board_config.get(
88
"build.partitions", "default.csv")).replace(".csv", "").replace("-", "_")
99
]
1010
)

configs/pio_start.txt

+5
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,10 @@ from SCons.Script import DefaultEnvironment
3131
env = DefaultEnvironment()
3232

3333
FRAMEWORK_DIR = env.PioPlatform().get_package_dir("framework-arduinoespressif32")
34+
FRAMEWORK_SDK_DIR = env.PioPlatform().get_package_dir(
35+
"framework-arduinoespressif32-libs"
36+
)
37+
38+
board_config = env.BoardConfig()
3439

3540
env.Append(

tools/config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ AR_TOOLS="$AR_OUT/tools"
4545
AR_PLATFORM_TXT="$AR_OUT/platform.txt"
4646
AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
4747
AR_SDK="$AR_TOOLS/esp32-arduino-libs/$IDF_TARGET"
48-
PIO_SDK="FRAMEWORK_DIR, \"tools\", \"esp32-arduino-libs\", \"$IDF_TARGET\""
48+
PIO_SDK="FRAMEWORK_SDK_DIR, \"$IDF_TARGET\""
4949
TOOLS_JSON_OUT="$AR_TOOLS/esp32-arduino-libs"
5050
IDF_LIBS_DIR="$AR_ROOT/../esp32-arduino-libs"
5151

tools/copy-libs.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ for item; do
404404
done
405405
fi
406406
done
407-
echo " join($PIO_SDK, env.BoardConfig().get(\"build.arduino.memory_type\", (env.BoardConfig().get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")), \"include\")," >> "$AR_PLATFORMIO_PY"
408-
echo " join(FRAMEWORK_DIR, \"cores\", env.BoardConfig().get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
407+
echo " join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")), \"include\")," >> "$AR_PLATFORMIO_PY"
408+
echo " join(FRAMEWORK_DIR, \"cores\", board_config.get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
409409
echo " ]," >> "$AR_PLATFORMIO_PY"
410410
echo "" >> "$AR_PLATFORMIO_PY"
411411

@@ -429,7 +429,7 @@ done
429429
echo " LIBPATH=[" >> "$AR_PLATFORMIO_PY"
430430
echo " join($PIO_SDK, \"lib\")," >> "$AR_PLATFORMIO_PY"
431431
echo " join($PIO_SDK, \"ld\")," >> "$AR_PLATFORMIO_PY"
432-
echo " join($PIO_SDK, env.BoardConfig().get(\"build.arduino.memory_type\", (env.BoardConfig().get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")))" >> "$AR_PLATFORMIO_PY"
432+
echo " join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")))" >> "$AR_PLATFORMIO_PY"
433433
echo " ]," >> "$AR_PLATFORMIO_PY"
434434
echo "" >> "$AR_PLATFORMIO_PY"
435435

0 commit comments

Comments
 (0)