Skip to content

Integrate upstream updates #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 58 commits into from
Jun 16, 2022
Merged

Integrate upstream updates #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
563fab9
Merge pull request #1 from platformio/develop
Jason2866 Apr 11, 2021
5950479
Merge branch 'platformio:develop' into develop
Jason2866 Dec 27, 2021
efa7e17
Update featheresp32-s2.json
Jason2866 Apr 18, 2022
405f3b4
Update main.py
Jason2866 Apr 18, 2022
3797869
Update platform.json
Jason2866 Apr 18, 2022
e5c4651
Update platform.py
Jason2866 Apr 18, 2022
dbc1471
Integrate upstream develop changes
Jason2866 Apr 18, 2022
d89f55d
Update platform.json
Jason2866 Apr 18, 2022
8692362
Update platform.py
Jason2866 Apr 18, 2022
1555a02
Integrate upstream 2
Jason2866 Apr 18, 2022
970a4f2
Update esp32-s2-franzininho.json
Jason2866 Apr 21, 2022
caa76b2
Update _embed_files.py
Jason2866 Apr 21, 2022
d60119e
Update main.py
Jason2866 Apr 21, 2022
83db918
Update platform.json
Jason2866 Apr 21, 2022
71378c8
Update platform.py
Jason2866 Apr 21, 2022
81dc9d6
updates 21.04.2022 (#15)
Jason2866 Apr 21, 2022
29ee84a
Tasmota/dev apple
Jason2866 Apr 22, 2022
4a11a4b
Update platform.json
Jason2866 Apr 22, 2022
ad22e19
Update platform.py
Jason2866 Apr 22, 2022
9499e9a
Merge branch 'Tasmota/develop' into Tasmota/dev_apple
Jason2866 Apr 22, 2022
06151e2
Update README.md
Jason2866 Apr 22, 2022
5e4bf93
Update OCD Apple Silicon to build from 20220424
Jason2866 Apr 24, 2022
b09761c
esptool.py v3.3 now in registry
Jason2866 Apr 26, 2022
97148cc
Add CMSIS-DAP as available debug probe
Jason2866 Apr 26, 2022
a831608
Use GetBuildType for detecting debug mode
Jason2866 Apr 26, 2022
a226e7d
rm Python2 add C3 exception decoder
Jason2866 Apr 26, 2022
2e9045e
remove fix firmware address 0x10000
Jason2866 Apr 30, 2022
c20949e
Apple arm toolchains for IDF
Jason2866 May 3, 2022
2791128
Arduino framework based on IDF4.4.1
Jason2866 May 4, 2022
fee4322
Use Tasmota release versions
Jason2866 May 5, 2022
b0edbde
Compile IDF bootloader with optimizations by default
Jason2866 May 6, 2022
87e6420
Update examples.yml
Jason2866 May 6, 2022
b070465
esptool.py v3.3.1
Jason2866 May 15, 2022
6ff8331
Update platform.py
Jason2866 May 16, 2022
f795b23
add `_get_board_boot_mode`
Jason2866 May 16, 2022
2447d78
esptool.py v4.0.1
Jason2866 May 25, 2022
46869e3
Improve support for assembly programming
Jason2866 May 31, 2022
87a7913
Add compatibility with PIO Core 6.0
Jason2866 May 31, 2022
2bb0023
Update platform.py
Jason2866 May 31, 2022
f09dfd7
Update examples.yml
Jason2866 May 31, 2022
62fb7b9
Explicitly exit from build process when there is default IDF component
Jason2866 May 31, 2022
b0ed550
revert Use empty ASM and CXX flags if config empty
Jason2866 May 31, 2022
dc222e0
Update main.py
Jason2866 May 31, 2022
7ce2557
Update platform.py
Jason2866 May 31, 2022
07139bd
"platformio": "^6"
Jason2866 May 31, 2022
5c75ac9
Update _bare.py
Jason2866 May 31, 2022
6b68e75
Update platform.py
Jason2866 May 31, 2022
b9bfcc0
Delete compat.py
Jason2866 May 31, 2022
452fe13
Platformio core 6.0.2
Jason2866 Jun 1, 2022
4934c12
Add misso
Jason2866 Jun 4, 2022
896fee3
Esptool v4.1
Jason2866 Jun 10, 2022
8bfa2c3
really Esptool v4.1
Jason2866 Jun 10, 2022
debd76d
Boards update
Jason2866 Jun 10, 2022
51a7f05
add framework espidf to all boards
Jason2866 Jun 10, 2022
d37c542
Update espidf.py
Jason2866 Jun 14, 2022
73abc81
Update platform.py
Jason2866 Jun 15, 2022
b2ec5ba
Update platform.py
Jason2866 Jun 16, 2022
921ced2
Merge branch 'Tasmota/203' into Tasmota/dev_apple
Jason2866 Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions boards/adafruit_feather_esp32_v2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@
"ldscript": "esp32_out.ld"
},
"core": "esp32",
"extra_flags": "-DADAFRUIT_FEATHER_ESP32_V2 -DBOARD_HAS_PSRAM",
"extra_flags": [
"-DARDUINO_ADAFRUIT_FEATHER_ESP32_V2",
"-DBOARD_HAS_PSRAM",
"-mfix-esp32-psram-cache-issue",
"-mfix-esp32-psram-cache-strategy=memw"
],
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
"f_flash": "40000000L",
"flash_mode": "dio",
"mcu": "esp32",
"variant": "adafruit_feather_esp32_v2"
},
Expand All @@ -30,7 +35,7 @@
"maximum_ram_size": 327680,
"maximum_size": 8388608,
"require_upload_port": true,
"speed": 921600
"speed": 460800
},
"url": "https://www.adafruit.com/product/5400",
"vendor": "Adafruit"
Expand Down
62 changes: 62 additions & 0 deletions boards/adafruit_feather_esp32s2_tft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"build": {
"arduino": {
"ldscript": "esp32s2_out.ld"
},
"core": "esp32",
"extra_flags": [
"-DARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT",
"-DBOARD_HAS_PSRAM",
"-DARDUINO_USB_CDC_ON_BOOT=1"
],
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
"hwids": [
[
"0x239A",
"0x810F"
],
[
"0x239A",
"0x010F"
],
[
"0x239A",
"0x8110"
]
],
"mcu": "esp32s2",
"variant": "adafruit_feather_esp32s2_tft"
},
"connectivity": [
"wifi"
],
"debug": {
"openocd_target": "esp32s2.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Adafruit Feather ESP32-S2 TFT",
"upload": {
"arduino": {
"flash_extra_images": [
[
"0x2d0000",
"variants/adafruit_feather_esp32s2_tft/tinyuf2.bin"
]
]
},
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"use_1200bps_touch": true,
"wait_for_upload_port": true,
"require_upload_port": true,
"speed": 460800
},
"url": "https://www.adafruit.com/product/5300",
"vendor": "Adafruit"
}
63 changes: 63 additions & 0 deletions boards/adafruit_feather_esp32s3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"build": {
"arduino":{
"ldscript": "esp32s3_out.ld"
},
"core": "esp32",
"extra_flags": [
"-DARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM",
"-DARDUINO_USB_CDC_ON_BOOT=1",
"-DARDUINO_RUNNING_CORE=1",
"-DARDUINO_EVENT_RUNNING_CORE=1"
],
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
"hwids": [
[
"0x239A",
"0x8113"
],
[
"0x239A",
"0x0113"
],
[
"0x239A",
"0x8114"
]
],
"mcu": "esp32s3",
"variant": "adafruit_feather_esp32s3_nopsram"
},
"connectivity": [
"wifi"
],
"debug": {
"openocd_target": "esp32s3.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Adafruit Feather ESP32-S3 No PSRAM",
"upload": {
"arduino": {
"flash_extra_images": [
[
"0x410000",
"variants/adafruit_feather_esp32s3_nopsram/tinyuf2.bin"
]
]
},
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"use_1200bps_touch": true,
"wait_for_upload_port": true,
"require_upload_port": true,
"speed": 460800
},
"url": "https://www.adafruit.com/product/5323",
"vendor": "Adafruit"
}
6 changes: 3 additions & 3 deletions boards/adafruit_magtag29_esp32s2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
"hwids": [
[
"0x239A",
"0x80DF"
"0x80E5"
],
[
"0x239A",
"0x00DF"
"0x00E5"
],
[
"0x239A",
"0x80E0"
"0x80E6"
]
],
"mcu": "esp32s2",
Expand Down
42 changes: 42 additions & 0 deletions boards/adafruit_qtpy_esp32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"build": {
"arduino":{
"ldscript": "esp32_out.ld"
},
"core": "esp32",
"extra_flags": [
"-DARDUINO_ADAFRUIT_QTPY_ESP32_PICO",
"-DBOARD_HAS_PSRAM",
"-mfix-esp32-psram-cache-issue",
"-mfix-esp32-psram-cache-strategy=memw"
],
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
"mcu": "esp32",
"variant": "adafruit_qtpy_esp32"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"debug": {
"openocd_board": "esp-wroom-32.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Adafruit QT Py ESP32",
"upload": {
"flash_size": "8MB",
"maximum_ram_size": 327680,
"maximum_size": 8388608,
"require_upload_port": true,
"speed": 460800
},
"url": "https://www.adafruit.com/product/5395",
"vendor": "Adafruit"
}
44 changes: 44 additions & 0 deletions boards/adafruit_qtpy_esp32c3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"build": {
"arduino":{
"ldscript": "esp32c3_out.ld"
},
"core": "esp32",
"extra_flags": [
"-DARDUINO_ADAFRUIT_QTPY_ESP32C3",
"-DARDUINO_USB_MODE=1",
"-DARDUINO_USB_CDC_ON_BOOT=1"
],
"f_cpu": "160000000L",
"f_flash": "80000000L",
"flash_mode": "dout",
"hwids": [
[
"0X303A",
"0x1001"
]
],
"mcu": "esp32c3",
"variant": "adafruit_qtpy_esp32c3"
},
"connectivity": [
"wifi"
],
"debug": {
"openocd_target": "esp32c3.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Adafruit QT Py ESP32-C3",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"require_upload_port": true,
"speed": 460800
},
"url": "https://www.adafruit.com/product/5405",
"vendor": "Adafruit"
}
62 changes: 62 additions & 0 deletions boards/adafruit_qtpy_esp32s2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"build": {
"arduino": {
"ldscript": "esp32s2_out.ld"
},
"core": "esp32",
"extra_flags": [
"-DARDUINO_ADAFRUIT_QTPY_ESP32S2",
"-DBOARD_HAS_PSRAM",
"-DARDUINO_USB_CDC_ON_BOOT=1"
],
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
"hwids": [
[
"0x239A",
"0x8111"
],
[
"0x239A",
"0x0111"
],
[
"0x239A",
"0x8112"
]
],
"mcu": "esp32s2",
"variant": "adafruit_qtpy_esp32s2"
},
"connectivity": [
"wifi"
],
"debug": {
"openocd_target": "esp32s2.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Adafruit QT Py ESP32-S2",
"upload": {
"arduino": {
"flash_extra_images": [
[
"0x2d0000",
"variants/adafruit_qtpy_esp32s2/tinyuf2.bin"
]
]
},
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"use_1200bps_touch": true,
"wait_for_upload_port": true,
"require_upload_port": true,
"speed": 460800
},
"url": "https://www.adafruit.com/product/5325",
"vendor": "Adafruit"
}
63 changes: 63 additions & 0 deletions boards/adafruit_qtpy_esp32s3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"build": {
"arduino":{
"ldscript": "esp32s3_out.ld"
},
"core": "esp32",
"extra_flags": [
"-DARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM",
"-DARDUINO_USB_CDC_ON_BOOT=1",
"-DARDUINO_RUNNING_CORE=1",
"-DARDUINO_EVENT_RUNNING_CORE=1"
],
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
"hwids": [
[
"0x239A",
"0x8119"
],
[
"0x239A",
"0x0119"
],
[
"0x239A",
"0x811A"
]
],
"mcu": "esp32s3",
"variant": "adafruit_qtpy_esp32s3_nopsram"
},
"connectivity": [
"wifi"
],
"debug": {
"openocd_target": "esp32s3.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Adafruit QT Py ESP32-S3 No PSRAM",
"upload": {
"arduino": {
"flash_extra_images": [
[
"0x410000",
"variants/adafruit_qtpy_esp32s3_nopsram/tinyuf2.bin"
]
]
},
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"use_1200bps_touch": true,
"wait_for_upload_port": true,
"require_upload_port": true,
"speed": 460800
},
"url": "https://www.adafruit.com/product/5426",
"vendor": "Adafruit"
}
Loading