Skip to content

Commit

Permalink
Merge branch 'release/v15.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Mar 28, 2023
2 parents 2614cbd + d42238b commit c5474de
Show file tree
Hide file tree
Showing 17 changed files with 200 additions and 16 deletions.
63 changes: 63 additions & 0 deletions boards/nicla_vision.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"build": {
"arduino": {
"ldscript": "linker_script.ld",
"flash_layout": "50_50"
},
"extra_flags": "-DARDUINO_NICLA_VISION",
"core": "arduino",
"cpu": "cortex-m7",
"f_cpu": "480000000L",
"mcu": "stm32h747xih6",
"variant": "NICLA_VISION",
"product_line": "STM32H747xx",
"hwids": [
[
"0x2341",
"0x035F"
],
[
"0x2341",
"0x025F"
],
[
"0x2341",
"0x045F"
],
[
"0x2341",
"0x055F"
]
]
},
"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"
}
63 changes: 63 additions & 0 deletions boards/nicla_vision_m4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"build": {
"arduino": {
"ldscript": "linker_script.ld",
"flash_layout": "50_50"
},
"extra_flags": "-DARDUINO_PORTENTA_H7_M4 -DNVISION_PINS",
"core": "arduino",
"cpu": "cortex-m4",
"f_cpu": "480000000L",
"mcu": "stm32h747xih6",
"variant": "PORTENTA_H7_M4",
"product_line": "STM32H747xx",
"hwids": [
[
"0x2341",
"0x035F"
],
[
"0x2341",
"0x025F"
],
[
"0x2341",
"0x045F"
],
[
"0x2341",
"0x055F"
]
]
},
"connectivity": [
"bluetooth",
"wifi"
],
"debug": {
"jlink_device": "STM32H747XI_M4",
"openocd_target": "stm32h7x_dual_bank"
},
"frameworks": [
"arduino"
],
"name": "Arduino Nicla Vision (M4 core)",
"upload": {
"maximum_ram_size": 294248,
"maximum_size": 1048576,
"protocol": "dfu",
"protocols": [
"cmsis-dap",
"dfu",
"jlink",
"stlink",
"mbed"
],
"require_upload_port": true,
"use_1200bps_touch": true,
"wait_for_upload_port": true,
"offset_address": "0x08100000"
},
"url": "https://store.arduino.cc/products/nicla-vision",
"vendor": "Arduino"
}
51 changes: 51 additions & 0 deletions boards/opta_m4.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 -DOPTA_PINS",
"core": "arduino",
"cpu": "cortex-m4",
"f_cpu": "480000000L",
"mcu": "stm32h747xih6",
"variant": "PORTENTA_H7_M4",
"product_line": "STM32H747xx",
"hwids": [
[
"0x2341",
"0x0364"
]
]
},
"connectivity": [
"bluetooth",
"wifi"
],
"debug": {
"jlink_device": "STM32H747XI_M4",
"openocd_target": "stm32h7x_dual_bank"
},
"frameworks": [
"arduino"
],
"name": "Arduino Opta (M4 core)",
"upload": {
"maximum_ram_size": 294248,
"maximum_size": 1048576,
"protocol": "dfu",
"protocols": [
"cmsis-dap",
"dfu",
"jlink",
"stlink",
"mbed"
],
"require_upload_port": true,
"use_1200bps_touch": true,
"wait_for_upload_port": true,
"offset_address": "0x08100000"
},
"url": "https://www.arduino.cc/pro/hardware-arduino-opta",
"vendor": "Arduino"
}
2 changes: 1 addition & 1 deletion boards/portenta_h7_m4.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "linker_script.ld",
"flash_layout": "50_50"
},
"extra_flags": "-DARDUINO_PORTENTA_H7_M4",
"extra_flags": "-DARDUINO_PORTENTA_H7_M4 -DPORTENTA_H7_PINS",
"core": "arduino",
"cpu": "cortex-m4",
"f_cpu": "480000000L",
Expand Down
2 changes: 1 addition & 1 deletion builder/frameworks/arduino/mbed-core
Submodule mbed-core updated 1 files
+34 −4 arduino-core-mbed.py
2 changes: 1 addition & 1 deletion examples/arduino-blink/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ upload_protocol = dfu
[env:maple]
board = maple

[env:generic STM32F103RB]
[env:genericSTM32F103RB]
board = genericSTM32F103RB

[env:bluepill_f103c8_stm32_core]
Expand Down
2 changes: 1 addition & 1 deletion examples/arduino-mbed-doom/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ platform = ststm32
framework = arduino
board = portenta_h7_m7
lib_deps =
Portenta_Video
Portenta_Video
9 changes: 8 additions & 1 deletion examples/arduino-mbed-rpc/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,11 @@
platform = ststm32
framework = arduino
board = portenta_h7_m4
lib_compat_mode = off
lib_compat_mode = off

[env:nicla_vision_m4]
platform = ststm32
framework = arduino
board = nicla_vision_m4
lib_compat_mode = off

2 changes: 1 addition & 1 deletion examples/cmsis-blink/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ platform = ststm32
framework = cmsis
board = disco_f303vc

[env:bluepill f103c8]
[env:bluepill_f103c8]
platform = ststm32
framework = cmsis
board = bluepill_f103c8
Expand Down
2 changes: 1 addition & 1 deletion examples/libopencm3-1bitsy/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
; Please visit documentation for the other options and examples
; https://docs.platformio.org/page/projectconf.html

[env:1bitsy stm32f415rgt]
[env:1bitsy_stm32f415rgt]
platform = ststm32
board = 1bitsy_stm32f415rgt
framework = libopencm3
2 changes: 1 addition & 1 deletion examples/mbed-rtos-blink-baremetal/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ platform = ststm32
framework = mbed
board = nucleo_f103rb

[env:nucleo f401re]
[env:nucleo_f401re]
platform = ststm32
framework = mbed
board = nucleo_f401re
2 changes: 1 addition & 1 deletion examples/spl-blink/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ platform = ststm32
framework = spl
board = disco_l152rb

[env:disco f303vc]
[env:disco_f303vc]
platform = ststm32
framework = spl
board = disco_f303vc
2 changes: 1 addition & 1 deletion examples/stm32cube-hal-blink/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ framework = stm32cube
board = cloud_jam
build_flags = -DF4

[env:cloud jam l4]
[env:cloud_jam_l4]
platform = ststm32
framework = stm32cube
board = cloud_jam_l4
Expand Down
2 changes: 1 addition & 1 deletion examples/stm32cube-ll-blink/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ framework = stm32cube
board = nucleo_f401re
build_flags = -DSYS_CLOCK=84000000L

[env:cloud jam]
[env:cloud_jam]
platform = ststm32
framework = stm32cube
board = cloud_jam
Expand Down
4 changes: 2 additions & 2 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.5.1",
"version": "15.6.0",
"frameworks": {
"mbed": {
"package": "framework-mbed",
Expand Down Expand Up @@ -216,7 +216,7 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~3.5.4"
"version": "~4.0.2"
},
"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", "opta")):
if board.startswith(("portenta", "opta", "nicla_vision")):
self.frameworks["arduino"]["package"] = "framework-arduino-mbed"
self.frameworks["arduino"][
"script"
Expand Down
4 changes: 2 additions & 2 deletions tests/arduino-blink-different-cores/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ platform = ststm32
framework = arduino
board = genericSTM32F103ZE

[env:disco_f100rb maple]
[env:disco_f100rb_maple]
platform = ststm32
framework = arduino
board = disco_f100rb
board_build.core = maple

[env:disco_f407vg maple]
[env:disco_f407vg_maple]
platform = ststm32
framework = arduino
board = disco_f407vg
Expand Down

0 comments on commit c5474de

Please sign in to comment.