Skip to content

Commit 9a385d1

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v1.1.0'
2 parents 99d989f + 9be7e75 commit 9a385d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1406
-39
lines changed

‎.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ python:
33
- "2.7"
44

55
env:
6+
- PLATFORMIO_PROJECT_DIR=examples/arduino-blink
7+
- PLATFORMIO_PROJECT_DIR=examples/arduino-external-libs
8+
- PLATFORMIO_PROJECT_DIR=examples/arduino-internal-libs
69
- PLATFORMIO_PROJECT_DIR=examples/cmsis-blink
710
- PLATFORMIO_PROJECT_DIR=examples/libopencm3-blink
811
- PLATFORMIO_PROJECT_DIR=examples/mbed-blink

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is des
1212
1. [Install PlatformIO CLI](http://docs.platformio.org/en/latest/installation.html)
1313
2. Install ST STM32 development platform:
1414
```bash
15-
# isntall the latest stable version
15+
# install the latest stable version
1616
> platformio platform install ststm32
1717

1818
# install development version

‎boards/bluepill_f103c8.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
{
22
"build": {
3-
"core": "stm32",
4-
"cpu": "cortex-m3",
5-
"f_cpu": "72000000L",
6-
"ldscript": "stm32f103xb.ld",
7-
"mcu": "stm32f103c8t6",
3+
"core": "stm32",
4+
"cpu": "cortex-m3",
5+
"f_cpu": "72000000L",
6+
"ldscript": "stm32f103xb.ld",
7+
"mcu": "stm32f103c8t6",
88
"variant": "stm32f1"
9-
},
9+
},
1010
"frameworks": [
11-
"mbed"
12-
],
13-
"name": "BluePill F103C8",
11+
"mbed",
12+
"arduino"
13+
],
14+
"name": "BluePill F103C8",
1415
"upload": {
15-
"maximum_ram_size": 20480,
16+
"maximum_ram_size": 20480,
1617
"maximum_size": 65536,
1718
"protocol": "stlink"
18-
},
19-
"url": "http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103c8.html",
19+
},
20+
"url": "http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103c8.html",
2021
"vendor": "Generic"
2122
}

‎boards/disco_f746ng.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"build": {
3+
"cpu": "cortex-m7",
4+
"f_cpu": "216000000L",
5+
"mcu": "stm32f746ngh6"
6+
},
7+
"frameworks": [
8+
"mbed"
9+
],
10+
"name": "ST 32F746GDISCOVERY",
11+
"upload": {
12+
"maximum_ram_size": 327680,
13+
"maximum_size": 1048576,
14+
"protocol": "stlink"
15+
},
16+
"url": "http://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-mcu-discovery-kits/32f746gdiscovery.html",
17+
"vendor": "ST"
18+
}

‎boards/genericSTM32F103C8.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"build": {
3+
"core": "maple",
4+
"cpu": "cortex-m3",
5+
"extra_flags": "-DMCU_STM32F103C8",
6+
"f_cpu": "72000000L",
7+
"hwids": [
8+
["0x1EAF", "0x0003"],
9+
["0x1EAF", "0x0004"]
10+
],
11+
"ldscript": "jtag_c8.ld",
12+
"mcu": "stm32f103c8",
13+
"variant": "generic_stm32f103c"
14+
},
15+
"frameworks": ["arduino"],
16+
"name": "STM32F103C8 (20k RAM. 64k Flash)",
17+
"upload": {
18+
"disable_flushing": false,
19+
"maximum_ram_size": 20480,
20+
"maximum_size": 65536,
21+
"protocol": "maple_serial",
22+
"require_upload_port": true,
23+
"use_1200bps_touch": false,
24+
"wait_for_upload_port": false
25+
},
26+
"url": "http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103c8.html",
27+
"vendor": "Generic"
28+
}

‎boards/genericSTM32F103CB.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"build": {
3+
"core": "maple",
4+
"cpu": "cortex-m3",
5+
"extra_flags": "-DMCU_STM32F103CB",
6+
"f_cpu": "72000000L",
7+
"hwids": [
8+
["0x1EAF", "0x0003"],
9+
["0x1EAF", "0x0004"]
10+
],
11+
"ldscript": "jtag.ld",
12+
"mcu": "stm32f103cb",
13+
"variant": "generic_stm32f103c"
14+
},
15+
"frameworks": ["arduino"],
16+
"name": "STM32F103CB (20k RAM. 128k Flash)",
17+
"upload": {
18+
"disable_flushing": false,
19+
"maximum_ram_size": 20480,
20+
"maximum_size": 131072,
21+
"protocol": "maple_serial",
22+
"require_upload_port": true,
23+
"use_1200bps_touch": false,
24+
"wait_for_upload_port": false
25+
},
26+
"url": "http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103cb.html",
27+
"vendor": "Generic"
28+
}

‎boards/genericSTM32F103R8.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"build": {
3+
"core": "maple",
4+
"cpu": "cortex-m3",
5+
"extra_flags": "-DMCU_STM32F103R8",
6+
"f_cpu": "72000000L",
7+
"hwids": [
8+
["0x1EAF", "0x0003"],
9+
["0x1EAF", "0x0004"]
10+
],
11+
"ldscript": "stm32f103r8.ld",
12+
"mcu": "stm32f103r8",
13+
"variant": "generic_stm32f103r8"
14+
},
15+
"frameworks": ["arduino"],
16+
"name": "STM32F103R8 (20k RAM. 64 Flash)",
17+
"upload": {
18+
"disable_flushing": false,
19+
"maximum_ram_size": 20480,
20+
"maximum_size": 65536,
21+
"protocol": "maple_serial",
22+
"require_upload_port": true,
23+
"use_1200bps_touch": false,
24+
"wait_for_upload_port": false
25+
},
26+
"url": "http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103r8.html",
27+
"vendor": "Generic"
28+
}

‎boards/genericSTM32F103RB.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"build": {
3+
"core": "maple",
4+
"cpu": "cortex-m3",
5+
"extra_flags": "-DMCU_STM32F103RB",
6+
"f_cpu": "72000000L",
7+
"hwids": [
8+
["0x1EAF", "0x0003"],
9+
["0x1EAF", "0x0004"]
10+
],
11+
"ldscript": "stm32f103rb.ld",
12+
"mcu": "stm32f103rb",
13+
"variant": "generic_stm32f103r8"
14+
},
15+
"frameworks": ["arduino"],
16+
"name": "STM32F103RB (20k RAM. 128k Flash)",
17+
"upload": {
18+
"disable_flushing": false,
19+
"maximum_ram_size": 20480,
20+
"maximum_size": 131072,
21+
"protocol": "maple_serial",
22+
"require_upload_port": true,
23+
"use_1200bps_touch": false,
24+
"wait_for_upload_port": false
25+
},
26+
"url": "http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103rb.html",
27+
"vendor": "Generic"
28+
}

‎boards/genericSTM32F103RC.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"build": {
3+
"core": "maple",
4+
"cpu": "cortex-m3",
5+
"extra_flags": "-DMCU_STM32F103RC",
6+
"f_cpu": "72000000L",
7+
"hwids": [
8+
["0x1EAF", "0x0003"],
9+
["0x1EAF", "0x0004"]
10+
],
11+
"ldscript": "stm32f103rc.ld",
12+
"mcu": "stm32f103rc",
13+
"variant": "generic_stm32f103r"
14+
},
15+
"frameworks": ["arduino"],
16+
"name": "STM32F103RC (48k RAM. 256k Flash)",
17+
"upload": {
18+
"disable_flushing": false,
19+
"maximum_ram_size": 49152,
20+
"maximum_size": 262144,
21+
"protocol": "maple_serial",
22+
"require_upload_port": true,
23+
"use_1200bps_touch": false,
24+
"wait_for_upload_port": false
25+
},
26+
"url": "http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103rc.html",
27+
"vendor": "Generic"
28+
}

‎boards/genericSTM32F103RE.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"build": {
3+
"core": "maple",
4+
"cpu": "cortex-m3",
5+
"extra_flags": "-DMCU_STM32F103RE",
6+
"f_cpu": "72000000L",
7+
"hwids": [
8+
["0x1EAF", "0x0003"],
9+
["0x1EAF", "0x0004"]
10+
],
11+
"ldscript": "stm32f103re.ld",
12+
"mcu": "stm32f103re",
13+
"variant": "generic_stm32f103r"
14+
},
15+
"frameworks": ["arduino"],
16+
"name": "STM32F103RE (64k RAM. 512k Flash)",
17+
"upload": {
18+
"disable_flushing": false,
19+
"maximum_ram_size": 65536,
20+
"maximum_size": 524288,
21+
"protocol": "maple_serial",
22+
"require_upload_port": true,
23+
"use_1200bps_touch": false,
24+
"wait_for_upload_port": false
25+
},
26+
"url": "http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103re.html",
27+
"vendor": "Generic"
28+
}

0 commit comments

Comments
 (0)