diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py index a35c257..b48a22e 100644 --- a/builder/frameworks/arduino.py +++ b/builder/frameworks/arduino.py @@ -34,7 +34,7 @@ assert isdir(FRAMEWORK_DIR) env.Prepend( CPPDEFINES=[ - "ARDUINO=10600", + ("ARDUINO", 10610), "ARDUINO_ARCH_ESP32" ], diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 7f0934c..44ab914 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -20,13 +20,11 @@ Espressif IoT Development Framework for ESP32 MCU https://github.com/espressif/esp-idf """ -import sys -from os import listdir, makedirs +from os import listdir from os.path import isdir, join from SCons.Script import DefaultEnvironment -from platformio.util import exec_command env = DefaultEnvironment() platform = env.PioPlatform() @@ -41,7 +39,7 @@ def build_espidf_bootloader(): envsafe = env.Clone() framework_dir = env.subst("$ESPIDF_DIR") envsafe.Replace( - CPPDEFINES=["ESP_PLATFORM", "BOOTLOADER_BUILD=1"], + CPPDEFINES=["ESP_PLATFORM", ("BOOTLOADER_BUILD", 1)], LIBPATH=[ join(framework_dir, "components", "esp32", "ld"), diff --git a/builder/main.py b/builder/main.py index 3c95e4c..7ba86e8 100644 --- a/builder/main.py +++ b/builder/main.py @@ -67,9 +67,9 @@ env.Replace( CPPDEFINES=[ "ESP32", "ESP_PLATFORM", - "F_CPU=$BOARD_F_CPU", + ("F_CPU", "$BOARD_F_CPU"), "HAVE_CONFIG_H", - "MBEDTLS_CONFIG_FILE=\\\"mbedtls/esp_config.h\\\"" + ("MBEDTLS_CONFIG_FILE", '\\"mbedtls/esp_config.h\\"') ], LINKFLAGS=[ diff --git a/platform.json b/platform.json index 42032d6..c281f35 100644 --- a/platform.json +++ b/platform.json @@ -6,14 +6,13 @@ "homepage": "http://platformio.org/platforms/espressif32", "license": "Apache-2.0", "engines": { - "platformio": "^3.0.0", - "scons": ">=2.3.0,<2.6.0" + "platformio": "^3.0.0" }, "repository": { "type": "git", "url": "https://github.com/platformio/platform-espressif32.git" }, - "version": "0.1.2", + "version": "0.2.0", "packageRepositories": [ "https://dl.bintray.com/platformio/dl-packages/manifest.json", "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",