Skip to content
Snippets Groups Projects

ble: card10 svc - rewrite

Merged ble: card10 svc - rewrite
genofire/ble-rewrite into master
Merged genofire requested to merge genofire/ble-rewrite into master
Compare
and
1 file
+ 281
− 23
Compare changes
  • Side-by-side
  • Inline
epicardium/ble/card10.c
+ 281
− 23
@@ -75,8 +75,8 @@ enum {
CARD10_LEDS_ABOVE_CH_HDL,
CARD10_LEDS_ABOVE_VAL_HDL,
/*!< \brief light sensor characteristic */
CARD10_LIGHT_SENSOR_CH_HDL,
CARD10_LIGHT_SENSOR_VAL_HDL,
//CARD10_LIGHT_SENSOR_CH_HDL,
//CARD10_LIGHT_SENSOR_VAL_HDL,
/*!< \brief Maximum handle. */
CARD10_MAX_HDL
};
@@ -85,7 +85,8 @@ enum {
/* BLE UUID for card10 service*/
static const uint8_t UUID_svc[] = { CARD10_UUID_SUFFIX, 0x0, CARD10_UUID_PREFIX };
// works vor everyone?
static const uint16_t UUID_len = sizeof(UUID_svc);
// starting at 0x01 with write (non visual) charateristics
@@ -95,6 +96,8 @@ static const uint8_t UUID_char_time[] = {
UINT16_TO_BYTES(CARD10_TIME_UPDATE_VAL_HDL),
CARD10_UUID_SUFFIX, 0x01, CARD10_UUID_PREFIX
};
// works vor everyone?
static const uint16_t UUID_char_len = sizeof(UUID_char_time);
static const uint8_t UUID_attChar_time[] = {
CARD10_UUID_SUFFIX, 0x01, CARD10_UUID_PREFIX
@@ -111,7 +114,6 @@ static const uint8_t UUID_attChar_vibra[] = {
CARD10_UUID_SUFFIX, 0x0f, CARD10_UUID_PREFIX
};
// starting at 0x10 with write of leds (visual output)
/* BLE UUID for card10 char rockets */
@@ -124,7 +126,6 @@ static const uint8_t UUID_char_rockets[] = {
static const uint8_t UUID_attChar_rockets[] = {
CARD10_UUID_SUFFIX, 0x10, CARD10_UUID_PREFIX
};
/* BLE UUID for card10 led background bottom left */
static const uint8_t UUID_char_led_bg_bottom_left[] = {
ATT_PROP_WRITE,
@@ -225,7 +226,7 @@ static const uint8_t UUID_attChar_leds_above[] = {
};
// starting at 0xf0 with read only characteristics
/* BLE UUID for card10 char light sensor */
/* BLE UUID for card10 char light sensor *
static const uint8_t UUID_char_light_sensor[] = {
ATT_PROP_READ,
UINT16_TO_BYTES(CARD10_LIGHT_SENSOR_VAL_HDL),
@@ -234,29 +235,282 @@ static const uint8_t UUID_char_light_sensor[] = {
static const uint8_t UUID_attChar_light_sensor[] = {
CARD10_UUID_SUFFIX, 0xf0, CARD10_UUID_PREFIX
};
/* clang-format on */
/*
* Create the BLE service description.
*/
static void *addCard10GroupDyn(void)
static const attsAttr_t card10SvcAttrList[] =
{
{
attPrimSvcUuid,
(uint8_t *) UUID_svc,
(uint16_t *) &UUID_len,
sizeof(UUID_svc),
0,
ATTS_PERMIT_READ
},
// TIME UPDTAE
{
attChUuid,
(uint8_t *) UUID_char_time,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_time),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_time,
NULL,
0,
sizeof(uint64_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
// VIBRA
{
attChUuid,
(uint8_t *) UUID_char_vibra,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_vibra),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_vibra,
NULL,
0,
sizeof(uint16_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
// ROCKETS
{
attChUuid,
(uint8_t *) UUID_char_rockets,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_rockets),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_rockets,
NULL,
0,
3 * sizeof(uint8_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
// BG LED Bottom left
{
attChUuid,
(uint8_t *) UUID_char_led_bg_bottom_left,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_led_bg_bottom_left),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_led_bg_bottom_left,
NULL,
0,
3 * sizeof(uint8_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
// BG LED Bottom right
{
attChUuid,
(uint8_t *) UUID_char_led_bg_bottom_right,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_led_bg_bottom_right),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_led_bg_bottom_right,
NULL,
0,
3 * sizeof(uint8_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
// BG LED top right
{
attChUuid,
(uint8_t *) UUID_char_led_bg_top_right,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_led_bg_top_right),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_led_bg_top_right,
NULL,
0,
3 * sizeof(uint8_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
// BG LED top left
{
attChUuid,
(uint8_t *) UUID_char_led_bg_top_left,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_led_bg_top_left),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_led_bg_top_left,
NULL,
0,
3 * sizeof(uint8_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
// Dim bottom module
{
attChUuid,
(uint8_t *) UUID_char_leds_bottom_dim,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_leds_bottom_dim),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_leds_bottom_dim,
NULL,
0,
sizeof(uint8_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
// Dim top module
{
attChUuid,
(uint8_t *) UUID_char_leds_top_dim,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_leds_top_dim),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_leds_top_dim,
NULL,
0,
sizeof(uint8_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
// led powersafe
{
attChUuid,
(uint8_t *) UUID_char_led_powersafe,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_led_powersafe),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_led_powersafe,
NULL,
0,
sizeof(uint8_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
// flashlight
{
attChUuid,
(uint8_t *) UUID_char_flashlight,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_flashlight),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_flashlight,
NULL,
0,
sizeof(uint8_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
// ABOVE LEDS
{
attChUuid,
(uint8_t *) UUID_char_leds_above,
(uint16_t *) &UUID_char_len,
sizeof(UUID_char_leds_above),
0,
ATTS_PERMIT_READ
},
{
UUID_attChar_leds_above,
NULL,
0,
11 * 3 * sizeof(uint8_t),
ATTS_SET_WRITE_CBACK,
(ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH)
},
};
static attsGroup_t svcCard10Group =
{
NULL,
(attsAttr_t *) card10SvcAttrList,
NULL,
NULL,
CARD10_START_HDL,
CARD10_END_HDL,
};
/*
static void *addCard10Group(void)
{
void *pSHdl;
uint8_t initLightSensorValue[] = { UINT16_TO_BYTES(0) };
/* Create the service */
pSHdl = AttsDynCreateGroup(CARD10_START_HDL, CARD10_END_HDL);
if (pSHdl != NULL) {
/* Primary service */
AttsDynAddAttrConst(
pSHdl,
attPrimSvcUuid,
UUID_svc,
sizeof(UUID_svc),
0,
ATTS_PERMIT_READ
);
// TIME UPDTAE
@@ -274,7 +528,7 @@ static void *addCard10GroupDyn(void)
UUID_attChar_time,
NULL,
0,
sizeof(uint64_t),
Ysizeof(uint64_t),
ATTS_SET_WRITE_CBACK,
ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
ATTS_PERMIT_WRITE_AUTH);
@@ -535,6 +789,7 @@ static void *addCard10GroupDyn(void)
}
return pSHdl;
}
*/
/*
* Set the time given in milliseconds since 1.1.1970 as 64 bit integer.
@@ -548,7 +803,7 @@ static uint8_t setTime(uint8_t *pValue)
time = __bswap64(timeNet);
epic_rtc_set_milliseconds(time);
APP_TRACE_INFO1("set time to: %d\n", time);
APP_TRACE_INFO1("ble-card10: set time to: %d\n", time);
return ATT_SUCCESS;
}
@@ -695,11 +950,13 @@ static uint8_t readCard10CB(
uint16_t ui16 = 0;
switch (handle) {
/*
case CARD10_LIGHT_SENSOR_VAL_HDL:
epic_light_sensor_get(&ui16);
*pAttr->pValue = ui16;
APP_TRACE_INFO1("ble-card10: read lightsensor: %d\n", ui16);
return ATT_SUCCESS;
*/
default:
APP_TRACE_INFO0("ble-card10: read no handler found\n");
return ATT_ERR_HANDLE;
@@ -712,6 +969,7 @@ static uint8_t readCard10CB(
void bleCard10_init(void)
{
void *pSHdl = addCard10GroupDyn();
AttsDynRegister(pSHdl, readCard10CB, writeCard10CB);
svcCard10Group.readCback = readCard10CB;
svcCard10Group.writeCback = writeCard10CB;
AttsAddGroup(&svcCard10Group);
}