Update mbed framework to 6.2.0

dmpolukhin · Jul 23, 2020 · c742d6a · c742d6a
1 parent 5e545c6
commit c742d6a
Show file tree

Hide file tree

Showing 2,667 changed files with 73,081 additions and 446 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -15,13 +15,12 @@ jobs:
           - "examples/arduino-bluefruit-bleuart"
           - "examples/arduino-nina-b1-generic-example"
           - "examples/arduino-serial-plotter"
-          - "examples/mbed-ble-thermometer"
-          - "examples/mbed-blink"
-          - "examples/mbed-dsp"
-          - "examples/mbed-events"
-          - "examples/mbed-nfc"
-          - "examples/mbed-rtos"
-          - "examples/mbed-serial"
+          - "examples/mbed-rtos-ble-thermometer"
+          - "examples/mbed-rtos-blink-baremetal"
+          - "examples/mbed-rtos-nfc"
+          - "examples/mbed-legacy-examples/mbed-ble-thermometer"
+          - "examples/mbed-legacy-examples/mbed-nfc"
+          - "examples/mbed-legacy-examples/mbed-rtos"
           - "examples/zephyr-ble-beacon"
           - "examples/zephyr-blink"
           - "examples/zephyr-net-echo-client"

diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *.pyc
 .piolibdeps
+.pio
diff --git a/examples/mbed-blink/src/main.cpp b/examples/mbed-blink/src/main.cpp
diff --git a/examples/mbed-dsp/src/data.cpp b/examples/mbed-dsp/src/data.cpp
diff --git a/examples/mbed-dsp/src/main.cpp b/examples/mbed-dsp/src/main.cpp
diff --git a/examples/mbed-events/README.rst b/examples/mbed-events/README.rst
diff --git a/examples/mbed-events/platformio.ini b/examples/mbed-events/platformio.ini
diff --git a/examples/mbed-events/src/main.cpp b/examples/mbed-events/src/main.cpp
diff --git a/examples/mbed-ble-thermometer/.gitignore → ...-examples/mbed-ble-thermometer/.gitignore b/examples/mbed-ble-thermometer/.gitignore → ...-examples/mbed-ble-thermometer/.gitignore
diff --git a/examples/mbed-ble-thermometer/.travis.yml → ...examples/mbed-ble-thermometer/.travis.yml b/examples/mbed-ble-thermometer/.travis.yml → ...examples/mbed-ble-thermometer/.travis.yml
diff --git a/examples/mbed-dsp/README.rst → ...-examples/mbed-ble-thermometer/README.rst b/examples/mbed-dsp/README.rst → ...-examples/mbed-ble-thermometer/README.rst
@@ -20,7 +20,7 @@ How to build PlatformIO based project
 .. code-block:: bash
 
     # Change directory to example
-    > cd platform-nordicnrf52/examples/mbed-dsp
+    > cd platform-nordicnrf52/examples/mbed-legacy-examples/mbed-ble-thermometer
 
     # Build project
     > platformio run

diff --git a/examples/mbed-ble-thermometer/include/README → ...mples/mbed-ble-thermometer/include/README b/examples/mbed-ble-thermometer/include/README → ...mples/mbed-ble-thermometer/include/README
diff --git a/examples/mbed-ble-thermometer/lib/README → ...-examples/mbed-ble-thermometer/lib/README b/examples/mbed-ble-thermometer/lib/README → ...-examples/mbed-ble-thermometer/lib/README
diff --git a/examples/mbed-ble-thermometer/platformio.ini → ...mples/mbed-ble-thermometer/platformio.ini b/examples/mbed-ble-thermometer/platformio.ini → ...mples/mbed-ble-thermometer/platformio.ini
@@ -12,7 +12,8 @@ platform = nordicnrf52
 framework = mbed
 board = nrf52_dk
 build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
-
+platform_packages =
+    framework-mbed @ ~6.51504.0
 
 [env:delta_dfbm_nq620]
 platform = nordicnrf52

diff --git a/examples/mbed-ble-thermometer/src/main.cpp → ...xamples/mbed-ble-thermometer/src/main.cpp b/examples/mbed-ble-thermometer/src/main.cpp → ...xamples/mbed-ble-thermometer/src/main.cpp
diff --git a/examples/mbed-ble-thermometer/test/README → ...examples/mbed-ble-thermometer/test/README b/examples/mbed-ble-thermometer/test/README → ...examples/mbed-ble-thermometer/test/README
diff --git a/examples/mbed-blink/.gitignore → .../mbed-legacy-examples/mbed-nfc/.gitignore b/examples/mbed-blink/.gitignore → .../mbed-legacy-examples/mbed-nfc/.gitignore
diff --git a/examples/mbed-blink/.travis.yml → ...mbed-legacy-examples/mbed-nfc/.travis.yml b/examples/mbed-blink/.travis.yml → ...mbed-legacy-examples/mbed-nfc/.travis.yml
diff --git a/examples/mbed-nfc/README.rst → .../mbed-legacy-examples/mbed-nfc/README.rst b/examples/mbed-nfc/README.rst → .../mbed-legacy-examples/mbed-nfc/README.rst
@@ -20,7 +20,7 @@ How to build PlatformIO based project
 .. code-block:: bash
 
     # Change directory to example
-    > cd platform-nordicnrf52/examples/mbed-nfc
+    > cd platform-nordicnrf52/examples/mbed-legacy-examples/mbed-nfc
 
     # Build project
     > platformio run

diff --git a/examples/mbed-blink/include/README → ...d-legacy-examples/mbed-nfc/include/README b/examples/mbed-blink/include/README → ...d-legacy-examples/mbed-nfc/include/README
diff --git a/examples/mbed-blink/lib/README → .../mbed-legacy-examples/mbed-nfc/lib/README b/examples/mbed-blink/lib/README → .../mbed-legacy-examples/mbed-nfc/lib/README
diff --git a/examples/mbed-nfc/platformio.ini → ...d-legacy-examples/mbed-nfc/platformio.ini b/examples/mbed-nfc/platformio.ini → ...d-legacy-examples/mbed-nfc/platformio.ini
@@ -12,3 +12,5 @@ platform = nordicnrf52
 framework = mbed
 board = nrf52_dk
 build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
+platform_packages =
+    framework-mbed @ ~6.51504.0
diff --git a/examples/mbed-nfc/src/SmartPoster.cpp → ...acy-examples/mbed-nfc/src/SmartPoster.cpp b/examples/mbed-nfc/src/SmartPoster.cpp → ...acy-examples/mbed-nfc/src/SmartPoster.cpp
diff --git a/examples/mbed-nfc/src/SmartPoster.h → ...egacy-examples/mbed-nfc/src/SmartPoster.h b/examples/mbed-nfc/src/SmartPoster.h → ...egacy-examples/mbed-nfc/src/SmartPoster.h
diff --git a/examples/mbed-nfc/src/main.cpp → ...bed-legacy-examples/mbed-nfc/src/main.cpp b/examples/mbed-nfc/src/main.cpp → ...bed-legacy-examples/mbed-nfc/src/main.cpp
diff --git a/examples/mbed-blink/test/README → ...mbed-legacy-examples/mbed-nfc/test/README b/examples/mbed-blink/test/README → ...mbed-legacy-examples/mbed-nfc/test/README
diff --git a/examples/mbed-dsp/.gitignore → ...mbed-legacy-examples/mbed-rtos/.gitignore b/examples/mbed-dsp/.gitignore → ...mbed-legacy-examples/mbed-rtos/.gitignore
diff --git a/examples/mbed-dsp/.travis.yml → ...bed-legacy-examples/mbed-rtos/.travis.yml b/examples/mbed-dsp/.travis.yml → ...bed-legacy-examples/mbed-rtos/.travis.yml
diff --git a/examples/mbed-rtos/README.rst → ...mbed-legacy-examples/mbed-rtos/README.rst b/examples/mbed-rtos/README.rst → ...mbed-legacy-examples/mbed-rtos/README.rst
@@ -20,7 +20,7 @@ How to build PlatformIO based project
 .. code-block:: bash
 
     # Change directory to example
-    > cd platform-nordicnrf52/examples/mbed-rtos
+    > cd platform-nordicnrf52/examples/mbed-legacy-examples/mbed-rtos
 
     # Build project
     > platformio run

diff --git a/examples/mbed-dsp/include/README → ...-legacy-examples/mbed-rtos/include/README b/examples/mbed-dsp/include/README → ...-legacy-examples/mbed-rtos/include/README
diff --git a/examples/mbed-dsp/lib/README → ...mbed-legacy-examples/mbed-rtos/lib/README b/examples/mbed-dsp/lib/README → ...mbed-legacy-examples/mbed-rtos/lib/README
diff --git a/examples/mbed-rtos/platformio.ini → ...-legacy-examples/mbed-rtos/platformio.ini b/examples/mbed-rtos/platformio.ini → ...-legacy-examples/mbed-rtos/platformio.ini
@@ -7,11 +7,13 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
-[env:nrf52_dk]
+[env:nrf52840_dk]
 platform = nordicnrf52
 framework = mbed
-board = nrf52_dk
+board = nrf52840_dk
 build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
+platform_packages =
+    framework-mbed @ ~6.51504.0
 
 [env:delta_dfbm_nq620]
 platform = nordicnrf52

diff --git a/examples/mbed-rtos/src/main.cpp → ...ed-legacy-examples/mbed-rtos/src/main.cpp b/examples/mbed-rtos/src/main.cpp → ...ed-legacy-examples/mbed-rtos/src/main.cpp
diff --git a/examples/mbed-dsp/test/README → ...bed-legacy-examples/mbed-rtos/test/README b/examples/mbed-dsp/test/README → ...bed-legacy-examples/mbed-rtos/test/README
diff --git a/examples/mbed-events/.gitignore → ...ples/mbed-rtos-ble-thermometer/.gitignore b/examples/mbed-events/.gitignore → ...ples/mbed-rtos-ble-thermometer/.gitignore
diff --git a/examples/mbed-events/.travis.yml → ...les/mbed-rtos-ble-thermometer/.travis.yml b/examples/mbed-events/.travis.yml → ...les/mbed-rtos-ble-thermometer/.travis.yml
diff --git a/examples/mbed-blink/README.rst → ...ples/mbed-rtos-ble-thermometer/README.rst b/examples/mbed-blink/README.rst → ...ples/mbed-rtos-ble-thermometer/README.rst
@@ -20,7 +20,7 @@ How to build PlatformIO based project
 .. code-block:: bash
 
     # Change directory to example
-    > cd platform-nordicnrf52/examples/mbed-blink
+    > cd platform-nordicnrf52/examples/mbed-legacy-examples/mbed-rtos-ble-thermometer
 
     # Build project
     > platformio run

diff --git a/examples/mbed-events/include/README → .../mbed-rtos-ble-thermometer/include/README b/examples/mbed-events/include/README → .../mbed-rtos-ble-thermometer/include/README
diff --git a/examples/mbed-events/lib/README → ...ples/mbed-rtos-ble-thermometer/lib/README b/examples/mbed-events/lib/README → ...ples/mbed-rtos-ble-thermometer/lib/README
diff --git a/examples/mbed-rtos-ble-thermometer/mbed_app.json b/examples/mbed-rtos-ble-thermometer/mbed_app.json
@@ -0,0 +1,20 @@
+{
+    "target_overrides": {
+        "K64F": {
+            "target.components_add": ["BlueNRG_MS"],
+            "target.features_add": ["BLE"],
+            "target.extra_labels_add": ["CORDIO"]
+        },
+        "NUCLEO_F401RE": {
+            "target.components_add": ["BlueNRG_MS"],
+            "target.features_add": ["BLE"],
+            "target.extra_labels_add": ["CORDIO"]
+        },
+        "NRF52840_DK": {
+            "target.features_add": ["BLE"]
+        },
+        "NRF52_DK": {
+            "target.features_add": ["BLE"]
+        }
+    }
+}
diff --git a/examples/mbed-dsp/platformio.ini → .../mbed-rtos-ble-thermometer/platformio.ini b/examples/mbed-dsp/platformio.ini → .../mbed-rtos-ble-thermometer/platformio.ini
@@ -12,7 +12,7 @@ platform = nordicnrf52
 framework = mbed
 board = nrf52_dk
 
-[env:delta_dfbm_nq620]
+[env:nrf52840_dk]
 platform = nordicnrf52
 framework = mbed
-board = delta_dfbm_nq620
+board = nrf52840_dk