Skip to content

Commit

Permalink
Merge branch 'release/v15.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Feb 28, 2023
2 parents 12a0363 + 72d9ffb commit f51da64
Show file tree
Hide file tree
Showing 16 changed files with 249 additions and 15 deletions.
39 changes: 39 additions & 0 deletions boards/acsip_s76s.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"build": {
"cpu": "cortex-m0plus",
"extra_flags": "-DSTM32L073xx",
"f_cpu": "32000000L",
"framework_extra_flags": {
"arduino": "-D__CORTEX_SC=0 -DCUSTOM_PERIPHERAL_PINS"
},
"mcu": "stm32l073rz",
"product_line": "STM32L073xx",
"variant": "STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T"
},
"debug": {
"jlink_device": "STM32L073RZ",
"openocd_target": "stm32l0",
"svd_path": "STM32L07x.svd"
},
"frameworks": [
"arduino",
"cmsis",
"stm32cube",
"libopencm3"
],
"name": "ACSIP S76S",
"upload": {
"maximum_ram_size": 20480,
"maximum_size": 196608,
"protocol": "stlink",
"protocols": [
"jlink",
"cmsis-dap",
"stlink",
"blackmagic",
"mbed"
]
},
"url": "https://www.acsip.com.tw/index.php?action=products-detail&fid1=19&fid2=&fid3=&id=79",
"vendor": "ACSIP"
}
43 changes: 43 additions & 0 deletions boards/agafia_sg0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"build": {
"arduino": {
"variant_h": "variant_AGAFIA_SG0.h"
},
"core": "stm32",
"cpu": "cortex-m0plus",
"extra_flags": "-DSTM32G0xx -DSTM32G071xx",
"f_cpu": "64000000L",
"framework_extra_flags": {
"arduino": "-D__CORTEX_SC=0"
},
"mcu": "stm32g071rbt6",
"product_line": "STM32G071xx",
"variant": "STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)"
},
"debug": {
"jlink_device": "STM32G071RB",
"openocd_target": "stm32g0x",
"svd_path": "STM32G071.svd"
},
"frameworks": [
"arduino",
"cmsis",
"libopencm3",
"stm32cube"
],
"name": "Sigma IC AGAFIA SG0",
"upload": {
"maximum_ram_size": 36864,
"maximum_size": 131072,
"protocol": "stlink",
"protocols": [
"blackmagic",
"cmsis-dap",
"jlink",
"stlink",
"mbed"
]
},
"url": "https://www.sigmaic.com/store/p7/agafia-sgo.html",
"vendor": "Sigma IC"
}
2 changes: 1 addition & 1 deletion boards/blackpill_f401cc.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"dfu"
]
},
"url": "https://github.com/WeActTC/MiniSTM32F4x1",
"url": "https://www.weact-tc.cn/",
"vendor": "WeAct Studio"
}
3 changes: 3 additions & 0 deletions boards/blackpill_f411ce.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"build": {
"arduino": {
"variant_h": "variant_BLACKPILL_F401Cx.h"
},
"core": "stm32",
"cpu": "cortex-m4",
"extra_flags": "-DSTM32F4xx -DSTM32F411xE",
Expand Down
49 changes: 49 additions & 0 deletions boards/btt_ebb42_v1_1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"build": {
"arduino": {
"variant_h": "variant_EBB42_V1_1.h"
},
"core": "stm32",
"cpu": "cortex-m0plus",
"extra_flags": "-DSTM32G0xx -DSTM32G0B1xx",
"f_cpu": "64000000L",
"framework_extra_flags": {
"arduino": "-D__CORTEX_SC=0 -DARDUINO_EBB42_V1_1"
},
"mcu": "stm32g0b1ret6",
"product_line": "STM32G0B1xx",
"variant": "STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)"
},
"debug": {
"default_tools": [
"stlink"
],
"jlink_device": "STM32G0B1RE",
"onboard_tools": [
"stlink"
],
"openocd_target": "stm32g0x",
"svd_path": "STM32G0B1.svd"
},
"frameworks": [
"arduino",
"stm32cube"
],
"name": "Big Tree Tech EBB42 V1.1",
"upload": {
"maximum_ram_size": 147456,
"maximum_size": 131072,
"protocol": "stlink",
"protocols": [
"blackmagic",
"cmsis-dap",
"dfu",
"jlink",
"serial",
"stlink",
"mbed"
]
},
"url": "https://github.com/bigtreetech/EBB/tree/master/EBB%20CAN%20V1.1%20(STM32G0B1)/EBB42%20CAN%20V1.1",
"vendor": "Big Tree Tech"
}
6 changes: 4 additions & 2 deletions boards/nucleo_f722ze.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"extra_flags": "-DSTM32F722xx",
"f_cpu": "216000000L",
"mcu": "stm32f722zet6",
"product_line": "STM32F722xx"
"product_line": "STM32F722xx",
"variant": "STM32F7xx/F722Z(C-E)T_F732ZET"
},
"connectivity": [
"can"
Expand All @@ -22,13 +23,14 @@
"svd_path": "STM32F722.svd"
},
"frameworks": [
"arduino",
"cmsis",
"stm32cube",
"libopencm3"
],
"name": "ST Nucleo F722ZE",
"upload": {
"maximum_ram_size": 262144,
"maximum_ram_size": 196608,
"maximum_size": 524288,
"protocol": "stlink",
"protocols": [
Expand Down
46 changes: 46 additions & 0 deletions boards/nucleo_g070rb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"build": {
"core": "stm32",
"cpu": "cortex-m0plus",
"extra_flags": "-DSTM32G0xx -DSTM32G070xx",
"f_cpu": "64000000L",
"framework_extra_flags": {
"arduino": "-D__CORTEX_SC=0"
},
"mcu": "stm32g070rbt6",
"product_line": "STM32G070xx",
"variant": "STM32G0xx/G070RBT"
},
"debug": {
"default_tools": [
"stlink"
],
"jlink_device": "STM32G070RB",
"onboard_tools": [
"stlink"
],
"openocd_target": "stm32g0x",
"svd_path": "STM32G070.svd"
},
"frameworks": [
"arduino",
"cmsis",
"libopencm3",
"stm32cube"
],
"name": "Nucleo G070RB",
"upload": {
"maximum_ram_size": 36864,
"maximum_size": 131072,
"protocol": "stlink",
"protocols": [
"blackmagic",
"cmsis-dap",
"jlink",
"stlink",
"mbed"
]
},
"url": "https://www.st.com/en/evaluation-tools/nucleo-g070rb.html",
"vendor": "ST"
}
2 changes: 1 addition & 1 deletion boards/nucleo_g0b1re.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"mcu": "stm32g0b1ret6",
"product_line": "STM32G0B1xx",
"variant": "STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)"
"variant": "STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T"
},
"debug": {
"default_tools": [
Expand Down
6 changes: 4 additions & 2 deletions boards/nucleo_h723zg.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"extra_flags": "-DSTM32H7xx -DSTM32H723xx",
"f_cpu": "550000000L",
"mcu": "stm32h723zgt6",
"product_line": "STM32H723xx"
"product_line": "STM32H723xx",
"variant": "STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT"
},
"connectivity": [
"can",
Expand All @@ -23,13 +24,14 @@
"svd_path": "STM32H723.svd"
},
"frameworks": [
"arduino",
"cmsis",
"stm32cube",
"zephyr"
],
"name": "ST Nucleo H723ZG",
"upload": {
"maximum_ram_size": 442368,
"maximum_ram_size": 327680,
"maximum_size": 1048576,
"protocol": "stlink",
"protocols": [
Expand Down
2 changes: 1 addition & 1 deletion boards/nucleo_l073rz.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"extra_flags": "-DSTM32L073xx",
"f_cpu": "32000000L",
"framework_extra_flags": {
"arduino": "-D__CORTEX_SC=0"
"arduino": "-D__CORTEX_SC=0 -DARDUINO_NUCLEO_L073RZ"
},
"mcu": "stm32l073rz",
"product_line": "STM32L073xx",
Expand Down
2 changes: 1 addition & 1 deletion boards/nucleo_l452re.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"f_cpu": "80000000L",
"mcu": "stm32l452ret6",
"product_line": "STM32L452xx",
"variant": "STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)"
"variant": "STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)"
},
"connectivity": [
"can"
Expand Down
51 changes: 51 additions & 0 deletions boards/opta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"build": {
"arduino": {
"ldscript": "linker_script.ld",
"flash_layout": "50_50"
},
"extra_flags": "-DARDUINO_OPTA",
"core": "arduino",
"cpu": "cortex-m7",
"f_cpu": "480000000L",
"mcu": "stm32h747xih6",
"variant": "OPTA",
"product_line": "STM32H747xx",
"hwids": [
[
"0x2341",
"0x0364"
]
]
},
"connectivity": [
"bluetooth",
"wifi"
],
"debug": {
"jlink_device": "STM32H747XI_M7",
"openocd_target": "stm32h7x_dual_bank"
},
"frameworks": [
"arduino"
],
"name": "Arduino Opta",
"upload": {
"maximum_ram_size": 523624,
"maximum_size": 786432,
"protocol": "dfu",
"protocols": [
"cmsis-dap",
"dfu",
"jlink",
"stlink",
"mbed"
],
"require_upload_port": true,
"use_1200bps_touch": true,
"wait_for_upload_port": true,
"offset_address": "0x08040000"
},
"url": "https://www.arduino.cc/pro/hardware-arduino-opta",
"vendor": "Arduino"
}
2 changes: 1 addition & 1 deletion builder/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def _jlink_cmd_script(env, source):
upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]

if "arduino" in frameworks:
if env.subst("$BOARD").startswith("portenta"):
if env.subst("$BOARD").startswith(("portenta", "opta")):
upload_actions.insert(
0,
env.VerboseAction(BeforeUpload, "Looking for upload port...")
Expand Down
6 changes: 3 additions & 3 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-ststm32.git"
},
"version": "15.4.1",
"version": "15.5.0",
"frameworks": {
"mbed": {
"package": "framework-mbed",
Expand Down Expand Up @@ -192,7 +192,7 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~4.20200.0"
"version": "~4.20400.0"
},
"framework-arduinoststm32-maple": {
"type": "framework",
Expand All @@ -216,7 +216,7 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~3.1.1"
"version": "~3.5.4"
},
"framework-stm32cubef0": {
"type": "framework",
Expand Down
2 changes: 1 addition & 1 deletion platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def configure_default_packages(self, variables, targets):

frameworks = variables.get("pioframework", [])
if "arduino" in frameworks:
if board.startswith("portenta"):
if board.startswith(("portenta", "opta")):
self.frameworks["arduino"]["package"] = "framework-arduino-mbed"
self.frameworks["arduino"][
"script"
Expand Down
3 changes: 1 addition & 2 deletions tests/arduino-blink-different-cores/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
.pioenvs
.piolibdeps
.pio

0 comments on commit f51da64

Please sign in to comment.