security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Committer:
LancasterUniversity
Date:
Wed Jul 13 12:18:05 2016 +0100
Revision:
27:2f494ead23de
Parent:
15:65509c60005c
Child:
28:379e18ebd43b
Synchronized with git rev 8875dc35
Author: James Devine
microbit-dal: added yotta configuration mappings to DAL specific configuration options.

Yotta can now be used to configure the configuration options for the
dal.

An full config.json looks like:

{
"microbit-dal":{
"bluetooth":{
"enabled": 1,
"pairing_mode": 0,
"private_addressing": 0,
"open": 0,
"whitelist": 1,
"advertising_timeout": 0,
"tx_power": 0,
"dfu_service": 1,
"event_service": 1,
"device_info_service": 1
},
"reuse_sd": 1,
"gatt_table_size": "0x300",
"heap_allocator": 1,
"nested_heap_proportion": 0.75,
"system_tick_period": 6,
"system_components": 10,
"idle_components": 6,
"use_accel_lsb": 0,
"min_display_brightness": 1,
"max_display_brightness": 255,
"display_scroll_speed": 120,
"display_scroll_stride": -1,
"display_print_speed": 400,
"panic_on_heap_full": 1,
"debug": 0,
"heap_debug": 0,
"stack_size":2048,
"sram_base":"0x20000008",
"sram_end":"0x20004000",
"sd_limit":"0x20002000",
"gatt_table_start":"0x20001900"
}
}

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Jonathan Austin 1:8aa5cdb4ab67 1 {
Jonathan Austin 1:8aa5cdb4ab67 2 "name": "microbit-dal",
Jonathan Austin 1:8aa5cdb4ab67 3 "version": "2.0.0-rc1",
Jonathan Austin 1:8aa5cdb4ab67 4 "license": "MIT",
Jonathan Austin 1:8aa5cdb4ab67 5 "description": "The runtime library for the BBC micro:bit, developed by Lancaster University",
Jonathan Austin 1:8aa5cdb4ab67 6 "keywords": [
Jonathan Austin 1:8aa5cdb4ab67 7 "mbed-classic",
Jonathan Austin 1:8aa5cdb4ab67 8 "microbit",
Jonathan Austin 1:8aa5cdb4ab67 9 "runtime",
Jonathan Austin 1:8aa5cdb4ab67 10 "library",
Jonathan Austin 1:8aa5cdb4ab67 11 "lancaster",
Jonathan Austin 1:8aa5cdb4ab67 12 "University"
Jonathan Austin 1:8aa5cdb4ab67 13 ],
Jonathan Austin 1:8aa5cdb4ab67 14 "author": "Joe Finney <j.finney@lancaster.ac.uk (mailto:j.finney@lancaster.ac.uk) >",
Jonathan Austin 1:8aa5cdb4ab67 15 "homepage": "https://github.com/lancaster-university/microbit-dal/",
Jonathan Austin 1:8aa5cdb4ab67 16 "dependencies": {
LancasterUniversity 15:65509c60005c 17 "mbed-classic": "lancaster-university/mbed-classic#microbit_hfclk+mb4",
Jonathan Austin 1:8aa5cdb4ab67 18 "ble": "lancaster-university/BLE_API#v2.5.0+mb3",
LancasterUniversity 13:8d33728584d9 19 "ble-nrf51822": "lancaster-university/nrf51822#v2.5.0+mb6",
LancasterUniversity 15:65509c60005c 20 "nrf51-sdk": "lancaster-university/nrf51-sdk#v2.2.0+mb4"
Jonathan Austin 1:8aa5cdb4ab67 21 },
Jonathan Austin 1:8aa5cdb4ab67 22 "extraIncludes": [
Jonathan Austin 1:8aa5cdb4ab67 23 "inc/core",
Jonathan Austin 1:8aa5cdb4ab67 24 "inc/types",
Jonathan Austin 1:8aa5cdb4ab67 25 "inc/drivers",
LancasterUniversity 27:2f494ead23de 26 "inc/bluetooth",
LancasterUniversity 27:2f494ead23de 27 "inc/platform"
Jonathan Austin 1:8aa5cdb4ab67 28 ]
LancasterUniversity 9:960ce8922159 29 }