From d8ef26c833d1de1888cb93f756320b2971ef2ef4 Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Thu, 22 Aug 2019 15:17:13 +0200
Subject: [PATCH] ble: card10 svc - without reponse
---
Documentation/bluetooth/card10.rst | 22 ++++-----
epicardium/ble/card10.c | 74 ++++++++++++++++++++++--------
2 files changed, 66 insertions(+), 30 deletions(-)
diff --git a/Documentation/bluetooth/card10.rst b/Documentation/bluetooth/card10.rst
index 19c3b993..207e1a37 100644
--- a/Documentation/bluetooth/card10.rst
+++ b/Documentation/bluetooth/card10.rst
@@ -18,37 +18,37 @@ The current draft uses following service specification:
- Time update characteristic:
UUID: ``42230201-2342-2342-2342-234223422342``
- write
+ write no response
- Vibra characteristic:
UUID: ``4223020f-2342-2342-2342-234223422342``
- write
+ write no response
- Rockets characteristic:
UUID: ``42230210-2342-2342-2342-234223422342``
- write
+ write no response
- Background LED Bottom Left characteristic:
UUID: ``42230211-2342-2342-2342-234223422342``
- write
+ write no response
- Background LED Bottom Right characteristic:
UUID: ``42230212-2342-2342-2342-234223422342``
- write
+ write no response
- Background LED Top Right characteristic:
UUID: ``42230213-2342-2342-2342-234223422342``
- write
+ write no response
- Background LED Top Left characteristic:
UUID: ``42230214-2342-2342-2342-234223422342``
- write
+ write no reponse
- LEDS dim bottom characteristic:
@@ -63,22 +63,22 @@ The current draft uses following service specification:
- LEDs powersafe characteristic:
UUID: ``42230217-2342-2342-2342-234223422342``
- write
+ write no response
- Flashlight characteristic:
UUID: ``42230218-2342-2342-2342-234223422342``
- write
+ write no response
- LEDs above characteristic:
UUID: ``42230220-2342-2342-2342-234223422342``
- write
+ write no reponse
- Light sensor characteristic:
UUID: ``422302f0-2342-2342-2342-234223422342``
- read
+ read no response
Time update characteristic
---------------------------------
diff --git a/epicardium/ble/card10.c b/epicardium/ble/card10.c
index 9fe7364b..73cb0e12 100644
--- a/epicardium/ble/card10.c
+++ b/epicardium/ble/card10.c
@@ -80,7 +80,7 @@ static const uint16_t UUID_len = sizeof(UUID_svc);
/* BLE UUID for card10 time update */
static const uint8_t UUID_char_time[] = {
- ATT_PROP_WRITE,
+ ATT_PROP_WRITE_NO_RSP,
UINT16_TO_BYTES(CARD10_TIME_UPDATE_VAL_HDL),
CARD10_UUID_SUFFIX, 0x01, CARD10_UUID_PREFIX
};
@@ -93,7 +93,7 @@ static const uint8_t UUID_attChar_time[] = {
/* BLE UUID for card10 char vibra */
static const uint8_t UUID_char_vibra[] = {
- ATT_PROP_WRITE,
+ ATT_PROP_WRITE_NO_RSP,
UINT16_TO_BYTES(CARD10_VIBRA_VAL_HDL),
CARD10_UUID_SUFFIX, 0x0f, CARD10_UUID_PREFIX
};
@@ -107,7 +107,7 @@ static const uint8_t UUID_attChar_vibra[] = {
/* BLE UUID for card10 char rockets */
static const uint8_t UUID_char_rockets[] = {
- ATT_PROP_WRITE,
+ ATT_PROP_WRITE_NO_RSP,
UINT16_TO_BYTES(CARD10_ROCKETS_VAL_HDL),
CARD10_UUID_SUFFIX, 0x10, CARD10_UUID_PREFIX
};
@@ -118,7 +118,7 @@ static const uint8_t UUID_attChar_rockets[] = {
/* BLE UUID for card10 led background bottom left */
static const uint8_t UUID_char_led_bg_bottom_left[] = {
- ATT_PROP_WRITE,
+ ATT_PROP_WRITE_NO_RSP,
UINT16_TO_BYTES(CARD10_LED_BG_BOTTOM_LEFT_VAL_HDL),
CARD10_UUID_SUFFIX, 0x11, CARD10_UUID_PREFIX
};
@@ -129,7 +129,7 @@ static const uint8_t UUID_attChar_led_bg_bottom_left[] = {
/* BLE UUID for card10 led background bottom right */
static const uint8_t UUID_char_led_bg_bottom_right[] = {
- ATT_PROP_WRITE,
+ ATT_PROP_WRITE_NO_RSP,
UINT16_TO_BYTES(CARD10_LED_BG_BOTTOM_RIGHT_VAL_HDL),
CARD10_UUID_SUFFIX, 0x12, CARD10_UUID_PREFIX
};
@@ -140,7 +140,7 @@ static const uint8_t UUID_attChar_led_bg_bottom_right[] = {
/* BLE UUID for card10 led background top right */
static const uint8_t UUID_char_led_bg_top_right[] = {
- ATT_PROP_WRITE,
+ ATT_PROP_WRITE_NO_RSP,
UINT16_TO_BYTES(CARD10_LED_BG_TOP_RIGHT_VAL_HDL),
CARD10_UUID_SUFFIX, 0x13, CARD10_UUID_PREFIX
};
@@ -151,7 +151,7 @@ static const uint8_t UUID_attChar_led_bg_top_right[] = {
/* BLE UUID for card10 led background top left */
static const uint8_t UUID_char_led_bg_top_left[] = {
- ATT_PROP_WRITE,
+ ATT_PROP_WRITE_NO_RSP,
UINT16_TO_BYTES(CARD10_LED_BG_TOP_LEFT_VAL_HDL),
CARD10_UUID_SUFFIX, 0x14, CARD10_UUID_PREFIX
};
@@ -184,7 +184,7 @@ static const uint8_t UUID_attChar_leds_top_dim[] = {
/* BLE UUID for card10 powersafe */
static const uint8_t UUID_char_led_powersafe[] = {
- ATT_PROP_WRITE,
+ ATT_PROP_WRITE_NO_RSP,
UINT16_TO_BYTES(CARD10_LED_POWERSAFE_VAL_HDL),
CARD10_UUID_SUFFIX, 0x17, CARD10_UUID_PREFIX
};
@@ -195,7 +195,7 @@ static const uint8_t UUID_attChar_led_powersafe[] = {
/* BLE UUID for card10 flashlight */
static const uint8_t UUID_char_flashlight[] = {
- ATT_PROP_WRITE,
+ ATT_PROP_WRITE_NO_RSP,
UINT16_TO_BYTES(CARD10_FLASHLIGHT_VAL_HDL),
CARD10_UUID_SUFFIX, 0x18, CARD10_UUID_PREFIX
};
@@ -206,7 +206,7 @@ static const uint8_t UUID_attChar_flashlight[] = {
/* BLE UUID for card10 above leds */
static const uint8_t UUID_char_leds_above[] = {
- ATT_PROP_WRITE,
+ ATT_PROP_WRITE_NO_RSP,
UINT16_TO_BYTES(CARD10_LEDS_ABOVE_VAL_HDL),
CARD10_UUID_SUFFIX, 0x20, CARD10_UUID_PREFIX
};
@@ -581,22 +581,58 @@ static uint8_t writeCard10CB(
// dim
case CARD10_LEDS_BOTTOM_DIM_VAL_HDL:
ui8 = pValue[0];
- if (ui8 >= 1 && ui8 <= 8) {
+ if (operation == ATT_PDU_PREP_WRITE_REQ) {
+ if (ui8 >= 1 && ui8 <= 8) {
+ APP_TRACE_INFO1(
+ "ble_card10: prep to dim bottom to: %d\n",
+ pValue[0]
+ );
+ return ATT_SUCCESS;
+ }
+ APP_TRACE_INFO1(
+ "ble-card: prep dim bottom invalid value (1-8): %d\n",
+ ui8
+ );
+ return ATT_ERR_RANGE;
+ } else if (operation == ATT_PDU_EXEC_WRITE_REQ) {
epic_leds_dim_bottom(pValue[0]);
- APP_TRACE_INFO1("dim bottom to: %d\n", pValue[0]);
+ APP_TRACE_INFO1(
+ "ble-card10: dim bottom to: %d\n", pValue[0]
+ );
return ATT_SUCCESS;
}
- APP_TRACE_INFO1("dim bottom invalid value (1-8): %d\n", ui8);
- return ATT_ERR_RANGE;
+ APP_TRACE_INFO1(
+ "ble-card10: dim bottom with unknown operation: %d\n",
+ operation
+ );
+ return ATT_ERR_INVALID_PDU;
case CARD10_LEDS_TOP_DIM_VAL_HDL:
ui8 = pValue[0];
- if (ui8 >= 1 && ui8 <= 8) {
- epic_leds_dim_top(ui8);
- APP_TRACE_INFO1("dim top to: %d\n", ui8);
+ if (operation == ATT_PDU_PREP_WRITE_REQ) {
+ if (ui8 >= 1 && ui8 <= 8) {
+ APP_TRACE_INFO1(
+ "ble_card10: prep to dim top to: %d\n",
+ pValue[0]
+ );
+ return ATT_SUCCESS;
+ }
+ APP_TRACE_INFO1(
+ "ble-card: prep dim top invalid value (1-8): %d\n",
+ ui8
+ );
+ return ATT_ERR_RANGE;
+ } else if (operation == ATT_PDU_EXEC_WRITE_REQ) {
+ epic_leds_dim_top(pValue[0]);
+ APP_TRACE_INFO1(
+ "ble-card10: dim top to: %d\n", pValue[0]
+ );
return ATT_SUCCESS;
}
- APP_TRACE_INFO1("dim top invalid value (1-8): %d\n", ui8);
- return ATT_ERR_RANGE;
+ APP_TRACE_INFO1(
+ "ble-card10: dim top with unknown operation: %d\n",
+ operation
+ );
+ return ATT_ERR_INVALID_PDU;
// led powersafe
case CARD10_LED_POWERSAFE_VAL_HDL:
epic_leds_set_powersave(pValue[0]);
--
GitLab