Update to Mbed OS 6.14.0 & update config and examples.

All changes required due to the Mbed OS v6 changes.

Author: microbit-carlos

.mbedignore

@@ -1,30 +1 @@
 examples/*
-
-# Uncomment the following entries to compile without RTOS
-# mbed-os/rtos/*
-# mbed-os/usb/*
-# mbed-os/features/cellular/*
-# mbed-os/features/cryptocell/*
-# mbed-os/features/FEATURE_BLE/*
-# mbed-os/features/FEATURE_CLIENT/*
-# mbed-os/features/FEATURE_COMMON_PAL/*
-# mbed-os/features/FEATURE_UVISOR/*
-# mbed-os/features/frameworks/*
-# mbed-os/features/net/*
-# mbed-os/features/netsocket/*
-# mbed-os/features/nanostack/*
-# mbed-os/features/nvstore/*
-# mbed-os/features/storage/*
-# mbed-os/features/device_key/*
-# mbed-os/features/lorawan/*
-# mbed-os/features/lwipstack/*
-# mbed-os/features/mbedtls/*
-# mbed-os/features/nanostack/*
-# mbed-os/features/netsocket/*
-# mbed-os/features/nfc/*
-# mbed-os/features/storage/*
-# mbed-os/features/unsupported/*
-# mbed-os/events/*
-# mbed-os/components/802.15.4_RF/*
-# mbed-os/components/storage/*
-# mbed-os/components/wifi/*

Makefile

@@ -21,17 +21,11 @@ This is a basic Mbed OS project for [micro:bit V2](https://microbit.org/new-micr
 
 - git
 - [Arm GCC](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads)
-
-**Mbed only requirements:**
+    - v9.3.1 is the last tested version 
 - Python 3
 - pip (version >= 10.0)
-- Mercurial
 - [Mbed CLI](https://github.com/ARMmbed/mbed-cli)
-    - Last tested version is 1.10.2
-
-**Make only requirements:**
-- srec_cat
-- Make
+    - v1.10.2 is last tested version
 
 
 ## Using Mbed
@@ -41,7 +35,7 @@ This is a basic Mbed OS project for [micro:bit V2](https://microbit.org/new-micr
 Install mbed-cli using one of the methods from the official documentation:
 https://os.mbed.com/docs/mbed-os/v5.12/tools/developing-mbed-cli.html
 
-The manual installation (in a Python 2 virtual environment) is the prefer method.
+The manual installation (in a Python 3 virtual environment) is the prefer method.
 
 ### Multiple targets
 
@@ -65,25 +59,6 @@ targets.
 The version of the board can be seen on the silkscreen at the back, near the
 right side of the edge connector.
 
-### Mbed OS Version
-
-We are currently locked to
-[v5.12.4](https://github.com/ARMmbed/mbed-os/releases/tag/mbed-os-5.12.4) as
-this is the last version to support Soft Device, which has been dropped in
-[v5.13+](https://github.com/ARMmbed/mbed-os/releases/tag/mbed-os-5.13.0):
-
-> Default to Cordio BLE stack for NRF52* targets
-> [10709](https://github.com/ARMmbed/mbed-os/pull/10709)
-> 
-> Starting with mbed-os 5.13 and the introduction of Nordic SDK V15, Nordic
-> SoftDevice Bluetooth stack is not supported. Bluetooth remains supported with
-> the help of Arm's Cordio stack.
-
-### Mbed OS RTOS
-
-To compile the project without the Mbed OS RTOS edit the `.mbedignore` and
-uncomment all the entries.
-
 ### Initialise
 
 Note that for the `mbed target ...` line you should select the right target
@@ -130,73 +105,45 @@ mbed compile -m nrf52_microbit_v2 -t GCC_ARM
 
 Build output can be found in: `./BUILD/NRF52_MICROBIT_V2/GCC_ARM/mbedos-microbit-v2-starter.hex`
 
-If `mbed` cannot find the tools directory in mbed-os, then you may have to delete the mbed cache by removing `~/.mbed/`.
-
-
-## Using Make (back up option only)
+If `mbed` cannot find the tools directory in mbed-os, then you may have to
+delete the mbed cache by removing `~/.mbed/`.
 
-The use of the Makefile is discouraged, and it is here only as a back up
-mechanism to compile the Mbed project.
-As the MakeFile is created based on the mbed project and some manual patches
-have to be applied, it is likely this method will fall behind compared the mbed
-method.
-
-### Single target
-
-Only the latest target is supported in the Makefile.
-
-At the time of writing this would be v1.43.4 boards. Since the v1.44, v1.45,
-v1.46, v1.47 board updates does not affect the target configuration there was
-no need to regenerate the Makefile.
-
-### Initialise
-
-```
-git clone https://github.com/microbit-foundation/mbedos-microbit-v2-starter.git
-cd mbedos-microbit-v2-starter
-git clone https://github.com/ARMmbed/mbed-os.git
-```
-
-Then open the `mbed-os.lib` file with a text editor, it should have something
-like this:
-
-```
-https://github.com/ARMmbed/mbed-os/#73f096399b4cda1f780b140c87afad9446047432
-```
-
-The sequence after the `#` is the git commit needed of mbed-os, so:
-
-```
-cd mbed-os
-git reset --hard <commit_hash_here>
-```
-
-### Build
-
-From the `mbedos-microbit-v2-starter` folder run:
-
-```
-make
-```
+### Mbed OS Version
 
-Build output can be found in: `./BUILD/mbedos-microbit-v2-starter-combined.hex`
+This repo is currently configured Mbed OS to version
+[6.13.0]((https://github.com/ARMmbed/mbed-os/releases/tag/mbed-os-6.14.0)).
 
-### Regenerate Makefile
+The branch `xxxx` (commit `6adcd80982dbf5c2a2ef876d21d0f4a08db91644`) is
+configured to [v5.12.4](https://github.com/ARMmbed/mbed-os/releases/tag/mbed-os-5.12.4),
+as this is the last Mbed OS version to support Soft Device.
 
-The Makefile can be regenerated using mbed-cli, however keep in mind that there
-has been changes applied (the file header contains more information), and
-some of those changes (and the header info) might need to be preserved in the
-new regenerated version.
+### Mbed OS RTOS
 
-```
-mbed-cli export -i GCC_ARM -m nrf52_microbit_v2 --profile develop
+This section needs to be updated to work with the Mbed OS v6 bare metal
+profile.
+
+mbed_app.json:
+```
+{
+    "requires": [
+        "bare-metal",
+        "drivers-usb",
+        "events"
+    ],
+    "target_overrides": {
+        "*": {
+            "target.c_lib": "small"
+        }
+    }
+}
 ```
 
 
 ## Visual Studio Code
 
 At the moment we have the default config files from the Mbed online compiler
-project exporter. These are using `make` but could be updated to use `mbed-cli`.
+project exporter. These are using removed `make` and have to be updated to use
+`mbed-cli`.
 
 
 ## Using NFC
@@ -207,18 +154,10 @@ as they are exposed via the Edge Connector to be used as normal GPIOs.
 To change this and use them for NFC you can perform the following changes:
 - Mbed: Update the `mbed_app.json` file to include a remove macro entry in the micro:bit target.
     ```
-    "NRF52_MICROBIT_v1_44": {
+    "NRF52_MICROBIT_v2": {
         "target.macros_remove": ["CONFIG_NFCT_PINS_AS_GPIOS"]
     }
     ```
-- Makefile: Remove the following lines from the makefile.
-    ```
-    C_FLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS
-    ...
-    CXX_FLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS
-    ...
-    ASM_FLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS
-    ```
 
 
 ## License

README.md

@@ -174,8 +174,8 @@ typedef enum {
     RTS_PIN_NUMBER = p5,
 
     // mBed interface Pins
-    USBTX = TX_PIN_NUMBER,
-    USBRX = RX_PIN_NUMBER,
+    CONSOLE_TX = TX_PIN_NUMBER,
+    CONSOLE_RX = RX_PIN_NUMBER,
     STDIO_UART_TX = TX_PIN_NUMBER,
     STDIO_UART_RX = RX_PIN_NUMBER,
     STDIO_UART_CTS = CTS_PIN_NUMBER,

TARGET_NRF52833_DK/PinNames.h

@@ -122,11 +122,6 @@ typedef enum {
     P0_30 = p30,
     P0_31 = p31,
 
-    LED1    = p17,
-    LED2    = p18,
-    LED3    = p19,
-    LED4    = p20,
-
     // Buttons A and B
     BUTTON1 = P0_14,
     BUTTON2 = P0_15,
@@ -172,8 +167,8 @@ typedef enum {
     COMBINED_SENSOR_INT = P0_25,
 
     // mBed interface Pins
-    USBTX = TX_PIN_NUMBER,
-    USBRX = RX_PIN_NUMBER,
+    CONSOLE_TX = TX_PIN_NUMBER,
+    CONSOLE_RX = RX_PIN_NUMBER,
     STDIO_UART_TX = TX_PIN_NUMBER,
     STDIO_UART_RX = RX_PIN_NUMBER,
     STDIO_UART_CTS = CTS_PIN_NUMBER,

TARGET_NRF52_MICROBIT_v1_41/PinNames.h

@@ -156,9 +156,6 @@ typedef enum {
     P1_14 = p46,
     P1_15 = p47,
 
-    // LED in the nRF52833 DK board
-    LED1 = P0_13,
-
     // Buttons A and B
     BUTTON1 = P0_14,
     BUTTON2 = P0_23,
@@ -203,8 +200,8 @@ typedef enum {
     RTS_PIN_NUMBER = p5,
 
     // mBed interface Pins
-    USBTX = TX_PIN_NUMBER,
-    USBRX = RX_PIN_NUMBER,
+    CONSOLE_TX = TX_PIN_NUMBER,
+    CONSOLE_RX = RX_PIN_NUMBER,
     STDIO_UART_TX = TX_PIN_NUMBER,
     STDIO_UART_RX = RX_PIN_NUMBER,
     STDIO_UART_CTS = CTS_PIN_NUMBER,

TARGET_NRF52_MICROBIT_v1_43/PinNames.h

@@ -95,16 +95,5 @@
     },
     "NRF52_MICROBIT_v2": {
         "inherits": ["NRF52_MICROBIT_v1_43"]
-    },
-    "NRF52_MICROBIT_v2_NOSD": {
-        "inherits": ["NRF52_MICROBIT_v1_43"],
-        "extra_labels_remove": [
-            "NORDIC_SOFTDEVICE",
-            "SOFTDEVICE_COMMON",
-            "SOFTDEVICE_S140_FULL"
-        ],
-        "extra_labels_add": [
-            "SOFTDEVICE_NONE"
-        ]
     }
 }

custom_targets.json

@@ -43,11 +43,17 @@
 #endif
 
 
+BufferedSerial pc(CONSOLE_TX, CONSOLE_RX, 115200);
+
+FileHandle *mbed::mbed_override_console(int fd) {
+    return &pc;
+}
+
 int main(void) {
     // Initialise the serial
-    Serial pc(USBTX, USBRX);
-    pc.baud(115200);
-    pc.printf("Starting programme.\n");
+    
+    char start_str[] = "Starting programme.\n";
+    pc.write(start_str, strlen(start_str));
 
     DevI2C i2c(I2C_SDA0, I2C_SCL0);
     // This is an open drain combined interrupt line, not used in this example
@@ -60,7 +66,8 @@ int main(void) {
     FXOS8700QAccelerometer accFxos(i2c, FXOS_ADDR);
     FXOS8700QMagnetometer magFxos(i2c, FXOS_ADDR);
     if ((accFxos.whoAmI() != 0xC7) || (magFxos.whoAmI() != 0xC7)) {
-        pc.printf("Error reading the FXOS8700 Who Am I register.\n");
+        char msg[] = "Error reading the FXOS8700 Who Am I register.\n";
+        pc.write(msg, strlen(msg));
         for(;;);
     }
     accFxos.enable();
@@ -74,11 +81,13 @@ int main(void) {
     uint8_t whoAmIAccVal = 0;
     uint8_t whoAmIMagVal = 0;
     if ((magLsm.read_id(&whoAmIMagVal) != 0) || (whoAmIMagVal != 0x40)) {
-        pc.printf("Error reading the LSM303 Mag Who Am I register.\n");
+        char msg[] = "Error reading the LSM303 Mag Who Am I register.\n";
+        pc.write(msg, strlen(msg));
         for(;;);
     }
     if ((accLsm.read_id(&whoAmIAccVal) != 0) || (whoAmIAccVal != 0x33)) {
-        pc.printf("Error reading the LSM303 Acc Who Am I register.\n");
+        char msg[] = "Error reading the LSM303 Acc Who Am I register.\n";
+        pc.write(msg, strlen(msg));
         for(;;);
     }
     accLsm.init(NULL);
@@ -94,16 +103,16 @@ int main(void) {
 #ifdef FXOS_PRESENT
         accFxos.getAxis(accFxosData);
         magFxos.getAxis(magFxosData);
-        pc.printf("FXOS Acc: [X:%d] [Y:%d] [Z:%d]\n", accFxosData.x, accFxosData.y, accFxosData.z);
-        pc.printf("FXOS Mag: [X:%d] [Y:%d] [Z:%d]\n", magFxosData.x, magFxosData.y, magFxosData.z);
+        printf("FXOS Acc: [X:%d] [Y:%d] [Z:%d]\n", accFxosData.x, accFxosData.y, accFxosData.z);
+        printf("FXOS Mag: [X:%d] [Y:%d] [Z:%d]\n", magFxosData.x, magFxosData.y, magFxosData.z);
 #endif
 #ifdef LSM_PRESENT
         accLsm.get_x_axes(accLsmData);
         magLsm.get_m_axes(magLsmData);
-        pc.printf("\nLSM  Acc: [X:%d] [Y:%d] [Z:%d]\n", accLsmData[0], accLsmData[1], accLsmData[2]);
-        pc.printf("LSM  Mag: [X:%d] [Y:%d] [Z:%d]\n", magLsmData[0], magLsmData[1], magLsmData[2]);
+        printf("\nLSM  Acc: [X:%d] [Y:%d] [Z:%d]\n", accLsmData[0], accLsmData[1], accLsmData[2]);
+        printf("LSM  Mag: [X:%d] [Y:%d] [Z:%d]\n", magLsmData[0], magLsmData[1], magLsmData[2]);
 #endif
-        pc.printf("---------\n");
+        printf("---------\n");
         nrf_delay_ms(500);
     }
 }

examples/sensors.cpp

@@ -16,16 +16,19 @@
  */
 #include "mbed.h"
 
-int main(void) {
-    Serial pc(USBTX, USBRX);
-    pc.baud(115200);
-    pc.printf("hello world!\n");
+static UnbufferedSerial pc_serial(USBTX, USBRX, 115200);
 
-    // Echo back
-    while (true) {
-        while (pc.readable()) {
-            uint32_t val = pc.getc();
-            pc.putc(val);
-        }
+void rx_irq() {
+    char single_byte;
+    // Echo each byte received
+    if (pc_serial.read(&single_byte, 1)) {
+        pc_serial.write(&single_byte, 1);
     }
 }
+
+int main(void) {
+    char hello[] = "hello world!\n";
+    size_t hello_size = sizeof(hello) / sizeof(hello[0]);
+    pc_serial.write(hello, hello_size);
+    pc_serial.attach(&rx_irq, SerialBase::RxIrq);
+}

examples/serial.cpp

@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#73f096399b4cda1f780b140c87afad9446047432
+https://github.com/ARMmbed/mbed-os/#d147abc3e556c58e5e343d34b729bc2192e18bd3