Skip to content

Commit a174a16

Browse files
authored
Merge pull request #24 from tasmota/Tasmota/205
Use custom arm toolchains
2 parents 3965e51 + 0606c33 commit a174a16

File tree

25 files changed

+36
-1183
lines changed

25 files changed

+36
-1183
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Espressif Systems is a privately held fabless semiconductor company. They provid
1919

2020
```ini
2121
[env:stable]
22-
platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4.1/platform-espressif32-2.0.4.1.zip
22+
platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5/platform-espressif32-2.0.5.zip
2323
board = ...
2424
...
2525
```

boards/esp32s3camlcd.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
],
1414
"f_cpu": "240000000L",
1515
"f_flash": "80000000L",
16-
"flash_mode": "qio",
16+
"flash_mode": "dout",
1717
"hwids": [
1818
[
1919
"0X303A",
@@ -36,7 +36,7 @@
3636
],
3737
"name": "ESP32S3 CAM LCD",
3838
"upload": {
39-
"flash_size": "4MB",
39+
"flash_size": "16MB",
4040
"maximum_ram_size": 327680,
4141
"maximum_size": 16777216,
4242
"require_upload_port": true,

builder/frameworks/espidf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,6 +1050,7 @@ def _get_installed_pip_packages():
10501050
"future": ">=0.15.2",
10511051
"pyparsing": ">=2.0.3,<2.4.0",
10521052
"kconfiglib": "==13.7.1",
1053+
"idf-component-manager": "~=1.0"
10531054
}
10541055

10551056
installed_packages = _get_installed_pip_packages()

builder/main.py

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -328,47 +328,6 @@ def __fetch_fs_size(target, source, env):
328328
"Calculate program size",
329329
)
330330

331-
# Arduino core v2.0.4 contains updated bootloader images that have innacurate default
332-
# headers. This results in bootloops if firmware is flashed via OpenOCD (e.g. debugging
333-
# or uploading via debug tools). For this reason, before uploading or debugging we need
334-
# to adjust the bootloader binary according to --flash-size and --flash-mode arguments.
335-
# Note: This behavior doesn't occur if uploading is done via esptoolpy, as esptoolpy
336-
# overrides the binary image headers before flashing.
337-
bootloader_patch_required = bool(
338-
env.get("PIOFRAMEWORK", []) == ["arduino"]
339-
and (
340-
"debug" in env.GetBuildType()
341-
or env.subst("$UPLOAD_PROTOCOL") in board.get("debug.tools", {})
342-
)
343-
)
344-
345-
if bootloader_patch_required:
346-
result = []
347-
for offset, image in env.get("FLASH_EXTRA_IMAGES", []):
348-
# 0x1000 for ESP32/S2, 0x0 for others
349-
default_bootloader_offsets = ("0x0", "0x0000", "0x1000")
350-
if offset in default_bootloader_offsets:
351-
original_bootloader_path = env.subst(image)
352-
image = join(env.subst("$BUILD_DIR"), "patched_bootloader.bin")
353-
env.AddPreAction(
354-
target_elf,
355-
env.VerboseAction(" ".join([
356-
'"$PYTHONEXE"',
357-
join(platform.get_package_dir("tool-esptoolpy") or "", "esptool.py"),
358-
"--chip", mcu, "merge_bin",
359-
"-o", '"%s"' % image,
360-
"--flash_mode", _get_board_flash_mode(env),
361-
"--flash_freq", _get_board_f_flash(env),
362-
"--flash_size", board.get("upload.flash_size", "4MB"),
363-
"--target-offset", offset,
364-
offset, '"%s"' % original_bootloader_path
365-
]), "Updating bootloader headers")
366-
)
367-
368-
result.append((offset, image))
369-
370-
env.Replace(FLASH_EXTRA_IMAGES=result)
371-
372331
#
373332
# Target: Upload firmware or FS image
374333
#
@@ -554,13 +513,6 @@ def __fetch_fs_size(target, source, env):
554513
print("Warning! '-Wl,-T' option for specifying linker scripts is deprecated. "
555514
"Please use 'board_build.ldscript' option in your 'platformio.ini' file.")
556515

557-
#
558-
# A temporary workaround to propagate additional data to the debug configuration routine
559-
#
560-
561-
Import("projenv")
562-
projenv["INTEGRATION_EXTRA_DATA"] = env.get("INTEGRATION_EXTRA_DATA")
563-
564516
#
565517
# Default targets
566518
#

examples/arduino-blink/.travis.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

examples/arduino-briki-internal-libs/.travis.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

examples/arduino-wifiscan/.travis.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

examples/espidf-arduino-blink/.travis.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

examples/espidf-arduino-blink/platformio.ini

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,20 @@
1010
[env]
1111
platform = espressif32
1212
framework = arduino, espidf
13-
build_flags =
14-
-D CONFIG_BLINK_GPIO=2
1513
monitor_speed = 115200
1614

1715
[env:esp32dev]
1816
board = esp32dev
17+
build_flags = -DCONFIG_BLINK_GPIO=2
1918

20-
[env:espea32]
21-
board = espea32
19+
[env:esp32-s2]
20+
board = esp32-s2-saola-1
21+
build_flags = -DCONFIG_BLINK_GPIO=18
2222

23-
[env:esp320]
24-
board = esp320
23+
[env:esp32-s3]
24+
board = esp32-s3-devkitc-1
25+
build_flags = -DCONFIG_BLINK_GPIO=48
26+
27+
[env:esp32-c3]
28+
board = esp32-c3-devkitm-1
29+
build_flags = -DCONFIG_BLINK_GPIO=8

0 commit comments

Comments
 (0)