Merge pull request #956 from screamerbg/master

nRF51822/nRF51-DK bootloader compile support and related platforms

Author: 0xc0170

libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/nrf51822_bootloader.hex

@@ -0,0 +1,29 @@
+#include "mbed.h"
+#include "test_env.h"
+
+AnalogIn pot1(A0);
+AnalogIn pot2(A1);
+
+#define TEST_ITERATIONS     20
+#define MEASURE_MIN         0.01
+
+int main(void) {
+    MBED_HOSTTEST_TIMEOUT(10);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(AnalogIn potentiometer test);
+    MBED_HOSTTEST_START("analog_pot");
+
+    bool result = false;
+    float val1, val2;
+    
+    for (int i = 0; i < TEST_ITERATIONS; i++) {
+        val1 = pot1.read();
+        val2 = pot2.read();
+        
+        const char *succes_str = val1 > MEASURE_MIN || val2 > MEASURE_MIN ? "[OK]" : "[FAIL]";
+        result = result || (val1 > MEASURE_MIN || val2 > MEASURE_MIN);
+        printf("Pot values %f, %f\r\n", val1, val2);
+        wait(0.001);
+    }
+    MBED_HOSTTEST_RESULT(result);
+}

libraries/tests/mbed/analog_pot/main.cpp

@@ -25,7 +25,8 @@ TMP102 temperature(p28, p27, 0x90);
       defined(TARGET_NUCLEO_F411RE) || \
       defined(TARGET_NUCLEO_L053R8) || \
       defined(TARGET_NUCLEO_L152RE) || \
-      defined(TARGET_LPC824)
+      defined(TARGET_LPC824) || \
+      defined(TARGET_FF_ARDUINO)
 TMP102 temperature(I2C_SDA, I2C_SCL, 0x90);
 
 #else

libraries/tests/mbed/i2c_TMP102/main.cpp

@@ -69,7 +69,8 @@ I2C i2c(I2C_SDA0, I2C_SCL0);
       defined(TARGET_NUCLEO_F401RE) || \
       defined(TARGET_NUCLEO_F411RE) || \
       defined(TARGET_NUCLEO_L053R8) || \
-      defined(TARGET_NUCLEO_L152RE)
+      defined(TARGET_NUCLEO_L152RE) || \
+      defined(TARGET_FF_ARDUINO)
 I2C i2c(I2C_SDA, I2C_SCL);
 
 #else

libraries/tests/mbed/i2c_eeprom_line/main.cpp

@@ -9,13 +9,18 @@ MMA7660 MMA(p28, p27);
 #endif
 
 int main() {
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(I2C MMA7660 accelerometer);
+    MBED_HOSTTEST_START("MBED_A13");
+
     if (!MMA.testConnection())
-        notify_completion(false);
+        MBED_HOSTTEST_RESULT(false);
 
     for(int i = 0; i < 5; i++) {
         printf("x: %f, y: %f, z: %f\r\n", MMA.x(), MMA.y(), MMA.z());
         wait(0.2);
     }
 
-    notify_completion(true);
+    MBED_HOSTTEST_RESULT(true);
 }

libraries/tests/mbed/i2c_mma7660/main.cpp

@@ -616,6 +616,7 @@ def __init__(self):
         self.core = "Cortex-M4F"
         self.extra_labels = ['STM', 'STM32F4', 'STM32F407', 'STM32F407VG']
         self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
+        self.supported_form_factors = ["ARDUINO"]
 
     def program_cycle_s(self):
         return 2
@@ -723,6 +724,7 @@ def __init__(self):
         self.supported_form_factors = ["ARDUINO"]
 
 
+
 ### Nordic ###
 
 class NRF51822(Target):
@@ -742,8 +744,10 @@ class NRF51822(Target):
             'offset' : 0x14000
         }
     ]
+    EXPECTED_BOOTLOADER_FILENAME = "nrf51822_bootloader.hex"
     OUTPUT_EXT = 'hex'
     MERGE_SOFT_DEVICE = True
+    MERGE_BOOTLOADER = False
 
     def __init__(self):
         Target.__init__(self)
@@ -762,31 +766,50 @@ def init_hooks(self, hook, toolchain_name):
 
     @staticmethod
     def binary_hook(t_self, resources, elf, binf):
+        # Scan to find the actual paths of soft device and bootloader files
+        sdf = None
+        blf = None
         for hexf in resources.hex_files:
-            found = False
-            for softdeviceAndOffsetEntry in NRF51822.EXPECTED_SOFTDEVICES_WITH_OFFSETS:
-                if hexf.find(softdeviceAndOffsetEntry['name']) != -1:
-                    found = True
-                    break
-            if found:
-                break
-        else:
+            if hexf.find(t_self.target.EXPECTED_BOOTLOADER_FILENAME) != -1:
+                blf = hexf
+            else:
+                for softdeviceAndOffsetEntry in t_self.target.EXPECTED_SOFTDEVICES_WITH_OFFSETS:
+                    if hexf.find(softdeviceAndOffsetEntry['name']) != -1:
+                        sdf = hexf
+                        break
+
+        if sdf is None:
             t_self.debug("Hex file not found. Aborting.")
             return
 
         # Merge user code with softdevice
-        t_self.debug("Patching Hex file %s" % softdeviceAndOffsetEntry['name'])
         from intelhex import IntelHex
         binh = IntelHex()
         binh.loadbin(binf, offset=softdeviceAndOffsetEntry['offset'])
 
         if t_self.target.MERGE_SOFT_DEVICE is True:
-            sdh = IntelHex(hexf)
+            t_self.debug("Merge SoftDevice file %s" % softdeviceAndOffsetEntry['name'])
+            sdh = IntelHex(sdf)
             binh.merge(sdh)
 
+        if t_self.target.MERGE_BOOTLOADER is True and blf is not None:
+            t_self.debug("Merge BootLoader file %s" % t_self.target.EXPECTED_BOOTLOADER_FILENAME)
+            blh = IntelHex(blf)
+            binh.merge(blh)
+
         with open(binf.replace(".bin", ".hex"), "w") as f:
             binh.tofile(f, format='hex')
 
+class NRF51822_BOOT(NRF51822):
+    def __init__(self):
+        NRF51822.__init__(self)
+        self.core = "Cortex-M0"
+        self.extra_labels = ["NORDIC", "NRF51822_MKIT", "MCU_NRF51822", "MCU_NORDIC_16K", "NRF51822"]
+        self.macros = ['TARGET_NRF51822', 'TARGET_OTA_ENABLED']
+        self.supported_toolchains = ["ARM", "GCC_ARM"]
+        self.MERGE_SOFT_DEVICE = True
+        self.MERGE_BOOTLOADER = True
+
 class NRF51822_OTA(NRF51822):
     def __init__(self):
         NRF51822.__init__(self)
@@ -803,6 +826,16 @@ def __init__(self):
         self.macros = ['TARGET_NRF51822']
         self.supported_form_factors = ["ARDUINO"]
 
+class NRF51_DK_BOOT(NRF51822):
+    def __init__(self):
+        NRF51822.__init__(self)
+        self.core = "Cortex-M0"
+        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_32K', 'NRF51_DK']
+        self.macros = ['TARGET_NRF51822', 'TARGET_NRF51_DK', 'TARGET_OTA_ENABLED']
+        self.supported_toolchains = ["ARM", "GCC_ARM"]
+        self.MERGE_SOFT_DEVICE = True
+        self.MERGE_BOOTLOADER = True
+        
 class NRF51_DK_OTA(NRF51822):
     def __init__(self):
         NRF51822.__init__(self)
@@ -831,10 +864,18 @@ def __init__(self):
         self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
         self.macros = ['TARGET_NRF51822']
 
+class SEEED_TINY_BLE_BOOT(NRF51822):
+    def __init__(self):
+        NRF51822.__init__(self)
+        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K', 'SEEED_TINY_BLE']
+        self.macros = ['TARGET_NRF51822', 'TARGET_SEEED_TINY_BLE', 'TARGET_OTA_ENABLED']
+        self.MERGE_SOFT_DEVICE = True
+        self.MERGE_BOOTLOADER = True
+
 class SEEED_TINY_BLE_OTA(NRF51822):
     def __init__(self):
         NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
+        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K', 'SEEED_TINY_BLE']
         self.macros = ['TARGET_NRF51822', 'TARGET_SEEED_TINY_BLE', 'TARGET_OTA_ENABLED']
         self.MERGE_SOFT_DEVICE = False
 
@@ -890,6 +931,12 @@ def __init__(self):
         self.core = "Cortex-M0"
         self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K', 'DELTA_DFCM_NNN40']
         self.MERGE_SOFT_DEVICE = False
+class DELTA_DFCM_NNN40_OTA(NRF51822):
+    def __init__(self):
+        NRF51822.__init__(self)
+        self.core = "Cortex-M0"
+        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K', 'DELTA_DFCM_NNN40']
+        self.MERGE_SOFT_DEVICE = False
 
 
 ### ARM ###
@@ -1046,13 +1093,16 @@ def program_cycle_s(self):
 
     ### Nordic ###
     NRF51822(),
+    NRF51822_BOOT(), # nRF51822
     NRF51822_OTA(), # nRF51822
     NRF51_DK(),
+    NRF51_DK_BOOT(), # nRF51822
     NRF51_DK_OTA(), # nRF51822
     NRF51_DONGLE(),
     ARCH_BLE(),     # nRF51822
-    SEEED_TINY_BLE(),
-    SEEED_TINY_BLE_OTA(),
+    SEEED_TINY_BLE(), # nRF51822
+    SEEED_TINY_BLE_BOOT(),# nRF51822
+    SEEED_TINY_BLE_OTA(),# nRF51822
     HRM1017(),      # nRF51822
     RBLAB_NRF51822(),# nRF51822
     RBLAB_BLENANO(),# nRF51822

workspace_tools/targets.py

@@ -59,6 +59,9 @@
       * LPC1*: (p17   <-> p18 )
       * KL25Z: (PTE30 <-> PTC2)
 
+  * analog_pot (AnalogIn):
+      * Arduino headers: (A0, A1)
+      
   * SD (SPI):
       * LPC1*: (mosi=p11 , miso=p12 , sclk=p13 , cs=p14 )
       * KL25Z: (mosi=PTD2, miso=PTD3, sclk=PTD1, cs=PTD0)
@@ -72,6 +75,7 @@
   * i2c_eeprom:
       * LPC1*: (SDA=p28 , SCL=p27)
       * KL25Z: (SDA=PTE0, SCL=PTE1)
+      
 """
 TESTS = [
     # Automated MBED tests
@@ -165,9 +169,10 @@
         "peripherals": ["SD"]
     },
     {
-        "id": "MBED_A13", "description": "I2C MMA7660",
+        "id": "MBED_A13", "description": "I2C MMA7660 accelerometer",
         "source_dir": join(TEST_DIR, "mbed", "i2c_MMA7660"),
         "dependencies": [MBED_LIBRARIES, TEST_MBED_LIB, join(PERIPHERALS, 'MMA7660')],
+        "automated": True,
         "peripherals": ["MMA7660"]
     },
     {
@@ -251,6 +256,14 @@
         "automated": True,
         "duration": 10,
     },
+    {
+        "id": "MBED_A26", "description": "AnalogIn potentiometer test",
+        "source_dir": join(TEST_DIR, "mbed", "analog_pot"),
+        "dependencies": [MBED_LIBRARIES, TEST_MBED_LIB],
+        "peripherals": ["analog_pot"],
+        "automated": True,
+        "duration": 10,
+    },
     {
         "id": "MBED_BLINKY", "description": "Blinky",
         "source_dir": join(TEST_DIR, "mbed", "blinky"),