From d21c7d7ea02b006ff5971f65449dec1ac700c732 Mon Sep 17 00:00:00 2001 From: schneider <schneider@blinkenlichts.net> Date: Wed, 24 Jul 2019 21:24:19 +0200 Subject: [PATCH] feat(ble): name the the device card10 --- ble/fit_main.c | 6 ++--- .../ble-profiles/sources/apps/fit/fit_main.c | 6 ++--- .../ble-profiles/sources/services/svc_dis.c | 24 +++++++++---------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/ble/fit_main.c b/ble/fit_main.c index 6691b4eb..11be9139 100644 --- a/ble/fit_main.c +++ b/ble/fit_main.c @@ -169,11 +169,9 @@ static const uint8_t fitAdvDataDisc[] = static const uint8_t fitScanDataDisc[] = { /*! device name */ - 4, /*! length */ + 7, /*! length */ DM_ADV_TYPE_LOCAL_NAME, /*! AD type */ - 'F', - 'i', - 't' + 'c','a','r','d','1','0' }; /************************************************************************************************** diff --git a/lib/sdk/Libraries/BTLE/stack/ble-profiles/sources/apps/fit/fit_main.c b/lib/sdk/Libraries/BTLE/stack/ble-profiles/sources/apps/fit/fit_main.c index bbae8e89..2c7d9dca 100644 --- a/lib/sdk/Libraries/BTLE/stack/ble-profiles/sources/apps/fit/fit_main.c +++ b/lib/sdk/Libraries/BTLE/stack/ble-profiles/sources/apps/fit/fit_main.c @@ -168,11 +168,9 @@ static const uint8_t fitAdvDataDisc[] = static const uint8_t fitScanDataDisc[] = { /*! device name */ - 4, /*! length */ + 7, /*! length */ DM_ADV_TYPE_LOCAL_NAME, /*! AD type */ - 'F', - 'i', - 't' + 'c','a','r','d','1','0' }; /************************************************************************************************** diff --git a/lib/sdk/Libraries/BTLE/stack/ble-profiles/sources/services/svc_dis.c b/lib/sdk/Libraries/BTLE/stack/ble-profiles/sources/services/svc_dis.c index d2746059..401c45e6 100644 --- a/lib/sdk/Libraries/BTLE/stack/ble-profiles/sources/services/svc_dis.c +++ b/lib/sdk/Libraries/BTLE/stack/ble-profiles/sources/services/svc_dis.c @@ -34,40 +34,40 @@ #endif /*! Default manufacturer name */ -#define DIS_DEFAULT_MFR_NAME "ARM Ltd." +#define DIS_DEFAULT_MFR_NAME "CCC" /*! Length of default manufacturer name */ -#define DIS_DEFAULT_MFR_NAME_LEN 8 +#define DIS_DEFAULT_MFR_NAME_LEN 3 /*! Default model number */ -#define DIS_DEFAULT_MODEL_NUM "Cordio model num" +#define DIS_DEFAULT_MODEL_NUM "1" /*! Length of default model number */ -#define DIS_DEFAULT_MODEL_NUM_LEN 16 +#define DIS_DEFAULT_MODEL_NUM_LEN 1 /*! Default serial number */ -#define DIS_DEFAULT_SERIAL_NUM "Cordio serial num" +#define DIS_DEFAULT_SERIAL_NUM "1" /*! Length of default serial number */ -#define DIS_DEFAULT_SERIAL_NUM_LEN 17 +#define DIS_DEFAULT_SERIAL_NUM_LEN 1 /*! Default firmware revision */ -#define DIS_DEFAULT_FW_REV "Cordio fw rev" +#define DIS_DEFAULT_FW_REV "<git hash>" /*! Length of default firmware revision */ -#define DIS_DEFAULT_FW_REV_LEN 13 +#define DIS_DEFAULT_FW_REV_LEN 10 /*! Default hardware revision */ -#define DIS_DEFAULT_HW_REV "Cordio hw rev" +#define DIS_DEFAULT_HW_REV "1" /*! Length of default hardware revision */ -#define DIS_DEFAULT_HW_REV_LEN 13 +#define DIS_DEFAULT_HW_REV_LEN 1 /*! Default software revision */ -#define DIS_DEFAULT_SW_REV "Cordio sw rev" +#define DIS_DEFAULT_SW_REV "1" /*! Length of default software revision */ -#define DIS_DEFAULT_SW_REV_LEN 13 +#define DIS_DEFAULT_SW_REV_LEN 1 /************************************************************************************************** Service variables -- GitLab