pioduino/platform-espressif32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v0.5.0'

Browse Source
This commit is contained in:
Ivan Kravets
2017-01-27 21:36:49 +02:00
parent 9357ef8bf1 105d9141d3
commit 3d7d4f31d9
14 changed files with 108 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/esp320.json
+1
View File
@@ -15,6 +15,7 @@
],
"name": "Electronic SweetPeas ESP320",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1044464,
"require_upload_port": true,
boards/esp32dev.json
+2 -1
View File
@@ -15,7 +15,8 @@
],
"name": "Espressif ESP32 Dev Module",
"upload": {
"maximum_ram_size": 114688,
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1044464,
"require_upload_port": true,
"resetmethod": "nodemcu",
boards/espea32.json
+1
View File
@@ -15,6 +15,7 @@
],
"name": "April Brother ESPea32",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1044464,
"require_upload_port": true,
boards/hornbill32dev.json
+28
View File
@@ -0,0 +1,28 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DESP32_DEV -DHORNBILL_ESP32_DEV",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"mcu": "esp32",
"variant": "hornbill32dev"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Hornbill ESP32 Dev",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1044464,
"require_upload_port": true,
"resetmethod": "nodemcu",
"speed": 115200,
"wait_for_upload_port": true
},
"url": "https://hackaday.io/project/18997-hornbill",
"vendor": "Hornbill"
}
boards/hornbill32minima.json
+28
View File
@@ -0,0 +1,28 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DESP32_DEV -DHORNBILL_ESP32_MINIMA",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"mcu": "esp32",
"variant": "hornbill32minima"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Hornbill ESP32 Minima",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1044464,
"require_upload_port": true,
"resetmethod": "nodemcu",
"speed": 115200,
"wait_for_upload_port": true
},
"url": "https://hackaday.io/project/18997-hornbill",
"vendor": "Hornbill"
}
boards/lolin32.json
+1
View File
@@ -15,6 +15,7 @@
],
"name": "WEMOS LoLin32",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1044464,
"require_upload_port": true,
boards/nano32.json
+1
View File
@@ -17,6 +17,7 @@
],
"name": "MakerAsia Nano32",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1044464,
"require_upload_port": true,
boards/node32s.json
+1
View File
@@ -15,6 +15,7 @@
],
"name": "Node32s",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 114688,
"maximum_size": 1044464,
"require_upload_port": true,
boards/quantum.json
+1
View File
@@ -15,6 +15,7 @@
],
"name": "Noduino Quantum",
"upload": {
"flash_size": "16MB",
"maximum_ram_size": 294912,
"maximum_size": 1044464,
"require_upload_port": true,
builder/frameworks/arduino.py
+5 -87
View File
@@ -11,7 +11,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
"""
Arduino
@@ -22,91 +21,10 @@ kinds of creative coding, interactive objects, spaces or physical experiences.
http://arduino.cc/en/Reference/HomePage
"""
from os.path import isdir, join
from os.path import join
from SCons.Script import DefaultEnvironment
from SCons.Script import DefaultEnvironment, SConscript
env = DefaultEnvironment()
platform = env.PioPlatform()
FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32")
assert isdir(FRAMEWORK_DIR)
env.Prepend(
CPPDEFINES=[
("ARDUINO", 10610),
"ARDUINO_ARCH_ESP32"
],
CPPPATH=[
join(FRAMEWORK_DIR, "tools", "sdk", "include", "config"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "bt"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "driver"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "esp32"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "ethernet"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "freertos"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "log"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "lwip"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "newlib"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "nvs_flash"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "spi_flash"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "tcpip_adapter"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "vfs"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "expat"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "json"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "mbedtls"),
join(FRAMEWORK_DIR, "tools", "sdk", "include", "nghttp"),
join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core"))
],
LIBPATH=[
join(FRAMEWORK_DIR, "tools", "sdk", "lib"),
join(FRAMEWORK_DIR, "tools", "sdk", "ld"),
],
LIBS=[
"app_update", "bt", "btdm_app", "c", "coexist", "core", "driver",
"esp32", "ethernet", "expat", "freertos", "g", "hal", "json", "log",
"lwip", "m", "mbedtls", "net80211", "newlib", "nghttp", "nvs_flash",
"openssl", "phy", "pp", "rtc", "smartconfig", "spi_flash",
"tcpip_adapter", "ulp", "vfs", "wpa", "wpa2", "wpa_supplicant", "wps",
"xtensa-debug-module"
]
)
env.Append(
LIBSOURCE_DIRS=[
join(FRAMEWORK_DIR, "libraries")
],
LINKFLAGS=[
"-T", "esp32.common.ld",
"-T", "esp32.rom.ld",
"-T", "esp32.peripherals.ld"
]
)
#
# Target: Build Core Library
#
libs = []
if "build.variant" in env.BoardConfig():
env.Append(
CPPPATH=[
join(FRAMEWORK_DIR, "variants",
env.BoardConfig().get("build.variant"))
]
)
libs.append(env.BuildLibrary(
join("$BUILD_DIR", "FrameworkArduinoVariant"),
join(FRAMEWORK_DIR, "variants", env.BoardConfig().get("build.variant"))
))
envsafe = env.Clone()
libs.append(envsafe.BuildLibrary(
join("$BUILD_DIR", "FrameworkArduino"),
join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core"))
))
env.Prepend(LIBS=libs)
SConscript(
join(DefaultEnvironment().PioPlatform().get_package_dir(
"framework-arduinoespressif32"), "tools", "platformio-build.py"))
builder/frameworks/espidf.py
+16 -10
View File
@@ -30,20 +30,19 @@ env = DefaultEnvironment()
platform = env.PioPlatform()
FRAMEWORK_DIR = platform.get_package_dir("framework-espidf")
assert FRAMEWORK_DIR and isdir(FRAMEWORK_DIR)
FRAMEWORK_VERSION = platform.get_package_version(
"framework-espidf")
assert isdir(FRAMEWORK_DIR)
def build_espidf_bootloader():
envsafe = env.Clone()
framework_dir = env.subst("$ESPIDF_DIR")
envsafe.Replace(
CPPDEFINES=["ESP_PLATFORM", ("BOOTLOADER_BUILD", 1)],
LIBPATH=[
join(framework_dir, "components", "esp32", "ld"),
join(framework_dir, "components", "bootloader", "src", "main")
join(FRAMEWORK_DIR, "components", "esp32", "ld"),
join(FRAMEWORK_DIR, "components", "bootloader", "src", "main")
],
LINKFLAGS=[
@@ -64,7 +63,7 @@ def build_espidf_bootloader():
LIBS=[
envsafe.BuildLibrary(
join("$BUILD_DIR", "bootloaderLog"),
join(framework_dir, "components", "log")
join(FRAMEWORK_DIR, "components", "log")
), "gcc"
]
)
@@ -73,10 +72,11 @@ def build_espidf_bootloader():
join("$BUILD_DIR", "bootloader.elf"),
envsafe.CollectBuildFiles(
join("$BUILD_DIR", "bootloader"),
join(framework_dir, "components", "bootloader", "src", "main")
join(FRAMEWORK_DIR, "components", "bootloader", "src", "main")
)
)
env.Prepend(
CPPPATH=[
join("$PROJECTSRC_DIR"),
@@ -128,6 +128,12 @@ env.Append(
"-T", "esp32.rom.ld",
"-T", "esp32.peripherals.ld"
],
UPLOADERFLAGS=[
"0x1000", join("$BUILD_DIR", "bootloader.bin"),
"0x4000", join("$BUILD_DIR", "partitions_table.bin"),
"0x10000"
]
)
#
@@ -135,11 +141,11 @@ env.Append(
#
partition_table = env.Command(
join(env.subst("$BUILD_DIR"), "partitions_table.bin"),
join("$ESPIDF_DIR", "components",
join("$BUILD_DIR", "partitions_table.bin"),
join(FRAMEWORK_DIR, "components",
"partition_table", "partitions_singleapp.csv"),
'"$PYTHONEXE" "%s" -q $SOURCE $TARGET' % join(
"$ESPIDF_DIR", "components", "partition_table", "gen_esp32part.py")
FRAMEWORK_DIR, "components", "partition_table", "gen_esp32part.py")
)
env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", partition_table)
@@ -151,7 +157,7 @@ env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", partition_table)
linker_script = env.Command(
join("$BUILD_DIR", "esp32_out.ld"),
join("$ESPIDF_DIR", "components", "esp32", "ld", "esp32.ld"),
join(FRAMEWORK_DIR, "components", "esp32", "ld", "esp32.ld"),
"$CC -I$PROJECTSRC_DIR -C -P -x c -E $SOURCE -o $TARGET"
)
builder/frameworks/simba.py
+10
View File
@@ -54,5 +54,15 @@ env.Replace(
PLATFORMFW_DIR=env.PioPlatform().get_package_dir("framework-simba")
)
env.Append(
UPLOADERFLAGS=[
"0x1000", join("$PLATFORMFW_DIR", "3pp", "esp32",
"bin", "bootloader.bin"),
"0x4000", join("$PLATFORMFW_DIR", "3pp", "esp32",
"bin", "partitions_singleapp.bin"),
"0x10000"
]
)
SConscript(
[env.subst(join("$PLATFORMFW_DIR", "make", "platformio.sconscript"))])
builder/main.py
+9 -43
View File
@@ -45,7 +45,7 @@ env.Replace(
CFLAGS=["-std=gnu99"],
CCFLAGS=[
"-Og",
"%s" % "-Os" if env.subst("$PIOFRAMEWORK") == "arduino" else "-Og",
"-g3",
"-nostdlib",
"-Wpointer-arith",
@@ -54,14 +54,14 @@ env.Replace(
"-Wno-error=unused-variable",
"-mlongcalls",
"-ffunction-sections",
"-fdata-sections"
"-fdata-sections",
"-fstrict-volatile-bitfields"
],
CXXFLAGS=[
"-fno-rtti",
"-fno-exceptions",
"-std=gnu++11",
"-fstrict-volatile-bitfields"
"-std=gnu++11"
],
CPPDEFINES=[
@@ -80,15 +80,6 @@ env.Replace(
"-Wl,--gc-sections"
],
#
# Packages
#
FRAMEWORK_ARDUINOESP32_DIR=platform.get_package_dir(
"framework-arduinoespressif32"),
ESPIDF_DIR=platform.get_package_dir("framework-espidf"),
FRAMEWORK_SIMBA_DIR=platform.get_package_dir("framework-simba"),
#
# Upload
#
@@ -102,7 +93,8 @@ env.Replace(
"--baud", "$UPLOAD_SPEED",
"write_flash", "-z",
"--flash_mode", "$BOARD_FLASH_MODE",
"--flash_freq", "${__get_board_f_flash(__env__)}"
"--flash_freq", "${__get_board_f_flash(__env__)}",
"--flash_size", env.BoardConfig().get("upload.flash_size", "4MB")
],
UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $SOURCE',
@@ -111,36 +103,8 @@ env.Replace(
PROGSUFFIX=".elf"
)
if env.subst("$PIOFRAMEWORK") == "arduino":
env.Append(
UPLOADERFLAGS=[
"0x1000", '"%s"' % join("$FRAMEWORK_ARDUINOESP32_DIR", "tools",
"sdk", "bin", "bootloader.bin"),
"0x4000", '"%s"' % join("$FRAMEWORK_ARDUINOESP32_DIR", "tools",
"sdk", "bin", "partitions_singleapp.bin"),
"0x10000"
]
)
if env.subst("$PIOFRAMEWORK") == "espidf":
env.Append(
UPLOADERFLAGS=[
"0x1000", join("$BUILD_DIR", "bootloader.bin"),
"0x4000", join("$BUILD_DIR", "partitions_table.bin"),
"0x10000"
]
)
if env.subst("$PIOFRAMEWORK") == "simba":
env.Append(
UPLOADERFLAGS=[
"0x1000", join("$FRAMEWORK_SIMBA_DIR", "3pp", "esp32",
"bin", "bootloader.bin"),
"0x4000", join("$FRAMEWORK_SIMBA_DIR", "3pp", "esp32",
"bin", "partitions_singleapp.bin"),
"0x10000"
]
)
# Clone actual CCFLAGS to ASFLAGS
env.Append(
ASFLAGS=env.get("CCFLAGS", [])[:]
)
@@ -158,6 +122,8 @@ env.Append(
"elf2image",
"--flash_mode", "$BOARD_FLASH_MODE",
"--flash_freq", "${__get_board_f_flash(__env__)}",
"--flash_size",
env.BoardConfig().get("upload.flash_size", "4MB"),
"-o", "$TARGET", "$SOURCES"
]), "Building $TARGET"),
suffix=".bin"
platform.json
+4 -4
View File
@@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-espressif32.git"
},
"version": "0.4.0",
"version": "0.5.0",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -41,12 +41,12 @@
"packages": {
"toolchain-xtensa32": {
"type": "toolchain",
"version": "~1.40805.0"
"version": "~1.50200.0"
},
"framework-arduinoespressif32": {
"type": "framework",
"optional": true,
"version": "~1.0.2"
"version": "~1.1.1"
},
"framework-espidf": {
"type": "framework",
@@ -65,7 +65,7 @@
},
"tool-esptoolpy": {
"type": "uploader",
"version": "~1.0.0"
"version": "~1.20000.0"
}
}
}