jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/espressif/arduino-esp32

Browse Source
This commit is contained in:
me-no-dev 2017-11-28 11:09:44 +01:00
commit 1fae11a7f2
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -39,7 +39,7 @@ script:
- echo -e "travis_fold:start:platformio_test_env_prepare" - echo -e "travis_fold:start:platformio_test_env_prepare"
- pip install -U https://github.com/platformio/platformio/archive/develop.zip - pip install -U https://github.com/platformio/platformio/archive/develop.zip
- platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage - platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage
- sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32_stage/platform.json - sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32/platform.json
- ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif32 - ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif32
- echo -e "travis_fold:end:platformio_test_env_prepare" - echo -e "travis_fold:end:platformio_test_env_prepare"
- echo -e "travis_fold:start:platformio_test" - echo -e "travis_fold:start:platformio_test"

25
tools/platformio-build.py
View File

@ -36,16 +36,19 @@ assert isdir(FRAMEWORK_DIR)
env.Prepend( env.Prepend(
CPPDEFINES=[ CPPDEFINES=[
("ARDUINO", 10610), ("ARDUINO", 10805),
"ARDUINO_ARCH_ESP32" "ARDUINO_ARCH_ESP32",
("ARDUINO_BOARD", '\\"%s\\"' % env.BoardConfig().get("name").replace('"', ""))
], ],
CFLAGS=["-Wno-old-style-declaration"], CFLAGS=["-Wno-old-style-declaration"],
CCFLAGS=[ CCFLAGS=[
"-Wno-error=deprecated-declarations", "-Wno-error=deprecated-declarations",
"-Wno-error=unused-function",
"-Wno-unused-parameter", "-Wno-unused-parameter",
"-Wno-sign-compare" "-Wno-sign-compare",
"-fstack-protector"
], ],
CPPPATH=[ CPPPATH=[
@ -115,7 +118,7 @@ def _get_board_flash_mode(env):
env.Append( env.Append(
__get_board_flash_mode=_get_board_flash_mode, __get_board_flash_mode=_get_board_flash_mode,
LIBSOURCE_DIRS=[ LIBSOURCE_DIRS=[
join(FRAMEWORK_DIR, "libraries") join(FRAMEWORK_DIR, "libraries")
], ],
@ -130,9 +133,9 @@ env.Append(
], ],
UPLOADERFLAGS=[ UPLOADERFLAGS=[
"0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin"), "0x1000", join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin"),
"0x8000", '"%s"' % join("$BUILD_DIR", "partitions.bin"), "0x8000", join("$BUILD_DIR", "partitions.bin"),
"0xe000", '"%s"' % join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"), "0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"),
"0x10000" "0x10000"
] ]
) )
@ -174,11 +177,11 @@ env.Prepend(LIBS=libs)
# #
# Generate partition table # Generate partition table
# #
partition_table = env.Command( partition_table = env.Command(
join("$BUILD_DIR", "partitions.bin"), join("$BUILD_DIR", "partitions.bin"),
join(FRAMEWORK_DIR, "tools", "partitions", "default.csv"), join(FRAMEWORK_DIR, "tools", "partitions",
env.VerboseAction('"$PYTHONEXE" "%s" -q $SOURCE $TARGET' % "%s.csv" % env.BoardConfig().get("build.partitions", "default")),
join(FRAMEWORK_DIR, "tools", "gen_esp32part.py"), env.VerboseAction('"$PYTHONEXE" "%s" -q $SOURCE $TARGET' % join(
FRAMEWORK_DIR, "tools", "gen_esp32part.py"),
"Generating partitions $TARGET")) "Generating partitions $TARGET"))
env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", partition_table) env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", partition_table)