Capitalise all targets & set TARGET_NRF52_MICROBIT_V2 the main target.

Author: microbit-carlos

README.md

@@ -157,7 +157,7 @@ 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_v2": {
+    "NRF52_MICROBIT_V2": {
         "target.macros_remove": ["CONFIG_NFCT_PINS_AS_GPIOS"]
     }
     ```

TARGET_MCU_NRF52833/README.md

@@ -16,14 +16,14 @@ https://github.com/microbit-foundation/mbedos-microbit-v2-starter/pull/12#issuec
 Things we tried, and didn't work, to reduce the flash and RAM without having a
 custom linker file:
 
-- Tried adding `"NRF52_MICROBIT_v1_43": { "overrides": { "target.restrict_size": "0x40000" } }`
+- Tried adding `"NRF52_MICROBIT_V1_43": { "overrides": { "target.restrict_size": "0x40000" } }`
   in `custom_targets.json`, didn't seem to produce a different hex file.
-- However adding `"NRF52_MICROBIT_v1_43": { "target.restrict_size": "0x40000" }`
+- However adding `"NRF52_MICROBIT_V1_43": { "target.restrict_size": "0x40000" }`
   to the `mbed_app.json` file did produce a different hex file, so we assume
   it works?
-- Tried adding ` "NRF52_MICROBIT_v1_43": { "macros_add": ["MBED_RAM_SIZE=0x20000"]}`
+- Tried adding ` "NRF52_MICROBIT_V1_43": { "macros_add": ["MBED_RAM_SIZE=0x20000"]}`
   in `custom_targets.json` but didn't work (nRF52833 didn't do anything).
-- Tried adding `"NRF52_MICROBIT_v1_43": { "target.macros_add": ["MBED_RAM_SIZE=0x20000""] }`
+- Tried adding `"NRF52_MICROBIT_V1_43": { "target.macros_add": ["MBED_RAM_SIZE=0x20000""] }`
   in `mbed_app.json`, but didn't work either (nRF52833 didn't do anything).
 
 

TARGET_NRF52_MICROBIT_v1_43/PinNames.h renamed to TARGET_NRF52_MICROBIT_V2/PinNames.h

@@ -29,7 +29,7 @@
         ],
         "device_has_remove": ["ITM"]
     },
-    "NRF52_MICROBIT_v1_43": {
+    "NRF52_MICROBIT_V2": {
         "inherits": ["MCU_NRF52833"],
         "macros_add": [
             "WSF_MAX_HANDLERS=10",
@@ -55,23 +55,23 @@
             "lf_clock_src": "NRF_LF_SRC_RC"
         }
     },
-    "NRF52_MICROBIT_v1_44": {
-        "inherits": ["NRF52_MICROBIT_v1_43"]
+    "NRF52_MICROBIT_V1_43": {
+        "inherits": ["NRF52_MICROBIT_V2"]
     },
-    "NRF52_MICROBIT_v1_45": {
-        "inherits": ["NRF52_MICROBIT_v1_43"]
+    "NRF52_MICROBIT_V1_44": {
+        "inherits": ["NRF52_MICROBIT_V2"]
     },
-    "NRF52_MICROBIT_v1_46": {
-        "inherits": ["NRF52_MICROBIT_v1_43"]
+    "NRF52_MICROBIT_V1_45": {
+        "inherits": ["NRF52_MICROBIT_V2"]
     },
-    "NRF52_MICROBIT_v1_47": {
-        "inherits": ["NRF52_MICROBIT_v1_43"]
+    "NRF52_MICROBIT_V1_46": {
+        "inherits": ["NRF52_MICROBIT_V2"]
     },
-    "NRF52_MICROBIT_v2": {
-        "inherits": ["NRF52_MICROBIT_v1_43"]
+    "NRF52_MICROBIT_V1_47": {
+        "inherits": ["NRF52_MICROBIT_V2"]
     },
     "NRF52_MICROBIT_V2_IF_820": {
-        "inherits": ["NRF52_MICROBIT_v1_43"],
+        "inherits": ["NRF52_MICROBIT_V2"],
         "core": "Cortex-M4",
         "extra_labels_remove": [
         ],

TARGET_NRF52_MICROBIT_v1_43/README.md renamed to TARGET_NRF52_MICROBIT_V2/README.md

@@ -25,13 +25,16 @@
 
 
 // Different boards have different I2C addresses for the sensors
-#if defined(TARGET_NRF52_MICROBIT_v2)
+#if defined(TARGET_NRF52_MICROBIT_V1_43)
+    // All TARGET_NRF52_MICROBIT_V1_4x targets are based on TARGET_NRF52_MICROBIT_V2,
+    // so they all contain the TARGET_NRF52_MICROBIT_V2 macro as well.
+    // Make sure any conditional compilation checks first for the V1_4x defines
+    #define FXOS_ADDR (0x1F << 1)
+    #define FXOS_PRESENT 1
     #define LSM_ACC_ADDR (0x19 << 1)
     #define LSM_MAG_ADDR (0x1E << 1)
     #define LSM_PRESENT 1
-#elif defined(TARGET_NRF52_MICROBIT_v1_43)
-    #define FXOS_ADDR (0x1F << 1)
-    #define FXOS_PRESENT 1
+#elif defined(TARGET_NRF52_MICROBIT_V2)
     #define LSM_ACC_ADDR (0x19 << 1)
     #define LSM_MAG_ADDR (0x1E << 1)
     #define LSM_PRESENT 1
@@ -48,7 +51,7 @@ FileHandle *mbed::mbed_override_console(int fd) {
 
 int main(void) {
     // Initialise the serial
-    
+
     char start_str[] = "Starting programme.\n";
     pc.write(start_str, strlen(start_str));
 
@@ -100,7 +103,7 @@ int main(void) {
 #ifdef FXOS_PRESENT
         accFxos.getAxis(accFxosData);
         magFxos.getAxis(magFxosData);
-        printf("FXOS Acc: [X:%d] [Y:%d] [Z:%d]\n", accFxosData.x, accFxosData.y, accFxosData.z);
+        printf("\nFXOS 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

TARGET_NRF52_MICROBIT_v1_43/device.h renamed to TARGET_NRF52_MICROBIT_V2/device.h

@@ -7,17 +7,17 @@
         "NRF52833_DK": {
             "target.lf_clock_src": "NRF_LF_SRC_RC"
         },
-        "NRF52_MICROBIT_v1_43": {
+        "NRF52_MICROBIT_V1_43": {
         },
-        "NRF52_MICROBIT_v1_44": {
+        "NRF52_MICROBIT_V1_44": {
         },
-        "NRF52_MICROBIT_v1_45": {
+        "NRF52_MICROBIT_V1_45": {
         },
-        "NRF52_MICROBIT_v1_46": {
+        "NRF52_MICROBIT_V1_46": {
         },
-        "NRF52_MICROBIT_v1_47": {
+        "NRF52_MICROBIT_V1_47": {
         },
-        "NRF52_MICROBIT_v2": {
+        "NRF52_MICROBIT_V2": {
         },
         "NRF52_MICROBIT_V2_IF_820": {
         },