Merge branch 'release/v6.0.0'

platformio · Dec 30, 2019 · 5b667dd · 5b667dd
2 parents 79083df + 8defac7
commit 5b667dd
Show file tree

Hide file tree

Showing 113 changed files with 3,017 additions and 70 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,9 +28,29 @@ env:
   - PLATFORMIO_PROJECT_DIR=examples/spl-blink
   - PLATFORMIO_PROJECT_DIR=examples/stm32cube-hal-blink
   - PLATFORMIO_PROJECT_DIR=examples/stm32cube-ll-blink
+  - PLATFORMIO_PROJECT_DIR=examples/zephyr-blink
+  - PLATFORMIO_PROJECT_DIR=examples/zephyr-cpp-synchronization
+  - PLATFORMIO_PROJECT_DIR=examples/zephyr-drivers-can
+  - PLATFORMIO_PROJECT_DIR=examples/zephyr-net-https-client
+  - PLATFORMIO_PROJECT_DIR=examples/zephyr-subsys-usb-hid-mouse
   - PLATFORMIO_PROJECT_DIR=tests/arduino-blink-different-cores
   - PLATFORMIO_PROJECT_DIR=tests/mbed-filesystem
 
+# Zephyr framework doesn't support python 2
+jobs:
+  exclude:
+    - python: "2.7"
+      env: PLATFORMIO_PROJECT_DIR=examples/zephyr-blink
+    - python: "2.7"
+      env: PLATFORMIO_PROJECT_DIR=examples/zephyr-cpp-synchronization
+    - python: "2.7"
+      env: PLATFORMIO_PROJECT_DIR=examples/zephyr-drivers-can
+    - python: "2.7"
+      env: PLATFORMIO_PROJECT_DIR=examples/zephyr-net-https-client
+    - python: "2.7"
+      env: PLATFORMIO_PROJECT_DIR=examples/zephyr-subsys-usb-hid-mouse
+
+
 install:
   - pip install -U https://github.com/platformio/platformio/archive/develop.zip
   - platformio platform install file://.

diff --git a/appveyor.yml b/appveyor.yml
@@ -26,12 +26,17 @@ environment:
     - PLATFORMIO_PROJECT_DIR: "examples/spl-blink"
     - PLATFORMIO_PROJECT_DIR: "examples/stm32cube-hal-blink"
     - PLATFORMIO_PROJECT_DIR: "examples/stm32cube-ll-blink"
+    - PLATFORMIO_PROJECT_DIR: "examples/zephyr-blink"
+    - PLATFORMIO_PROJECT_DIR: "examples/zephyr-cpp-synchronization"
+    - PLATFORMIO_PROJECT_DIR: "examples/zephyr-drivers-can"
+    - PLATFORMIO_PROJECT_DIR: "examples/zephyr-modules"
+    - PLATFORMIO_PROJECT_DIR: "examples/zephyr-subsys-usb-hid-mouse"
     - PLATFORMIO_PROJECT_DIR: "tests/arduino-blink-different-cores"
     - PLATFORMIO_PROJECT_DIR: "tests/mbed-filesystem"
 
 install:
   - cmd: git submodule update --init --recursive
-  - cmd: SET PATH=%PATH%;C:\Python36\Scripts
+  - cmd: SET PATH=C:\Python36\Scripts;%PATH%
   - cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
   - cmd: platformio platform install file://.
 

diff --git a/boards/b96b_f446ve.json b/boards/b96b_f446ve.json
@@ -3,7 +3,10 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DSTM32F446xx",
     "f_cpu": "168000000L",
-    "mcu": "stm32f446vet6"
+    "mcu": "stm32f446vet6",
+    "zephyr": {
+       "variant": "96b_stm32_sensor_mez"
+    }
   },
   "connectivity": [
     "can"
@@ -21,7 +24,8 @@
   },
   "frameworks": [
     "mbed",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "96Boards B96B-F446VE",
   "upload": {

diff --git a/boards/blackpill_f103c8.json b/boards/blackpill_f103c8.json
@@ -16,7 +16,10 @@
     ],
     "ldscript": "stm32f103x8.ld",
     "mcu": "stm32f103c8t6",
-    "variant": "PILL_F103XX"
+    "variant": "PILL_F103XX",
+    "zephyr": {
+       "variant": "stm32_min_dev_black"
+    }
   },
   "debug": {
     "default_tools": [
@@ -34,7 +37,8 @@
     "arduino",
     "cmsis",
     "libopencm3",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "BlackPill F103C8",
   "upload": {

diff --git a/boards/blackpill_f103c8_128.json b/boards/blackpill_f103c8_128.json
@@ -16,7 +16,10 @@
     ],
     "ldscript": "ldscript_cb.ld",
     "mcu": "stm32f103c8t6",
-    "variant": "PILL_F103XX"
+    "variant": "PILL_F103XX",
+    "zephyr": {
+       "variant": "stm32_min_dev_black"
+    }
   },
   "debug": {
     "default_tools": [
@@ -34,7 +37,8 @@
     "arduino",
     "cmsis",
     "libopencm3",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "BlackPill F103C8 (128k)",
   "upload": {

diff --git a/boards/bluepill_f103c8.json b/boards/bluepill_f103c8.json
@@ -16,7 +16,10 @@
     ],
     "ldscript": "stm32f103x8.ld",
     "mcu": "stm32f103c8t6",
-    "variant": "PILL_F103XX"
+    "variant": "PILL_F103XX",
+    "zephyr": {
+       "variant": "stm32_min_dev_blue"
+    }
   },
   "debug": {
     "default_tools": [
@@ -35,7 +38,8 @@
     "mbed",
     "cmsis",
     "libopencm3",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "BluePill F103C8",
   "upload": {

diff --git a/boards/bluepill_f103c8_128k.json b/boards/bluepill_f103c8_128k.json
@@ -16,7 +16,10 @@
     ],
     "ldscript": "ldscript_cb.ld",
     "mcu": "stm32f103c8t6",
-    "variant": "PILL_F103XX"
+    "variant": "PILL_F103XX",
+    "zephyr": {
+       "variant": "stm32_min_dev_blue"
+    }
   },
   "debug": {
     "default_tools": [
@@ -34,7 +37,8 @@
     "arduino",
     "cmsis",
     "libopencm3",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "BluePill F103C8 (128k)",
   "upload": {

diff --git a/boards/disco_f051r8.json b/boards/disco_f051r8.json
@@ -3,7 +3,10 @@
     "cpu": "cortex-m0",
     "extra_flags": "-DSTM32F051x8",
     "f_cpu": "48000000L",
-    "mcu": "stm32f051r8t6"
+    "mcu": "stm32f051r8t6",
+    "zephyr": {
+       "variant": "stm32f0_disco"
+    }
   },
   "debug": {
     "default_tools": [
@@ -18,7 +21,8 @@
   },
   "frameworks": [
     "mbed",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "ST STM32F0DISCOVERY",
   "upload": {

diff --git a/boards/disco_f072rb.json b/boards/disco_f072rb.json
@@ -4,7 +4,10 @@
     "extra_flags": "-DSTM32F072xB",
     "f_cpu": "48000000L",
     "mcu": "stm32f072rbt6",
-    "variant": "DISCO_F072RB"
+    "variant": "DISCO_F072RB",
+    "zephyr": {
+       "variant": "stm32f072b_disco"
+    }
   },
   "connectivity": [
     "can"
@@ -24,7 +27,8 @@
   "frameworks": [
     "arduino",
     "mbed",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "ST Discovery F072RB",
   "upload": {

diff --git a/boards/disco_f303vc.json b/boards/disco_f303vc.json
@@ -6,7 +6,10 @@
     "f_cpu": "72000000L",
     "ldscript": "stm32f30xx.ld",
     "mcu": "stm32f303vct6",
-    "variant": "stm32f303xc"
+    "variant": "stm32f303xc",
+    "zephyr": {
+       "variant": "stm32f3_disco"
+    }
   },
   "debug": {
     "default_tools": [
@@ -24,7 +27,8 @@
     "cmsis",
     "spl",
     "libopencm3",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "ST STM32F3DISCOVERY",
   "upload": {

diff --git a/boards/disco_f407vg.json b/boards/disco_f407vg.json
@@ -6,7 +6,10 @@
     "f_cpu": "168000000L",
     "ldscript": "stm32f405x6.ld",
     "mcu": "stm32f407vgt6",
-    "variant": "DISCO_F407VG"
+    "variant": "DISCO_F407VG",
+    "zephyr": {
+       "variant": "stm32f4_disco"
+    }
   },
   "debug": {
     "default_tools": [
@@ -25,7 +28,8 @@
     "cmsis",
     "spl",
     "libopencm3",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "ST STM32F4DISCOVERY",
   "upload": {

diff --git a/boards/disco_f411ve.json b/boards/disco_f411ve.json
@@ -1,9 +1,12 @@
 {
   "build": {
     "cpu": "cortex-m4",
-    "extra_flags": "-DSTM32F411xE",
+    "extra_flags": "-DSTM32F4 -DSTM32F411xE",
     "f_cpu": "100000000L",
-    "mcu": "stm32f411vet6"
+    "mcu": "stm32f411vet6",
+    "zephyr": {
+       "variant": "stm32f411e_disco"
+    }
   },
   "debug": {
     "default_tools": [
@@ -17,7 +20,9 @@
     "svd_path": "STM32F411xx.svd"
   },
   "frameworks": [
-    "stm32cube"
+    "cmsis",
+    "stm32cube",
+    "zephyr"
   ],
   "name": "ST 32F411EDISCOVERY",
   "upload": {

diff --git a/boards/disco_f412zg.json b/boards/disco_f412zg.json
@@ -0,0 +1,41 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F412Zx",
+    "f_cpu": "100000000L",
+    "mcu": "stm32f412zgt6",
+    "zephyr": {
+       "variant": "stm32f412g_disco"
+    }
+  },
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32F412ZG",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_board": "st_nucleo_f4",
+    "svd_path": "STM32F41x.svd"
+  },
+  "frameworks": [
+    "mbed",
+    "stm32cube",
+    "zephyr"
+  ],
+  "name": "32F412GDISCOVERY",
+  "upload": {
+    "maximum_ram_size": 262144,
+    "maximum_size": 1048576,
+    "protocol": "stlink",
+    "protocols": [
+      "jlink",
+      "stlink",
+      "blackmagic",
+      "mbed"
+    ]
+  },
+  "url": "https://www.st.com/en/evaluation-tools/32f412gdiscovery.html",
+  "vendor": "ST"
+}
diff --git a/boards/disco_f429zi.json b/boards/disco_f429zi.json
@@ -1,9 +1,12 @@
 {
   "build": {
     "cpu": "cortex-m4",
-    "extra_flags": "-DSTM32F429xx",
+    "extra_flags": "-DSTM32F4 -DSTM32F429xx",
     "f_cpu": "180000000L",
-    "mcu": "stm32f429zit6"
+    "mcu": "stm32f429zit6",
+    "zephyr": {
+       "variant": "stm32f429i_disc1"
+    }
   },
   "connectivity": [
     "can"
@@ -20,8 +23,10 @@
     "svd_path": "STM32F429x.svd"
   },
   "frameworks": [
+    "cmsis",
     "mbed",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "ST 32F429IDISCOVERY",
   "upload": {

diff --git a/boards/disco_f469ni.json b/boards/disco_f469ni.json
@@ -1,9 +1,12 @@
 {
   "build": {
     "cpu": "cortex-m4",
-    "extra_flags": "-DSTM32F469xx",
+    "extra_flags": "-DSTM32F4 -DSTM32F469xx",
     "f_cpu": "180000000L",
-    "mcu": "stm32f469nih6"
+    "mcu": "stm32f469nih6",
+    "zephyr": {
+       "variant": "stm32f469i_disco"
+    }
   },
   "connectivity": [
     "can"
@@ -20,8 +23,10 @@
     "svd_path": "STM32F46_79x.svd"
   },
   "frameworks": [
+    "cmsis",
     "mbed",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "ST 32F469IDISCOVERY",
   "upload": {

diff --git a/boards/disco_f723ie.json b/boards/disco_f723ie.json
@@ -3,7 +3,10 @@
     "cpu": "cortex-m7",
     "extra_flags": "-DSTM32F723xx",
     "f_cpu": "216000000L",
-    "mcu": "stm32f723iek6"
+    "mcu": "stm32f723iek6",
+    "zephyr": {
+       "variant": "stm32f723e_disco"
+    }
   },
   "connectivity": [
     "can",
@@ -21,7 +24,8 @@
     "svd_path": "STM32F7x3.svd"
   },
   "frameworks": [
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "32F723EDISCOVERY",
   "upload": {