noisymime
/
platform-ststm32
mirror of https://github.com/noisymime/platform-ststm32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v1.5.0'

This commit is contained in:
Ivan Kravets 2016-12-07 21:54:04 +02:00
parent a5d2e621bb 9bcc86a3c3
commit 3a7e883ee2
9 changed files with 88 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
boards/maple.json
View File

@ -9,21 +9,18 @@
["0x1EAF", "0x0004"]
],
"ldscript": "flash.ld",
"mcu": "stm32f103rb_maple",
"mcu": "stm32f103rb",
"variant": "maple"
},
"frameworks": ["arduino"],
"name": "Olimexino STM32 (Maple)",
"name": "Maple",
"upload": {
"disable_flushing": false,
"maximum_ram_size": 17000,
"maximum_size": 108000,
"maximum_ram_size": 17408,
"maximum_size": 110592,
"protocol": "dfu",
"boot_version": 1,
"require_upload_port": true,
"use_1200bps_touch": false,
"wait_for_upload_port": false
"require_upload_port": true
},
"url": "https://www.olimex.com/Products/Duino/STM32/OLIMEXINO-STM32/",
"vendor": "Olimex"
"url": "http://www.leaflabs.com/maple/",
"vendor": "LeafLabs"
}

26
boards/maple_mini_b20.json Normal file
View File

@ -0,0 +1,26 @@
{
"build": {
"core": "maple",
"cpu": "cortex-m3",
"extra_flags": "-DARDUINO_MAPLE_MINI -DMCU_STM32F103CB",
"f_cpu": "72000000L",
"hwids": [
["0x1EAF", "0x0003"],
["0x1EAF", "0x0004"]
],
"ldscript": "flash.ld",
"mcu": "stm32f103cb",
"variant": "maple_mini"
},
"frameworks": ["arduino"],
"name": "Maple Mini Bootloader 2.0",
"upload": {
"maximum_ram_size": 20480,
"maximum_size": 122880,
"protocol": "dfu",
"boot_version": 2,
"require_upload_port": true
},
"url": "http://www.leaflabs.com/maple/",
"vendor": "LeafLabs"
}

26
boards/maple_mini_origin.json Normal file
View File

@ -0,0 +1,26 @@
{
"build": {
"core": "maple",
"cpu": "cortex-m3",
"extra_flags": "-DARDUINO_MAPLE_MINI -DMCU_STM32F103CB",
"f_cpu": "72000000L",
"hwids": [
["0x1EAF", "0x0003"],
["0x1EAF", "0x0004"]
],
"ldscript": "flash.ld",
"mcu": "stm32f103cb",
"variant": "maple_mini"
},
"frameworks": ["arduino"],
"name": "Maple Mini Original",
"upload": {
"maximum_ram_size": 17408,
"maximum_size": 110592,
"protocol": "dfu",
"boot_version": 1,
"require_upload_port": true
},
"url": "http://www.leaflabs.com/maple/",
"vendor": "LeafLabs"
}

27
builder/frameworks/arduino.py
View File

@ -48,11 +48,11 @@ env.Append(
],
CPPDEFINES=[
"ARDUINO=10611",
("ARDUINO", 10610),
"BOARD_%s" % board.get("build.variant"),
"ERROR_LED_PORT=GPIOB",
"ERROR_LED_PIN=1",
"DEBUG_LEVEL=DEBUG_NONE",
("ERROR_LED_PORT", "GPIOB"),
("ERROR_LED_PIN", 1),
("DEBUG_LEVEL", "DEBUG_NONE"),
"__STM32F1__",
"ARDUINO_ARCH_STM32F1"
],
@ -77,21 +77,20 @@ for item in ("-nostartfiles", "-nostdlib"):
if item in env['LINKFLAGS']:
env['LINKFLAGS'].remove(item)
ld = board.get("build.ldscript")
if env.subst("$UPLOAD_PROTOCOL") == "dfu":
if "stm32f103c" in board.get("build.mcu", ""):
ld = "bootloader_20.ld"
elif "stm32f103r" in board.get("build.mcu", ""):
ld = "bootloader.ld"
if "stm32f103rb_maple" in board.get("build.mcu", ""):
env.Append(CPPDEFINES=["VECT_TAB_ADDR=0x8005000", "SERIAL_USB"])
if board.id in ("maple", "maple_mini_origin"):
env.Append(CPPDEFINES=[("VECT_TAB_ADDR", 0x8005000), "SERIAL_USB"])
else:
env.Append(CPPDEFINES=[
"VECT_TAB_ADDR=0x8002000", "SERIAL_USB", "GENERIC_BOOTLOADER"])
env.Replace(LDSCRIPT_PATH=ld)
("VECT_TAB_ADDR", 0x8002000), "SERIAL_USB", "GENERIC_BOOTLOADER"])
if "stm32f103r" in board.get("build.mcu", ""):
env.Replace(LDSCRIPT_PATH="bootloader.ld")
elif board.get("upload.boot_version", 0) == 2:
env.Replace(LDSCRIPT_PATH="bootloader_20.ld")
else:
env.Append(CPPDEFINES=["VECT_TAB_ADDR=0x8000000"])
env.Append(CPPDEFINES=[("VECT_TAB_ADDR", 0x8000000)])
#
# Lookup for specific core's libraries

2
builder/main.py
View File

@ -49,7 +49,7 @@ env.Replace(
],
CPPDEFINES=[
"F_CPU=$BOARD_F_CPU"
("F_CPU", "$BOARD_F_CPU")
],
LINKFLAGS=[

8
examples/mbed-blink/platformio.ini
View File

@ -22,10 +22,10 @@ platform = ststm32
framework = mbed
board = disco_f100rb
; [env:nucleo_f030r8]
; platform = ststm32
; framework = mbed
; board = nucleo_f030r8
[env:nucleo_f030r8]
platform = ststm32
framework = mbed
board = nucleo_f030r8
[env:nucleo_f103rb]
platform = ststm32

8
examples/mbed-dsp/platformio.ini
View File

@ -22,10 +22,10 @@ platform = ststm32
framework = mbed
board = disco_f100rb
; [env:nucleo_f030r8]
; platform = ststm32
; framework = mbed
; board = nucleo_f030r8
[env:nucleo_f030r8]
platform = ststm32
framework = mbed
board = nucleo_f030r8
[env:nucleo_f103rb]
platform = ststm32

8
examples/mbed-serial/platformio.ini
View File

@ -22,10 +22,10 @@ platform = ststm32
framework = mbed
board = disco_f100rb
; [env:nucleo_f030r8]
; platform = ststm32
; framework = mbed
; board = nucleo_f030r8
[env:nucleo_f030r8]
platform = ststm32
framework = mbed
board = nucleo_f030r8
[env:nucleo_f103rb]
platform = ststm32

7
platform.json
View File

@ -6,14 +6,13 @@
"homepage": "http://platformio.org/platforms/ststm32",
"license": "Apache-2.0",
"engines": {
"platformio": "^3.0.0",
"scons": ">=2.3.0,<2.6.0"
"platformio": "^3.0.0"
},
"repository": {
"type": "git",
"url": "https://github.com/platformio/platform-ststm32.git"
},
"version": "1.4.0",
"version": "1.5.0",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@ -49,7 +48,7 @@
"framework-mbed": {
"type": "framework",
"optional": true,
"version": "~3.127.0"
"version": "~3.126.0"
},
"framework-cmsis": {
"type": "framework",