From a64677be64fea1fcc32d3c57b1f3bf39610ee1ce Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 24 Aug 2019 10:47:21 +0200
Subject: [PATCH] BLE: card10: Format the Attribute definitions
This does some manual changes to make the format also format this part.
No functionally way changed.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
epicardium/ble/card10.c | 404 ++++++++++++++++++++++------------------
1 file changed, 224 insertions(+), 180 deletions(-)
diff --git a/epicardium/ble/card10.c b/epicardium/ble/card10.c
index 2105ac02..78e128bb 100644
--- a/epicardium/ble/card10.c
+++ b/epicardium/ble/card10.c
@@ -256,228 +256,272 @@ static uint16_t initLightSensorLen = sizeof(initLightSensorValue);
*/
static const attsAttr_t card10SvcAttrList[] = {
- { .pUuid = attPrimSvcUuid,
- .pValue = (uint8_t *)UUID_svc,
- .pLen = (uint16_t *)&UUID_len,
- .maxLen = sizeof(UUID_svc),
- .permissions = ATTS_PERMIT_READ },
+ {
+ .pUuid = attPrimSvcUuid,
+ .pValue = (uint8_t *)UUID_svc,
+ .pLen = (uint16_t *)&UUID_len,
+ .maxLen = sizeof(UUID_svc),
+ .permissions = ATTS_PERMIT_READ,
+ },
// TIME
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_time,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_time),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_time,
- .pValue = timeValue,
- .pLen = &timeLen,
- .maxLen = sizeof(uint64_t),
- .settings = (ATTS_SET_WRITE_CBACK | ATTS_SET_READ_CBACK),
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH | ATTS_PERMIT_READ |
- ATTS_PERMIT_READ_ENC | ATTS_PERMIT_READ_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_time,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_time),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_time,
+ .pValue = timeValue,
+ .pLen = &timeLen,
+ .maxLen = sizeof(uint64_t),
+ .settings = ATTS_SET_WRITE_CBACK | ATTS_SET_READ_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH | ATTS_PERMIT_READ |
+ ATTS_PERMIT_READ_ENC | ATTS_PERMIT_READ_AUTH,
+ },
// VIBRA
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_vibra,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_vibra),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_vibra,
- .pValue = NULL,
- .maxLen = sizeof(uint16_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_vibra,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_vibra),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_vibra,
+ .pValue = NULL,
+ .maxLen = sizeof(uint16_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH,
+ },
// ROCKETS
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_rockets,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_rockets),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_rockets,
- .pValue = NULL,
- .maxLen = 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_rockets,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_rockets),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_rockets,
+ .pValue = NULL,
+ .maxLen = 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH,
+ },
// BG LED Bottom left
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_led_bg_bottom_left,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_led_bg_bottom_left),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_led_bg_bottom_left,
- .pValue = NULL,
- .maxLen = 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_led_bg_bottom_left,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_led_bg_bottom_left),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_led_bg_bottom_left,
+ .pValue = NULL,
+ .maxLen = 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH,
+ },
// BG LED Bottom right
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_led_bg_bottom_right,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_led_bg_bottom_right),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_led_bg_bottom_right,
- .pValue = NULL,
- .maxLen = 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_led_bg_bottom_right,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_led_bg_bottom_right),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_led_bg_bottom_right,
+ .pValue = NULL,
+ .maxLen = 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH,
+ },
// BG LED top right
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_led_bg_top_right,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_led_bg_top_right),
- .settings = 0,
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_led_bg_top_right,
- .pValue = NULL,
- .maxLen = 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_led_bg_top_right,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_led_bg_top_right),
+ .settings = 0,
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_led_bg_top_right,
+ .pValue = NULL,
+ .maxLen = 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH,
+ },
// BG LED top left
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_led_bg_top_left,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_led_bg_top_left),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_led_bg_top_left,
- .pValue = NULL,
- .maxLen = 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_led_bg_top_left,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_led_bg_top_left),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_led_bg_top_left,
+ .pValue = NULL,
+ .maxLen = 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH,
+ },
// Dim bottom module
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_leds_bottom_dim,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_leds_bottom_dim),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_leds_bottom_dim,
- .pValue = NULL,
- .pLen = 0,
- .maxLen = sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_leds_bottom_dim,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_leds_bottom_dim),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_leds_bottom_dim,
+ .pValue = NULL,
+ .pLen = 0,
+ .maxLen = sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH,
+ },
// Dim top module
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_leds_top_dim,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_leds_top_dim),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_leds_top_dim,
- .pValue = NULL,
- .maxLen = sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_leds_top_dim,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_leds_top_dim),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_leds_top_dim,
+ .pValue = NULL,
+ .maxLen = sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH,
+ },
// led powersafe
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_led_powersafe,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_led_powersafe),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_led_powersafe,
- .pValue = NULL,
- .maxLen = sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_led_powersafe,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_led_powersafe),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_led_powersafe,
+ .pValue = NULL,
+ .maxLen = sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH,
+ },
// flashlight
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_flashlight,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_flashlight),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_flashlight,
- .pValue = NULL,
- .maxLen = sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_flashlight,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_flashlight),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_flashlight,
+ .pValue = NULL,
+ .maxLen = sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH,
+ },
// personal state
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_personal_state,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_personal_state),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_personal_state,
- .pValue = &personalStateValue,
- .pLen = &personalStateLen,
- .maxLen = sizeof(uint16_t),
- .settings = (ATTS_SET_WRITE_CBACK | ATTS_SET_READ_CBACK),
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH | ATTS_PERMIT_READ |
- ATTS_PERMIT_READ_ENC | ATTS_PERMIT_READ_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_personal_state,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_personal_state),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_personal_state,
+ .pValue = &personalStateValue,
+ .pLen = &personalStateLen,
+ .maxLen = sizeof(uint16_t),
+ .settings = ATTS_SET_WRITE_CBACK | ATTS_SET_READ_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH | ATTS_PERMIT_READ |
+ ATTS_PERMIT_READ_ENC | ATTS_PERMIT_READ_AUTH,
+ },
// ABOVE LEDS
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_leds_above,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_leds_above),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_leds_above,
- .pValue = NULL,
- .maxLen = 11 * 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_leds_above,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_leds_above),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_leds_above,
+ .pValue = NULL,
+ .maxLen = 11 * 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
+ ATTS_PERMIT_WRITE_AUTH,
+ },
// Light sensor
- { .pUuid = attChUuid,
- .pValue = (uint8_t *)UUID_char_light_sensor,
- .pLen = (uint16_t *)&UUID_char_len,
- .maxLen = sizeof(UUID_char_light_sensor),
- .permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_light_sensor,
- .pValue = initLightSensorValue,
- .pLen = &initLightSensorLen,
- .maxLen = sizeof(uint8_t),
- .settings = ATTS_SET_READ_CBACK,
- .permissions =
- (ATTS_PERMIT_READ | ATTS_PERMIT_READ_ENC |
- ATTS_PERMIT_READ_AUTH) },
+ {
+ .pUuid = attChUuid,
+ .pValue = (uint8_t *)UUID_char_light_sensor,
+ .pLen = (uint16_t *)&UUID_char_len,
+ .maxLen = sizeof(UUID_char_light_sensor),
+ .permissions = ATTS_PERMIT_READ,
+ },
+ {
+ .pUuid = UUID_attChar_light_sensor,
+ .pValue = initLightSensorValue,
+ .pLen = &initLightSensorLen,
+ .maxLen = sizeof(uint8_t),
+ .settings = ATTS_SET_READ_CBACK,
+ .permissions = ATTS_PERMIT_READ | ATTS_PERMIT_READ_ENC |
+ ATTS_PERMIT_READ_AUTH,
+ },
};
// validating, that the service really get all charateristics
--
GitLab