Schoumi/microbit-dal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into simplified-eventing

Browse source
This commit is contained in:
Joe Finney 2015-11-01 16:27:15 +00:00
commit 77af825df0
6 changed files with 36 additions and 462 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
docs/BBC Micro Bit Bluetooth Profile V1.6.docx
View file

Binary file not shown.

6
docs/Report 1/BBC microbit.html
View file

@ -115,9 +115,6 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
<div class="service_hdg_text2"><p>0000180A00001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Manufacturer Name String : 00002A2900001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Model Number String : 00002A2400001000800000805F9B34FB</p></div>
</div>
@ -130,9 +127,6 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Firmware Revision String : 00002A2600001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Software Revision String : 00002A2800001000800000805F9B34FB</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">

228
docs/Report 2/BBC microbit.html
View file

@ -625,7 +625,7 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -668,107 +668,6 @@ Only one instance of the Device Information Service is exposed on a device.
</div>
<!-- Characteristic Block -->
<div class="characteristic_hdg">
<div class="characteristic_hdg_text"><p>Manufacturer Name String</p></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">UUID</div>
<div class="characteristic_value">00002A2900001000800000805F9B34FB</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Type</div>
<div class="characteristic_value"></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Requirement</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Abstract:</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the name of the manufacturer of the device.</pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Summary:</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre></pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Examples</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre></pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Read</div>
<div class="mandatory_property">Mandatory</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Write Without Response</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Signed Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Reliable Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Notify</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Indicate</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Broadcast</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Writable Auxiliaries</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Extended Properties</div>
<div class="characteristic_value">Excluded</div>
</div>
<!-- Descriptor Block -->
<div class="characteristic_field">
<div class="characteristic_field_label">Descriptors</div>
<div class="characteristic_field_value">
<table>
</table></div>
</div>
<!-- Characteristic Block -->
<div class="characteristic_hdg">
<div class="characteristic_hdg_text"><p>Model Number String</p></div>
@ -1173,108 +1072,6 @@ Only one instance of the Device Information Service is exposed on a device.
<!-- Characteristic Block -->
<div class="characteristic_hdg">
<div class="characteristic_hdg_text"><p>Software Revision String</p></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">UUID</div>
<div class="characteristic_value">00002A2800001000800000805F9B34FB</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Type</div>
<div class="characteristic_value"></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Abstract:</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the software revision for the software within the device.
</pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Summary:</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre></pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Examples</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre></pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Read</div>
<div class="mandatory_property">Mandatory</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Write Without Response</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Signed Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Reliable Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Notify</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Indicate</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Broadcast</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Writable Auxiliaries</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Extended Properties</div>
<div class="characteristic_value">Excluded</div>
</div>
<!-- Descriptor Block -->
<div class="characteristic_field">
<div class="characteristic_field_label">Descriptors</div>
<div class="characteristic_field_value">
<table>
</table></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
@ -1295,7 +1092,7 @@ Only one instance of the Device Information Service is exposed on a device.
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -1563,7 +1360,7 @@ Data can be read on demand or notified periodically.</pre></div>
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -1928,7 +1725,7 @@ Data can be read on demand or notified periodically.</pre></div>
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -2193,7 +1990,7 @@ Data can be read on demand or notified periodically.</pre></div>
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -2380,7 +2177,9 @@ READ: A client reading this characteristic will receive Pin Number / Value pairs
<div class="characteristic_label">Summary:</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre>A bit mask which allows each pin to be configured for analogue or digital use.</pre></div>
<div class="char_text_block"><pre>A bit mask which allows each pin to be configured for analogue or digital use.
Bit n corresponds to pin n where 0 LESS THAN OR EQUAL TO n LESS THAN 19. A value of 0 means digital and 1 means analogue.</pre></div>
</div>
<div class="characteristic_item">
@ -2482,6 +2281,7 @@ READ: A client reading this characteristic will receive Pin Number / Value pairs
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre>A bit mask which allows each pin to be configured for input or output use.
Bit n corresponds to pin n where 0 LESS THAN OR EQUAL TO n LESS THAN 19. A value of 0 means configured for output and 1 means configured for input.</pre></div>
</div>
@ -2572,7 +2372,7 @@ Bit n corresponds to pin n where 0 LESS THAN OR EQUAL TO n LESS THAN 19. A value
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -2949,7 +2749,7 @@ Octet 4, LED Row 5: bit4 bit3 bit2 bit1 bit0
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -3439,7 +3239,7 @@ These should be of types indicated in the micro:bit Requirements characteristic
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -3706,7 +3506,7 @@ Notifications are used to deliver the flash code to a client during the initial
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -3864,7 +3664,7 @@ Notifications are used to deliver the flash code to a client during the initial
<div class="characteristic_item">
<div class="characteristic_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="characteristic_item">

248
docs/Report 3/BBC microbit.html
View file

@ -667,7 +667,7 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -710,117 +710,6 @@ Only one instance of the Device Information Service is exposed on a device.
</div>
<!-- Characteristic Block -->
<div class="characteristic_hdg">
<div class="characteristic_hdg_text"><p>Manufacturer Name String</p></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">UUID</div>
<div class="characteristic_value">00002A2900001000800000805F9B34FB</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Type</div>
<div class="characteristic_value"></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Requirement</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Abstract:</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the name of the manufacturer of the device.</pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Summary:</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre></pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Examples</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre></pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Read</div>
<div class="mandatory_property">Mandatory</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Write Without Response</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Signed Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Reliable Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Notify</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Indicate</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Broadcast</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Writable Auxiliaries</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Extended Properties</div>
<div class="characteristic_value">Excluded</div>
</div>
<!-- Field Block -->
<div class="characteristic_field">
<div class="characteristic_field_label">Fields</div>
<div class="characteristic_field_value">
<table>
<tr><td>1. Manufacturer Name&nbsp;:&nbsp;utf8s</td></tr>
</table></div>
</div>
<!-- Descriptor Block -->
<div class="characteristic_field">
<div class="characteristic_field_label">Descriptors</div>
<div class="characteristic_field_value">
<table>
</table></div>
</div>
<!-- Characteristic Block -->
<div class="characteristic_hdg">
<div class="characteristic_hdg_text"><p>Model Number String</p></div>
@ -1265,118 +1154,6 @@ Only one instance of the Device Information Service is exposed on a device.
<!-- Characteristic Block -->
<div class="characteristic_hdg">
<div class="characteristic_hdg_text"><p>Software Revision String</p></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">UUID</div>
<div class="characteristic_value">00002A2800001000800000805F9B34FB</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Type</div>
<div class="characteristic_value"></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Abstract:</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the software revision for the software within the device.
</pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Summary:</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre></pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Examples</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre></pre></div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Read</div>
<div class="mandatory_property">Mandatory</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Write Without Response</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Signed Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Reliable Write</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Notify</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Indicate</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Broadcast</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Writable Auxiliaries</div>
<div class="characteristic_value">Excluded</div>
</div>
<div class="characteristic_item">
<div class="characteristic_label">Extended Properties</div>
<div class="characteristic_value">Excluded</div>
</div>
<!-- Field Block -->
<div class="characteristic_field">
<div class="characteristic_field_label">Fields</div>
<div class="characteristic_field_value">
<table>
<tr><td>1. Software Revision&nbsp;:&nbsp;utf8s</td></tr>
</table></div>
</div>
<!-- Descriptor Block -->
<div class="characteristic_field">
<div class="characteristic_field_label">Descriptors</div>
<div class="characteristic_field_value">
<table>
</table></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
@ -1397,7 +1174,7 @@ Only one instance of the Device Information Service is exposed on a device.
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -1687,7 +1464,7 @@ Data can be read on demand or notified periodically.</pre></div>
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -2084,7 +1861,7 @@ Data can be read on demand or notified periodically.</pre></div>
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -2369,7 +2146,7 @@ Data can be read on demand or notified periodically.</pre></div>
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -2566,7 +2343,9 @@ READ: A client reading this characteristic will receive Pin Number / Value pairs
<div class="characteristic_label">Summary:</div>
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre>A bit mask which allows each pin to be configured for analogue or digital use.</pre></div>
<div class="char_text_block"><pre>A bit mask which allows each pin to be configured for analogue or digital use.
Bit n corresponds to pin n where 0 LESS THAN OR EQUAL TO n LESS THAN 19. A value of 0 means digital and 1 means analogue.</pre></div>
</div>
<div class="characteristic_item">
@ -2678,6 +2457,7 @@ READ: A client reading this characteristic will receive Pin Number / Value pairs
</div>
<div class="characteristic_item">
<div class="char_text_block"><pre>A bit mask which allows each pin to be configured for input or output use.
Bit n corresponds to pin n where 0 LESS THAN OR EQUAL TO n LESS THAN 19. A value of 0 means configured for output and 1 means configured for input.</pre></div>
</div>
@ -2778,7 +2558,7 @@ Bit n corresponds to pin n where 0 LESS THAN OR EQUAL TO n LESS THAN 19. A value
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -3185,7 +2965,7 @@ Octet 4, LED Row 5: bit4 bit3 bit2 bit1 bit0
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -3715,7 +3495,7 @@ These should be of types indicated in the micro:bit Requirements characteristic
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -4002,7 +3782,7 @@ Notifications are used to deliver the flash code to a client during the initial
<div class="service_item">
<div class="service_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="service_item">
@ -4170,7 +3950,7 @@ Notifications are used to deliver the flash code to a client during the initial
<div class="characteristic_item">
<div class="characteristic_label">Requirement</div>
<div class="mandatory_property">Mandatory</div>
<div class="characteristic_value">Optional</div>
</div>
<div class="characteristic_item">

2
module.json
View file

@ -1,6 +1,6 @@
{
"name": "microbit-dal",
"version": "1.2.3",
"version": "1.2.4",
"license": "Apache2",
"description": "The runtime library for the BBC micro:bit, developed by Lancaster University",
"keywords": [

14
source/MicroBitSuperMain.cpp
View file

@ -60,18 +60,18 @@ int main()
uBit.ble = new BLEDevice();
uBit.ble->init();
uBit.ble->onDisconnection(bleDisconnectionCallback);
// Ensure we're advertising.
uBit.ble->accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
uBit.ble->accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LOCAL_NAME, (uint8_t *)MICROBIT_BLE_DEVICE_NAME, sizeof(MICROBIT_BLE_DEVICE_NAME));
uBit.ble->setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
uBit.ble->setAdvertisingInterval(Gap::MSEC_TO_ADVERTISEMENT_DURATION_UNITS(200));
uBit.ble->startAdvertising();
}
if (!uBit.ble_firmware_update_service)
uBit.ble_firmware_update_service = new MicroBitDFUService(*uBit.ble);
// Ensure we're advertising.
uBit.ble->accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
uBit.ble->accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LOCAL_NAME, (uint8_t *)MICROBIT_BLE_DEVICE_NAME, strlen(MICROBIT_BLE_DEVICE_NAME)+1);
uBit.ble->setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
uBit.ble->setAdvertisingInterval(Gap::MSEC_TO_ADVERTISEMENT_DURATION_UNITS(1000));
uBit.ble->startAdvertising();
// enter BLUE ZONE mode.
uBit.ble_firmware_update_service->pair();
}