From a097c7377a60b25bb7246d4042564fa22ad94052 Mon Sep 17 00:00:00 2001 From: Martin/Geno <geno+dev@fireorbit.de> Date: Tue, 20 Aug 2019 15:51:54 +0200 Subject: [PATCH] workaround for iOS --- epicardium/ble/card10.c | 52 +++++++++++++++++++-------------------- epicardium/ble/svc_core.c | 4 +-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/epicardium/ble/card10.c b/epicardium/ble/card10.c index e7aa58fa..42a06e45 100644 --- a/epicardium/ble/card10.c +++ b/epicardium/ble/card10.c @@ -276,8 +276,8 @@ static void *addCard10GroupDyn(void) 0, sizeof(uint64_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // VIBRA @@ -297,8 +297,8 @@ static void *addCard10GroupDyn(void) 0, sizeof(uint16_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // ROCKETS @@ -318,8 +318,8 @@ static void *addCard10GroupDyn(void) 0, 3 * sizeof(uint8_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // BG LED Bottom left @@ -339,8 +339,8 @@ static void *addCard10GroupDyn(void) 0, 3 * sizeof(uint8_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // BG LED Bottom right @@ -360,8 +360,8 @@ static void *addCard10GroupDyn(void) 0, 3 * sizeof(uint8_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // BG LED top right @@ -381,8 +381,8 @@ static void *addCard10GroupDyn(void) 0, 3 * sizeof(uint8_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // BG LED top left @@ -402,8 +402,8 @@ static void *addCard10GroupDyn(void) 0, 3 * sizeof(uint8_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // Dim bottom module @@ -423,8 +423,8 @@ static void *addCard10GroupDyn(void) 0, sizeof(uint8_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // Dim top module @@ -444,8 +444,8 @@ static void *addCard10GroupDyn(void) 0, sizeof(uint8_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // led powersafe @@ -465,8 +465,8 @@ static void *addCard10GroupDyn(void) 0, sizeof(uint8_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // flashlight @@ -486,8 +486,8 @@ static void *addCard10GroupDyn(void) 0, sizeof(uint8_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // ABOVE LEDS @@ -507,8 +507,8 @@ static void *addCard10GroupDyn(void) 0, 11 * 3 * sizeof(uint8_t), ATTS_SET_WRITE_CBACK, - ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC | - ATTS_PERMIT_WRITE_AUTH); + ATTS_PERMIT_WRITE + ); // LIGHT_SENSOR @@ -528,8 +528,8 @@ static void *addCard10GroupDyn(void) sizeof(uint8_t), sizeof(uint8_t), ATTS_SET_READ_CBACK, - ATTS_PERMIT_READ | ATTS_PERMIT_READ_ENC | - ATTS_PERMIT_READ_AUTH); + ATTS_PERMIT_READ + ); APP_TRACE_INFO0("ble-card10: services bound\n"); } diff --git a/epicardium/ble/svc_core.c b/epicardium/ble/svc_core.c index a8618dc6..3c1fd0cd 100644 --- a/epicardium/ble/svc_core.c +++ b/epicardium/ble/svc_core.c @@ -46,10 +46,10 @@ #endif /*! Default device name */ -#define CORE_DEFAULT_DEV_NAME "card10" +#define CORE_DEFAULT_DEV_NAME "card10-ble" /*! Length of default device name */ -#define CORE_DEFAULT_DEV_NAME_LEN 6 +#define CORE_DEFAULT_DEV_NAME_LEN 10 /************************************************************************************************** GAP group -- GitLab