Skip to content

Commit

Permalink
Merge branch 'feature/platform-update' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Mar 22, 2021
2 parents 6ef5062 + 32a2c5d commit 4725bcd
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
4 changes: 4 additions & 0 deletions builder/frameworks/arduino.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
assert isdir(FRAMEWORK_DIR)

env.Append(
CCFLAGS=[
"--less-pedantic"
],

CPPDEFINES=[
"ARDUINO_ARCH_STM8",
("ARDUINO", 10802),
Expand Down
1 change: 1 addition & 0 deletions builder/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ def _ldflags_for_hex(env, ldflags):
"$TARGET"])
)
env.Depends(target_firm, target_elf)
env.Depends(target_firm, "checkprogsize")

AlwaysBuild(env.Alias("nobuild", target_firm))
target_buildprog = env.Alias("buildprog", target_firm, target_firm)
Expand Down
14 changes: 10 additions & 4 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
"toolchain-sdcc": {
"type": "toolchain",
"owner": "platformio",
"version": "~1.30804.10766"
"version": "~1.40100.0"
},
"framework-arduinoststm8": {
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "0.40.181216"
"version": "~0.50.0"
},
"framework-ststm8spl": {
"type": "framework",
Expand All @@ -51,11 +51,17 @@
"owner": "platformio",
"version": "0.230.0"
},
"tool-stm8tools": {
"tool-stm8gal": {
"type": "uploader",
"optional": true,
"owner": "platformio",
"version": "~0.40.181218"
"version": "~1.5.0"
},
"tool-stm8flash": {
"type": "uploader",
"optional": true,
"owner": "platformio",
"version": "~1.1.0"
},
"tool-openocd": {
"type": "uploader",
Expand Down

0 comments on commit 4725bcd

Please sign in to comment.