Skip to content

Commit 345e31f

Browse files
author
Donatien Garnier
committed
Remove now unnecessary overrides for NRF targets
1 parent d721356 commit 345e31f

File tree

13 files changed

+22
-74
lines changed

13 files changed

+22
-74
lines changed

‎BLE_BatteryLevel/mbed_app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
"target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"]
1414
},
1515
"NRF52840_DK": {
16-
"target.features_add": ["BLE"],
17-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
18-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"]
16+
"target.features_add": ["BLE"]
1917
},
2018
"NRF52_DK": {
21-
"target.features_add": ["BLE"],
22-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
23-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"]
19+
"target.features_add": ["BLE"]
2420
}
2521
}
2622
}

‎BLE_Beacon/mbed_app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
"target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"]
1414
},
1515
"NRF52840_DK": {
16-
"target.features_add": ["BLE"],
17-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
18-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"]
16+
"target.features_add": ["BLE"]
1917
},
2018
"NRF52_DK": {
21-
"target.features_add": ["BLE"],
22-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
23-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"]
19+
"target.features_add": ["BLE"]
2420
}
2521
}
2622
}

‎BLE_Button/mbed_app.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,10 @@
3636
},
3737
"NRF52840_DK": {
3838
"target.features_add": ["BLE"],
39-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
40-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"],
4139
"ble_button_pin_name": "BUTTON1"
4240
},
4341
"NRF52_DK": {
4442
"target.features_add": ["BLE"],
45-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
46-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"],
4743
"ble_button_pin_name": "BUTTON1"
4844
},
4945
"MTB_UBLOX_NINA_B1": {

‎BLE_GAPButton/mbed_app.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,10 @@
3636
},
3737
"NRF52840_DK": {
3838
"target.features_add": ["BLE"],
39-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
40-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"],
4139
"ble_button_pin_name": "BUTTON1"
4240
},
4341
"NRF52_DK": {
4442
"target.features_add": ["BLE"],
45-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
46-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"],
4743
"ble_button_pin_name": "BUTTON1"
4844
},
4945
"MTB_UBLOX_NINA_B1": {

‎BLE_GattClient/mbed_app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
"target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"]
1414
},
1515
"NRF52840_DK": {
16-
"target.features_add": ["BLE"],
17-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
18-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"]
16+
"target.features_add": ["BLE"]
1917
},
2018
"NRF52_DK": {
21-
"target.features_add": ["BLE"],
22-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
23-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"]
19+
"target.features_add": ["BLE"]
2420
}
2521
}
2622
}

‎BLE_GattServer/mbed_app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
"target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"]
1414
},
1515
"NRF52840_DK": {
16-
"target.features_add": ["BLE"],
17-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
18-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"]
16+
"target.features_add": ["BLE"]
1917
},
2018
"NRF52_DK": {
21-
"target.features_add": ["BLE"],
22-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
23-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"]
19+
"target.features_add": ["BLE"]
2420
}
2521
}
2622
}

‎BLE_HeartRate/mbed_app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
"target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"]
1414
},
1515
"NRF52840_DK": {
16-
"target.features_add": ["BLE"],
17-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
18-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"]
16+
"target.features_add": ["BLE"]
1917
},
2018
"NRF52_DK": {
21-
"target.features_add": ["BLE"],
22-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
23-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"]
19+
"target.features_add": ["BLE"]
2420
}
2521
}
2622
}

‎BLE_LED/mbed_app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
"target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"]
1414
},
1515
"NRF52840_DK": {
16-
"target.features_add": ["BLE"],
17-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
18-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"]
16+
"target.features_add": ["BLE"]
1917
},
2018
"NRF52_DK": {
21-
"target.features_add": ["BLE"],
22-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
23-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"]
19+
"target.features_add": ["BLE"]
2420
}
2521
}
2622
}

‎BLE_LEDBlinker/mbed_app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
"target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"]
1414
},
1515
"NRF52840_DK": {
16-
"target.features_add": ["BLE"],
17-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
18-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"]
16+
"target.features_add": ["BLE"]
1917
},
2018
"NRF52_DK": {
21-
"target.features_add": ["BLE"],
22-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
23-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"]
19+
"target.features_add": ["BLE"]
2420
}
2521
}
2622
}

‎BLE_PeriodicAdvertising/mbed_app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
"target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"]
1414
},
1515
"NRF52840_DK": {
16-
"target.features_add": ["BLE"],
17-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
18-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"]
16+
"target.features_add": ["BLE"]
1917
},
2018
"NRF52_DK": {
21-
"target.features_add": ["BLE"],
22-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
23-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"]
19+
"target.features_add": ["BLE"]
2420
}
2521
}
2622
}

‎BLE_Privacy/mbed_app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
"target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"]
1414
},
1515
"NRF52840_DK": {
16-
"target.features_add": ["BLE"],
17-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
18-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"]
16+
"target.features_add": ["BLE"]
1917
},
2018
"NRF52_DK": {
21-
"target.features_add": ["BLE"],
22-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
23-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"]
19+
"target.features_add": ["BLE"]
2420
}
2521
}
2622
}

‎BLE_SM/mbed_app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
"target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"]
1414
},
1515
"NRF52840_DK": {
16-
"target.features_add": ["BLE"],
17-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
18-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"]
16+
"target.features_add": ["BLE"]
1917
},
2018
"NRF52_DK": {
21-
"target.features_add": ["BLE"],
22-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
23-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"]
19+
"target.features_add": ["BLE"]
2420
}
2521
}
2622
}

‎BLE_Thermometer/mbed_app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
"target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"]
1414
},
1515
"NRF52840_DK": {
16-
"target.features_add": ["BLE"],
17-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
18-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"]
16+
"target.features_add": ["BLE"]
1917
},
2018
"NRF52_DK": {
21-
"target.features_add": ["BLE"],
22-
"target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"],
23-
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"]
19+
"target.features_add": ["BLE"]
2420
}
2521
}
2622
}

0 commit comments

Comments
 (0)