Merge pull request #156 from ARMmbed/fix-ci

pan- · web-flow · commit ca1830e051b4 · 2018-06-07T14:03:06.000+01:00
Fix compilation in CI
diff --git a/BLE_GAP/.mbed b/BLE_GAP/.mbed
@@ -0,0 +1 @@
+ROOT=.
diff --git a/BLE_GattServer/BLEProcess.h b/BLE_GattServer/BLEProcess.h
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "events/Eventqueue.h"
+#include "events/EventQueue.h"
 #include "platform/Callback.h"
 #include "platform/NonCopyable.h"
 
diff --git a/BLE_GattServer/main.cpp b/BLE_GattServer/main.cpp
@@ -17,7 +17,7 @@
 #include <stdio.h>
 
 #include "platform/Callback.h"
-#include "events/Eventqueue.h"
+#include "events/EventQueue.h"
 #include "platform/NonCopyable.h"
 
 #include "ble/BLE.h"
diff --git a/BLE_Privacy/mbed_app.json b/BLE_Privacy/mbed_app.json
@@ -1,8 +1,5 @@
 {
     "target_overrides": {
-        "K64F": {
-            "target.features_add": ["BLE"],
-            "target.extra_labels_add": ["ST_BLUENRG"]
-        }
+
     }
 }
diff --git a/BLE_SM/mbed_app.json b/BLE_SM/mbed_app.json
@@ -2,7 +2,7 @@
     "target_overrides": {
         "K64F": {
             "target.features_add": ["BLE"],
-            "target.extra_labels_add": ["ST_BLUENRG"]
+            "target.extra_labels_add": ["ST_BLUENRG", "CORDIO"]
         },
         "NUCLEO_F401RE": {
             "target.features_add": ["BLE"],

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"target_overrides": {`
`3`		`- "K64F": {`
`4`		`- "target.features_add": ["BLE"],`
`5`		`- "target.extra_labels_add": ["ST_BLUENRG"]`
`6`		`- }`
	`3`	`+`
`7`	`4`	`}`
`8`	`5`	`}`