Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pad4 error search #6

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Pad4 error search #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
674d865
tests and demo working
thinkberg Jan 20, 2019
f49044d
updated the current state of bluetooth Services and UUIDs
Mar 6, 2019
d968e15
updated for compatibility with new version of "microbit" and "microbi…
Mar 6, 2019
e86e606
new Calliope Service RGB LED
Mar 6, 2019
853cde4
new Calliope Services, RGB, LED and Microphone
Mar 7, 2019
74eb7a0
chapter 5 playbook accelerometer not running yet
Mar 13, 2019
7718d2b
accelerometer service enabled and running, but crashes the calliope
Mar 14, 2019
1ba3d44
just interpreter missing
Mar 15, 2019
b49faf3
interpreter included, but hangs quite fast.
Mar 18, 2019
9c1f159
all services included
Mar 21, 2019
652c825
nun mit neuem Interpreter Service, der noch nicht mit Playground funk…
Mar 21, 2019
dd0c64c
all required bluetooth services added, but the interpreter will crash…
Mar 22, 2019
6d8ffb4
new touchpin service (#CM-7)
Apr 13, 2019
e0f6f73
new services (#CM-7)
Apr 17, 2019
0dc90d4
new services (#CM-16)
Apr 23, 2019
0d32427
all inclusive, interpreter, services, demo, test (#CM-16)
Apr 24, 2019
4c0394b
some optimization and documentation of the services (CM-17)
Apr 25, 2019
14ff7dc
reset behaviour and CalliopeServiceMaster and CalliopeServiceMicropho…
Apr 29, 2019
b38e646
fixed the transition from Playground ch. 1 - 4, to ch. 5 (CM-17)
May 6, 2019
4571924
fixed the transition from Playground ch. 1 - 4, to ch. 5 and the noti…
May 6, 2019
029943e
removed combined Interpreter Service, because it was not working anyw…
May 6, 2019
5720e8d
minor bugfixes for A + B Button events, histogram and reset behaviour…
May 23, 2019
7e96ead
dfu characteristic enabled(CM-17)
Aug 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,14 @@ add_executable(calliope-demo
source/Slice.h
source/Storage.h
source/Utils.cpp
)
source/CalliopeServiceRGB.cpp
source/CalliopeServiceLightSensor.cpp
source/CalliopeServiceMicrophone.cpp
source/PlaygroundFree.cpp
source/CalliopeServiceMaster.cpp
source/CalliopeServiceSpeaker.cpp
source/CalliopeServiceTouchpin.cpp
source/CalliopeServiceGesture.cpp source/CalliopeServiceGesture.h)
#else()
# add_executable(calliope-demo
# source/CalliopeTestBoard.cpp
Expand Down
2 changes: 1 addition & 1 deletion README-RAM-DEBUG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ is executed before the main, so the stack pointer will not be touched.

Insert the following code into this file, which will take care of the rest.

```[bash]
``` c
#include "compiler_abstraction.h"

// Value is sprayed into all of the ISR stack at boot time.
Expand Down
4 changes: 4 additions & 0 deletions README-SERVICE-HANDLING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Handling of Bluetooth Services on the Caliope device

//TODO update this file

216 changes: 208 additions & 8 deletions README-UUIDS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,50 @@
# Bluetooth Services with UUIDs

//TODO update this file

[BluetoothServiceNotify](source/BluetoothServiceNotify.cpp)

BluetoothServiceNotifyUUID = 0xff,0x55,0xdd,0xee, 0x25,0x1d, 0x47,0x0a, 0xa0,0x62, 0xfa,0x19,0x22,0xdf,0xa9,0xa8
BluetoothServiceNotifyUUID =
**0xff,0x55,0xdd,0xee**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8

[BluetoothServiceProgram](source/BluetoothServiceProgram.h)

BluetoothServiceProgramUUID = 0xff, 0x66, 0xdd, 0xee, 0x25, 0x1d, 0x47, 0x0a, 0xa0, 0x62, 0xfa, 0x19, 0x22, 0xdf, 0xa9, 0xa8
BluetoothServiceProgramUUID =
**0xff,0x66,0xdd,0xee**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8

[MicroBitAccelerometerService](yotta_modules/microbit-dal/source/bluetooth/MicroBitAccelerometerService.cpp)

MicroBitAccelerometerServiceUUID = 0xe9,0x5d,0x07,0x53,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8
MicroBitAccelerometerServiceUUID =
**0xe9,0x5d,0x07,0x53**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8

MicroBitAccelerometerServiceDataUUID = 0xe9,0x5d,0xca,0x4b,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8
MicroBitAccelerometerServiceDataUUID =
**0xe9,0x5d,0xca,0x4b**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8

MicroBitAccelerometerServicePeriodUUID = 0xe9,0x5d,0xfb,0x24,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8
MicroBitAccelerometerServicePeriodUUID =
**0xe9,0x5d,0xfb,0x24**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8

[MicroBitDFUService](yotta_modules/microbit-dal/source/bluetooth/MicroBitDFUService.cpp)

MicroBitDFUServiceUUID = 0xe9,0x5d,0x93,0xb0,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8
MicroBitDFUServiceUUID =
**0xe9,0x5d,0x93,0xb0**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8

MicroBitDFUServiceControlCharacteristicUUID = 0xe9,0x5d,0x93,0xb1,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8
MicroBitDFUServiceControlCharacteristicUUID =
**0xe9,0x5d,0x93,0xb1**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8

[DeviceInfoService](yotta_modules/ble/ble/GattCharacteristic.h)

UUID_DEVICE_INFORMATION_SERVICE = 0x180A

UUID_MANUFACTURER_NAME_STRING_CHAR = 0x2A29

UUID_MODEL_NUMBER_STRING_CHAR = 0x2A24

UUID_SERIAL_NUMBER_STRING_CHAR = 0x2A25

UUID_HARDWARE_REVISION_STRING_CHAR = 0x2A27

UUID_FIRMWARE_REVISION_STRING_CHAR = 0x2A26

UUID_SOFTWARE_REVISION_STRING_CHAR = 0x2A28


Expand All @@ -38,5 +54,189 @@ UUID_SOFTWARE_REVISION_STRING_CHAR = 0x2A28

[BluetoothServiceDebug](source/BluetoothServiceDebug.cpp)

BluetoothServiceDebugUUID = 0xff, 0x44, 0xdd, 0xee, 0x25, 0x1d, 0x47, 0x0a, 0xa0, 0x62, 0xfa, 0x19, 0x22, 0xdf, 0xa9, 0xa8
BluetoothServiceDebugUUID =
**0xff,0x44,0xdd,0xee**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


**Services from [microbit-dal](yotta_modules/microbit-dal/source/bluetooth)**

[MicroBitAccelerometerService](yotta_modules/microbit-dal/source/bluetooth/MicroBitAccelerometerService.cpp)

MicroBitAccelerometerServiceUUID =
**0xe9,0x5d,0x07,0x53**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitAccelerometerServiceDataUUID =
**0xe9,0x5d,0xca,0x4b**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitAccelerometerServicePeriodUUID =
**0xe9,0x5d,0xfb,0x24**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


[MicroBitButtonService](yotta_modules/microbit-dal/source/bluetooth/MicroBitButtonService.cpp)

MicroBitButtonServiceUUID =
**0xe9,0x5d,0x98,0x82**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitButtonAServiceDataUUID =
**0xe9,0x5d,0xda,0x90**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitButtonBServiceDataUUID =
**0xe9,0x5d,0xda,0x91**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


[MicroBitDFUService](yotta_modules/microbit-dal/source/bluetooth/MicroBitDFUService.cpp)

MicroBitDFUServiceUUID =
**0xe9,0x5d,0x93,0xb0**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitDFUServiceControlCharacteristicUUID =
**0xe9,0x5d,0x93,0xb1**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


[MicroBitEventService](yotta_modules/microbit-dal/source/bluetooth/MicroBitEventService.cpp)

MicroBitEventServiceUUID =
**0xe9,0x5d,0x93,0xaf**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitEventServiceMicroBitEventCharacteristicUUID =
**0xe9,0x5d,0x97,0x75**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitEventServiceClientEventCharacteristicUUID =
**0xe9,0x5d,0x54,0x04**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitEventServiceMicroBitRequirementsCharacteristicUUID =
**0xe9,0x5d,0xb8,0x4c**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitEventServiceClientRequirementsCharacteristicUUID =
**0xe9,0x5d,0x23,0xc4**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


[MicroBitIOPinService](yotta_modules/microbit-dal/source/bluetooth/MicroBitIOPinService.cpp)

MicroBitIOPinServiceUUID =
**0xe9,0x5d,0x12,0x7b**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitIOPinServiceIOConfigurationUUID =
**0xe9,0x5d,0xb9,0xfe**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitIOPinServiceADConfigurationUUID =
**0xe9,0x5d,0x58,0x99**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitIOPinServicePWMControlUUID =
**0xe9,0x5d,0xd8,0x22**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitIOPinServiceDataUUID =
**0xe9,0x5d,0x8d,0x00**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


[MicroBitLEDService](yotta_modules/microbit-dal/source/bluetooth/MicroBitLEDService.cpp)

MicroBitLEDServiceUUID =
**0xe9,0x5d,0xd9,0x1d**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitLEDServiceMatrixUUID =
**0xe9,0x5d,0x7b,0x77**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitLEDServiceTextUUID =
**0xe9,0x5d,0x93,0xee**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitLEDServiceScrollingSpeedUUID =
**0xe9,0x5d,0x0d,0x2d**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


[MicroBitMagnetometerService](yotta_modules/microbit-dal/source/bluetooth/MicroBitMagnetometerService.cpp)

MicroBitMagnetometerServiceUUID =
**0xe9,0x5d,0xf2,0xd8**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitMagnetometerServiceDataUUID =
**0xe9,0x5d,0xfb,0x11**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitMagnetometerServicePeriodUUID =
**0xe9,0x5d,0x38,0x6c**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitMagnetometerServiceBearingUUID =
**0xe9,0x5d,0x97,0x15**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitMagnetometerServiceCalibrationUUID =
**0xe9,0x5d,0xB3,0x58**,0x25,0x1d,0x47,0x0A,0xA0,0x62,0xFA,0x19,0x22,0xDF,0xA9,0xA8


[MicroBitPartialFlashingService](yotta_modules/microbit-dal/source/bluetooth/MicroBitPartialFlashingService.cpp)

MicroBitPartialFlashingServiceUUID =
**0xe9,0x7d,0xd9,0x1d**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitPartialFlashingServiceCharacteristicUUID =
**0xe9,0x7d,0x3b,0x10**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8



[MicroBitTemperatureService](yotta_modules/microbit-dal/source/bluetooth/MicroBitTemperatureService.cpp)


MicroBitTemperatureServiceUUID =
**0xe9,0x5d,0x61,0x00**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitTemperatureServiceDataUUID =
**0xe9,0x5d,0x92,0x50**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8


MicroBitTemperatureServicePeriodUUID =
**0xe9,0x5d,0x1b,0x25**,0x25,0x1d,0x47,0x0a,0xa0,0x62,0xfa,0x19,0x22,0xdf,0xa9,0xa8



[UARTService](yotta_modules/ble/source/services/UARTService.cpp)

UARTServiceShortUUID = 0x0001;

UARTServiceTXCharacteristicShortUUID = 0x0002;

UARTServiceRXCharacteristicShortUUID = 0x0003;

UARTServiceBaseUUID=
**0x6E,0x40,0x00,0x00**,0xB5,0xA3,0xF3,0x93,0xE0,0xA9,0xE5,0x0E,0x24,0xDC,0xCA,0x9E

UARTServiceUUID=
**0x6E,0x40,0x00,0x01**,0xB5,0xA3,0xF3,0x93,0xE0,0xA9,0xE5,0x0E,0x24,0xDC,0xCA,0x9E

UARTServiceUUID_reversed=
0x9E,0xCA,0xDC,0x24,0x0E,0xE5,0xA9,0xE0,0x93,0xF3,0xA3,0xB5,**0x01,0x00,0x40,0x6E**

UARTServiceTXCharacteristicUUID=
**0x6E,0x40,0x00,0x02**,0xB5,0xA3,0xF3,0x93,0xE0,0xA9,0xE5,0x0E,0x24,0xDC,0xCA,0x9E

UARTServiceRXCharacteristicUUID=
**0x6E,0x40,0x00,0x03**,0xB5,0xA3,0xF3,0x93,0xE0,0xA9,0xE5,0x0E,0x24,0xDC,0xCA,0x9E









Loading