Skip to content
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.

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

Test frwname #27

Merged
merged 75 commits into from
Sep 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
4ab9287
add solo1 and ITEAD frameworks
Jason2866 Aug 18, 2022
4e7fc46
fix JSON
Jason2866 Aug 18, 2022
bc5de38
Tasmota frameworks are not optional
Jason2866 Aug 18, 2022
61a8e71
Create arduino-itead.py
Jason2866 Aug 18, 2022
79a34ae
Create arduino-solo1.py
Jason2866 Aug 18, 2022
7a257c5
specific arduino builder for the variants
Jason2866 Aug 18, 2022
4983e2d
Update arduino-solo1.py
Jason2866 Aug 18, 2022
f65a2fd
Update arduino.py
Jason2866 Aug 18, 2022
3eca09e
Update arduino-itead.py
Jason2866 Aug 18, 2022
54009eb
different arduino frameworks !!
Jason2866 Aug 18, 2022
c42d2a7
we need both arduino entrys to select solo1
Jason2866 Aug 18, 2022
f6adf3e
use variant to check for solo1
Jason2866 Aug 18, 2022
6ea7bda
Update platform.json
Jason2866 Aug 18, 2022
d6c7c38
not for solo1
Jason2866 Aug 18, 2022
c9d4515
Update arduino.py
Jason2866 Aug 18, 2022
ada024d
Update arduino-solo1.py
Jason2866 Aug 18, 2022
054c623
Update arduino.py
Jason2866 Aug 18, 2022
9435b6d
Update arduino-solo1.py
Jason2866 Aug 18, 2022
c993773
Update platform.py
Jason2866 Aug 18, 2022
ce557c0
Update platform.py
Jason2866 Aug 18, 2022
74845d3
Update platform.py
Jason2866 Aug 18, 2022
6e55995
Update arduino.py
Jason2866 Aug 18, 2022
52cf99b
Update arduino.py
Jason2866 Aug 18, 2022
cadfe17
Update arduino-solo1.py
Jason2866 Aug 18, 2022
836045f
Update arduino-solo1.py
Jason2866 Aug 18, 2022
60177ea
Update arduino-solo1.py
Jason2866 Aug 18, 2022
211f1ae
Update arduino-solo1.py
Jason2866 Aug 18, 2022
53ef731
Update platform.py
Jason2866 Aug 18, 2022
65ae3f1
Update platform.json
Jason2866 Aug 19, 2022
19b5a11
Update platform.json
Jason2866 Aug 19, 2022
e1976c2
Update platform.json
Jason2866 Aug 19, 2022
c0f2ab8
Update arduino-solo1.py
Jason2866 Aug 19, 2022
4b570b3
Update arduino-solo1.py
Jason2866 Aug 19, 2022
28ab67f
Delete arduino.py
Jason2866 Aug 19, 2022
34f81d2
Delete arduino-itead.py
Jason2866 Aug 19, 2022
6dfbd2a
Update platform.py
Jason2866 Aug 19, 2022
8811c26
Update platform.json
Jason2866 Aug 19, 2022
8d3d991
Update arduino-solo1.py
Jason2866 Aug 19, 2022
29e87b4
Update platform.json
Jason2866 Aug 19, 2022
3a7bed8
Update arduino-solo1.py
Jason2866 Aug 19, 2022
5d02a76
Update arduino-solo1.py
Jason2866 Aug 19, 2022
c0fa57e
Update platform.json
Jason2866 Aug 19, 2022
61680ce
Update arduino-solo1.py
Jason2866 Aug 19, 2022
71e0b32
Update arduino-solo1.py
Jason2866 Aug 19, 2022
4ab58df
Update arduino-solo1.py
Jason2866 Aug 19, 2022
d08a063
Update platform.py
Jason2866 Sep 22, 2022
a371c5e
Update main.py
Jason2866 Sep 22, 2022
58c2ab0
Update arduino-solo1.py
Jason2866 Sep 22, 2022
0f205c7
Update arduino-solo1.py
Jason2866 Sep 22, 2022
b91b359
Update arduino-solo1.py
Jason2866 Sep 22, 2022
4969d5d
Update arduino-solo1.py
Jason2866 Sep 22, 2022
fd57240
Update espidf.py
Jason2866 Sep 22, 2022
97f2013
Update examples.yml
Jason2866 Sep 22, 2022
f29c685
Update platform.json
Jason2866 Sep 22, 2022
79fce53
Update espidf.py
Jason2866 Sep 22, 2022
535e75d
Update ulp.py
Jason2866 Sep 22, 2022
c2407f0
Update main.py
Jason2866 Sep 22, 2022
4173df6
Update platform.py
Jason2866 Sep 22, 2022
0224560
Create arduino.py
Jason2866 Sep 22, 2022
789f4cc
Update platform.json
Jason2866 Sep 22, 2022
09e6597
Update platform.json
Jason2866 Sep 22, 2022
c8747e6
Update platform.json
Jason2866 Sep 22, 2022
d3732ea
Update arduino-solo1.py
Jason2866 Sep 22, 2022
ecdbda9
Update platform.json
Jason2866 Sep 22, 2022
ac0095d
Update platform.json
Jason2866 Sep 22, 2022
7ab0f33
Update examples.yml
Jason2866 Sep 22, 2022
4475f99
Update arduino-solo1.py
Jason2866 Sep 22, 2022
0d5ebe2
Update platform.json
Jason2866 Sep 23, 2022
b58a447
Update platform.json
Jason2866 Sep 23, 2022
ced161f
Update arduino.py
Jason2866 Sep 23, 2022
0edf8be
Delete arduino-solo1.py
Jason2866 Sep 23, 2022
4370a06
Update arduino.py
Jason2866 Sep 23, 2022
b18ec13
Update platform.json
Jason2866 Sep 23, 2022
30e05f8
Update examples.yml
Jason2866 Sep 23, 2022
278dab2
Merge branch 'Tasmota/onePlatform' into test_frwname
Jason2866 Sep 23, 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
17 changes: 15 additions & 2 deletions builder/frameworks/arduino.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,24 @@

env = DefaultEnvironment()
board = env.BoardConfig()
build_core = board.get("build.core", "").lower()
extra_flags = board.get("build.extra_flags", "")
build_flags = env.GetProjectOption("build_flags")

SConscript("_embed_files.py", exports="env")

if "espidf" not in env.subst("$PIOFRAMEWORK"):
if "arduino" in env.subst("$PIOFRAMEWORK") and "-DCORE32SOLO1" in extra_flags and "espidf" not in env.subst("$PIOFRAMEWORK"):
SConscript(
join(DefaultEnvironment().PioPlatform().get_package_dir(
"framework-arduino-solo1"), "tools", "platformio-build.py"))
env["INTEGRATION_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")})

elif "arduino" in env.subst("$PIOFRAMEWORK") and "-DFRAMEWORK-ARDUINO-ITEAD" in build_flags and "espidf" not in env.subst("$PIOFRAMEWORK"):
SConscript(
join(DefaultEnvironment().PioPlatform().get_package_dir(
"framework-arduino-ITEAD"), "tools", "platformio-build.py"))
env["INTEGRATION_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")})

elif "arduino" in env.subst("$PIOFRAMEWORK") and "espidf" not in env.subst("$PIOFRAMEWORK"):
SConscript(
join(DefaultEnvironment().PioPlatform().get_package_dir(
"framework-arduinoespressif32"), "tools", "platformio-build.py"))
Expand Down
29 changes: 26 additions & 3 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"version": "2.0.5",
"frameworks": {
"arduino": {
"package": "framework-arduinoespressif32",
"script": "builder/frameworks/arduino.py"
},
"espidf": {
Expand All @@ -35,9 +34,21 @@
"packages": {
"framework-arduinoespressif32": {
"type": "framework",
"optional": true,
"optional": false,
"owner": "tasmota",
"version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.5/framework-arduinoespressif32.zip"
},
"framework-arduino-solo1": {
"type": "framework",
"optional": false,
"owner": "tasmota",
"version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1012/framework-arduinoespressif32-solo1-IDF_Arduino-d772747b2.zip"
},
"framework-arduino-ITEAD": {
"type": "framework",
"optional": false,
"owner": "tasmota",
"version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1011/framework-arduinoespressif32-ITEAD-IDF_Arduino-d772747b2.zip"
},
"framework-espidf": {
"type": "framework",
Expand Down Expand Up @@ -75,11 +86,22 @@
"owner": "jason2866",
"version": "https://github.com/Jason2866/crosstool-NG/releases/download/v8.4.0/esp32ulp-elf-2.35_20220830-linux_x86_64.zip"
},
"framework-arduino-mbcwb": {
"type": "framework",
"optional": true,
"owner": "meteca",
"version": ">=2.1.1"
},
"tool-esptoolpy": {
"type": "uploader",
"owner": "tasmota",
"version": "https://github.com/tasmota/esptool/releases/download/v4.3/esptool-4.3.zip"
},
"tool-mbctool": {
"optional": true,
"owner": "meteca",
"version": ">=2.0.0"
},
"tool-openocd-esp32": {
"type": "debugger",
"optional": true,
Expand All @@ -105,7 +127,7 @@
"tool-cmake": {
"optional": true,
"owner": "platformio",
"version": "~3.21.0"
"version": "~3.16.0"
},
"tool-ninja": {
"optional": true,
Expand All @@ -124,3 +146,4 @@
}
}
}