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_ESS_TEMP_CCC_IDX,                   /*! Environmental sensing service, temperature characteristic */
+  BLE_ESS_HUMI_CCC_IDX,                   /*! Environmental sensing service, humidity characteristic */
+  BLE_ESS_PRES_CCC_IDX,                   /*! Environmental sensing service, pressure characteristic */
+  HIDAPP_MBI_CCC_HDL,                   /*! HID Boot Mouse Input characteristic */
+  HIDAPP_KBI_CCC_HDL,                   /*! HID Boot Keyboard Input characteristic */
+  HIDAPP_IN_KEYBOARD_CCC_HDL,           /*! HID Input Report characteristic for keyboard inputs */
+  HIDAPP_IN_MOUSE_CCC_HDL,              /*! HID Input Report characteristic for mouse inputs */
+  HIDAPP_IN_CONSUMER_CCC_HDL,             /*! HID Input Report characteristic for consumer control inputs */
+  BLE_ESS_IAQ_CCC_IDX,                    /*! Environmental sensing service, IAQ characteristic */
+  UART_TX_CH_CCC_IDX,
+  BLE_NUM_CCC_IDX
+};
+

epicardium/ble/ess.h

+#pragma once
+
+#include "epicardium.h"
+
+/*!< \brief Service start handle. */
+#define ESS_START_HDL 0x1000
+/*!< \brief Service end handle. */
+#define ESS_END_HDL (ESS_MAX_HDL - 1)
+
+enum {
+	/*!< \brief environmental sensing services service declaration */
+	ESS_SVC_HDL = ESS_START_HDL,
+	/*!< \brief temperature characteristic */
+	ESS_TEMPERATURE_CH_HDL,
+	ESS_TEMPERATURE_VAL_HDL,
+	ESS_TEMP_CH_CCC_HDL,                  /*!< Temperature CCCD */
+	/*!< \brief humidity characteristic */
+	ESS_HUMIDITY_CH_HDL,
+	ESS_HUMIDITY_VAL_HDL,
+	ESS_HUMI_CH_CCC_HDL,                  /*!< Humidity CCCD */
+	/*!< \brief pressure characteristic */
+	ESS_PRESSURE_CH_HDL,
+	ESS_PRESSURE_VAL_HDL,
+	ESS_PRES_CH_CCC_HDL,                  /*!< Pressure CCCD */
+	/*!< \brief IAQ/CO2 characteristic */
+	ESS_IAQ_CH_HDL,
+	ESS_IAQ_VAL_HDL,
+	ESS_IAQ_CH_CCC_HDL,                   /*!< IAQ CCCD */
+
+
+	/*!< \brief Maximum handle. */
+	ESS_MAX_HDL
+};
+
+void bleESS_ccc_update(void);
+void bleESS_update_from_bsec_data(struct bsec_sensor_data *data);

epicardium/ble/hid.h

+#pragma once
+
+#include "wsf_types.h"
+#include "wsf_os.h"
+
+/* The input report fits in one byte */
+#define HIDAPP_KEYBOARD_INPUT_REPORT_LEN  8
+#define HIDAPP_MOUSE_INPUT_REPORT_LEN     4
+#define HIDAPP_CONSUMER_INPUT_REPORT_LEN  2
+#define HIDAPP_OUTPUT_REPORT_LEN          1
+#define HIDAPP_FEATURE_REPORT_LEN         1
+
+
+/* HID Report IDs */
+#define HIDAPP_KEYBOARD_REPORT_ID         1
+#define HIDAPP_MOUSE_REPORT_ID            2
+#define HIDAPP_CONSUMER_REPORT_ID         3
+
+void hid_init(void);
+void HidProcMsg(wsfMsgHdr_t *pMsg);

epicardium/ble/meson.build

 ble_sources = files(
   'ble.c',
+  'epic_ble_api.c',
+  'epic_att_api.c',
   'stack.c',
   'ble_main.c',
+  'ble_adv.c',
+  'ble_attc.c',
+  'profiles/tipc_main.c',
+  'profiles/gap_main.c',
   'svc_dis.c',
   'svc_core.c',
-  'app/app_main.c',
-  'app/common/app_db.c',
-  'app/common/app_ui.c',
+  'bondings.c',
   'uart.c',
   'card10.c',
+  'ess.c',
   'filetransfer.c',
+  'hid.c',
+  'hid_work.c',
 )

epicardium/ble/svc_dis.c

@@ -24,13 +24,17 @@
  */
 /* clang-format off */
 /* clang-formet turned off for easier diffing against orginal file */
+#include "card10-version.h"
 #include "wsf_types.h"
 #include "att_api.h"
 #include "wsf_assert.h"
 #include "wsf_trace.h"
 #include "util/bstream.h"
+
+#define DIS_MAXSIZE_FWR_ATT 32
 #include "svc_dis.h"
 #include "svc_cfg.h"
+#include <string.h>
 
 /**************************************************************************************************
   Macros
@@ -60,10 +64,10 @@
 #define DIS_DEFAULT_SERIAL_NUM_LEN  1
 
 /*! Default firmware revision */
-#define DIS_DEFAULT_FW_REV          "<git hash>"
+#define DIS_DEFAULT_FW_REV          CARD10_VERSION
 
 /*! Length of default firmware revision */
-#define DIS_DEFAULT_FW_REV_LEN      10
+#define DIS_DEFAULT_FW_REV_LEN      strlen(CARD10_VERSION)
 
 /*! Default hardware revision */
 #define DIS_DEFAULT_HW_REV          "1"
@@ -128,7 +132,7 @@ static const uint16_t disLenFwrCh = sizeof(disValFwrCh);
 /* Firmware revision string */
 static const uint8_t disUuFwr[] = {UINT16_TO_BYTES(ATT_UUID_FIRMWARE_REV)};
 static uint8_t disValFwr[DIS_MAXSIZE_FWR_ATT] = DIS_DEFAULT_FW_REV;
-static uint16_t disLenFwr = DIS_DEFAULT_FW_REV_LEN;
+static uint16_t disLenFwr;
 
 /* Hardware revision string characteristic */
 static const uint8_t disValHwrCh[] = {ATT_PROP_READ, UINT16_TO_BYTES(DIS_HWR_HDL), UINT16_TO_BYTES(ATT_UUID_HARDWARE_REV)};
@@ -319,6 +323,7 @@ WSF_CT_ASSERT(((sizeof(disList) / sizeof(disList[0])) == DIS_END_HDL - DIS_START
 /*************************************************************************************************/
 void SvcDisAddGroup(void)
 {
+  disLenFwr = DIS_DEFAULT_FW_REV_LEN;
   AttsAddGroup(&svcDisGroup);
 }