Merge pull request #4 from desmond-blue/feature_sdk15_add_ble

TacoGrandeTX · web-flow · commit 3971361b3b04 · 2018-12-14T12:24:32.000-05:00
Fix SoftDevice configuration on NRF52_DK
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/headers/nrf_nvic.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/headers/nrf_nvic.h
@@ -312,6 +312,7 @@ __STATIC_INLINE uint32_t __sd_nvic_is_app_accessible_priority(uint32_t priority)
   if(   priority == 0
      || priority == 1
      || priority == 4
+     || priority == 5
      )
   {
     return 0;
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/mbed_lib.json b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/mbed_lib.json
@@ -5,7 +5,7 @@
         "S132",
         "BLE_STACK_SUPPORT_REQD",
         "NRF_SDH_CLOCK_LF_XTAL_ACCURACY=7",
-        "NRF_SD_BLE_API_VERSION=5",
+        "NRF_SD_BLE_API_VERSION=6",
         "NRF_SDH_ENABLED=1",
         "NRF_SDH_BLE_ENABLED=1",
         "PEER_MANAGER_ENABLED=1",
@@ -35,8 +35,8 @@
         "*": {
             "target.bootloader_img": "hex/s132_nrf52_6.0.0_softdevice.hex",
             "target.app_offset": "0x26000",
-            "target.mbed_ram_start": "0x20001D70",
-            "target.mbed_ram_size": "0xE290"
+            "target.mbed_ram_start": "0x200032E8",
+            "target.mbed_ram_size": "0xCD18"
         }
     }
 }
diff --git a/targets/targets.json b/targets/targets.json
@@ -6538,6 +6538,7 @@
             "NRF5x",
             "NRF52",
             "SDK_15_0",
+            "NORDIC_SOFTDEVICE",
             "SOFTDEVICE_COMMON",
             "SOFTDEVICE_S132_FULL"
         ],

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@ __STATIC_INLINE uint32_t __sd_nvic_is_app_accessible_priority(uint32_t priority)`
`312`	`312`	`if( priority == 0`
`313`	`313`	`\|\| priority == 1`
`314`	`314`	`\|\| priority == 4`
	`315`	`+ \|\| priority == 5`
`315`	`316`	`)`
`316`	`317`	`{`
`317`	`318`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"S132",`
`6`	`6`	`"BLE_STACK_SUPPORT_REQD",`
`7`	`7`	`"NRF_SDH_CLOCK_LF_XTAL_ACCURACY=7",`
`8`		`- "NRF_SD_BLE_API_VERSION=5",`
	`8`	`+ "NRF_SD_BLE_API_VERSION=6",`
`9`	`9`	`"NRF_SDH_ENABLED=1",`
`10`	`10`	`"NRF_SDH_BLE_ENABLED=1",`
`11`	`11`	`"PEER_MANAGER_ENABLED=1",`
`@@ -35,8 +35,8 @@`
`35`	`35`	`"*": {`
`36`	`36`	`"target.bootloader_img": "hex/s132_nrf52_6.0.0_softdevice.hex",`
`37`	`37`	`"target.app_offset": "0x26000",`
`38`		`- "target.mbed_ram_start": "0x20001D70",`
`39`		`- "target.mbed_ram_size": "0xE290"`
	`38`	`+ "target.mbed_ram_start": "0x200032E8",`
	`39`	`+ "target.mbed_ram_size": "0xCD18"`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`