c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use optional config to allow override flags in referenced project

Browse Source
This commit is contained in:
Peli de Halleux 2016-11-30 04:35:24 -08:00
parent 97066e1ba4
commit 8d37be7cbe
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/bluetooth/pxt.json
View File

@ -16,7 +16,13 @@
"config": { "config": {
"microbit-dal": { "microbit-dal": {
"bluetooth": { "bluetooth": {
"enabled": 1, "enabled": 1
}
}
},
"optionalConfig": {
"microbit-dal": {
"bluetooth": {
"private_addressing": 0, "private_addressing": 0,
"whitelist": 1, "whitelist": 1,
"advertising_timeout": 0, "advertising_timeout": 0,
@ -25,19 +31,13 @@
"event_service": 1, "event_service": 1,
"device_info_service": 1, "device_info_service": 1,
"eddystone_url": 1, "eddystone_url": 1,
"eddystone_uid": 0 "eddystone_uid": 0,
},
"gatt_table_size": "0x700"
}
},
"optionalConfig": {
"microbit-dal": {
"bluetooth": {
"pairing_mode": 1, "pairing_mode": 1,
"open": 0, "open": 0,
"security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM" "security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM"
} }
} },
"gatt_table_size": "0x700"
} }
}, },
"installedVersion": "vzlhfd" "installedVersion": "vzlhfd"

3
libs/core/pxt.json
View File

@ -42,8 +42,7 @@
"public": true, "public": true,
"dependencies": {}, "dependencies": {},
"yotta": { "yotta": {
"configIsJustDefaults": true, "optionalConfig": {
"config": {
"microbit-dal": { "microbit-dal": {
"bluetooth": { "bluetooth": {
"enabled": 0 "enabled": 0