Merge branch 'schneider/ble-fixes-2020-1' into 'master'

BLE fixes 2020 1

See merge request card10/firmware!381

epicardium/ble/app/common/app_db.c

@@ -713,9 +713,11 @@ uint32_t AppDbGetPeerSignCounter(appDbHdl_t hdl)
 /*************************************************************************************************/
 void AppDbSetPeerSignCounter(appDbHdl_t hdl, uint32_t signCounter)
 {
+  if(((appDbRec_t *)hdl)->peerSignCounter != signCounter) {
     ((appDbRec_t *)hdl)->peerSignCounter = signCounter;
     store();
   }
+}
 
 /*************************************************************************************************/
 /*!

epicardium/ble/ble_main.c

@@ -37,6 +37,7 @@
 #include "bas/bas_api.h"
 #include "hrps/hrps_api.h"
 #include "rscp/rscp_api.h"
+#include "cccd.h"
 
 #include "modules/log.h"
 
@@ -175,14 +176,6 @@ uint8_t bleScanDataDisc[] =
   Client Characteristic Configuration Descriptors
 **************************************************************************************************/
 
-/*! enumeration of client characteristic configuration descriptors */
-enum
-{
-  BLE_GATT_SC_CCC_IDX,                    /*! GATT service, service changed characteristic */
-  BLE_BATT_LVL_CCC_IDX,                   /*! Battery service, battery level characteristic */
-  BLE_NUM_CCC_IDX
-};
-
 /*! client characteristic configuration descriptors settings, indexed by above enumeration */
 static const attsCccSet_t bleCccSet[BLE_NUM_CCC_IDX] =
 {

epicardium/ble/cccd.h

+#pragma once
+/*! enumeration of client characteristic configuration descriptors */
+enum
+{
+  BLE_GATT_SC_CCC_IDX,                    /*! GATT service, service changed characteristic */
+  BLE_BATT_LVL_CCC_IDX,                   /*! Battery service, battery level characteristic */
+  BLE_NUM_CCC_IDX
+};
+