works with android, linux and windows

NO IOS

Author: fabiankuffer

main/blehr_sens.h

@@ -19,6 +19,7 @@ extern "C" {
 #define GATT_MODEL_NUMBER_UUID                  0x2A24
 #define GATT_FIRMWARE_REVISION_UUID             0x2A26
 #define GATT_SOFTWARE_REVISION_UUID             0x2A28
+#define GATT_PNP_ID_UUID                        0x2A50
 
 /* battery configuration */
 #define GATT_BATTERYS_UUID                      0x180f
@@ -40,10 +41,11 @@ extern "C" {
 #define HID_KBD_FLAGS                   HID_FLAGS_REMOTE_WAKE
 #define HID_INFORMATION_LEN             4         // HID Information
 
+//The value handle of the relevant characteristic for notification
 extern uint16_t report_data_handle;
 
-static uint8_t reportData[2] = {
-    0x00,
+//zu verschickender report muss immer so groß sein wie auch der report groß ist sonst geht es nicht
+static uint8_t reportData[1] = {
     0x00
 };
 

main/gatt_svr.c

@@ -16,27 +16,23 @@ static const uint8_t hidReportMap[] = {
     0x05, 0x0C,        // Usage Page (Consumer)
     0x09, 0x01,        // Usage (Consumer Control)
     0xA1, 0x01,        // Collection (Application)
-    0x15, 0x00,        //   Logical Minimum (0)
+    0x85, 0x01,        // Report Id (1)
+    0x05, 0x0C,        //   Usage Page (Consumer)
+    0x09, 0x86,        //   Usage (Channel)
+    0x15, 0xFF,        //   Logical Minimum (-1)
     0x25, 0x01,        //   Logical Maximum (1)
+    0x75, 0x02,        //   Report Size (2)
+    0x95, 0x01,        //   Report Count (1)
+    0x81, 0x46,        //   Input (Data,Var,Rel,No Wrap,Linear,Preferred State,Null State)
     0x09, 0xE9,        //   Usage (Volume Increment)
     0x09, 0xEA,        //   Usage (Volume Decrement)
+    0x15, 0x00,        //   Logical Minimum (0)
     0x75, 0x01,        //   Report Size (1)
     0x95, 0x02,        //   Report Count (2)
     0x81, 0x02,        //   Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
-    0x09, 0xE2,        //   Usage (Mute)
-    0x09, 0x00,        //   Usage (Unassigned)
-    0x81, 0x06,        //   Input (Data,Var,Rel,No Wrap,Linear,Preferred State,No Null Position)
-    0x09, 0x00,        //   Usage (Unassigned)
-    0x95, 0x04,        //   Report Count (4)
-    0x81, 0x02,        //   Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
-    0x26, 0xFF, 0x00,  //   Logical Maximum (255)
-    0x09, 0x00,        //   Usage (Unassigned)
-    0x75, 0x08,        //   Report Size (8)
-    0x95, 0x03,        //   Report Count (3)
-    0x81, 0x02,        //   Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
-    0x09, 0x00,        //   Usage (Unassigned)
-    0x95, 0x04,        //   Report Count (4)
-    0x91, 0x02,        //   Output (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position,Non-volatile)
+    0x95, 0x01,        //   Report Count (1)
+    0x75, 0x04,        //   Report Size (4)
+    0x81, 0x03,        //   Input (Const,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
     0xC0,              // End Collection
 };
 
@@ -47,7 +43,7 @@ static const uint8_t hidInfo[HID_INFORMATION_LEN] = {
 };
 
 static const uint8_t reportReferenceChar[2] = {
-    0x00,                                               //report-id des reports vom report deskriptor
+    0x01,                                               //report-id des reports vom report deskriptor
     0x01                                                //input: 0x01, output: 0x02, feature: 0x03
 };
 
@@ -145,7 +141,8 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                 .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_NOTIFY,
                 .descriptors = (struct ble_gatt_dsc_def[]){
                     //client configuration descriptor soll nicht manuell hinzugefügt werden, da dieser mittels dem flag notify automatisch hinzugefügt wird
-                    {
+                    {   
+                        //TODO: | BLE_ATT_F_WRITE_ENC vielleicht bei ios benötigt
                         .att_flags = BLE_ATT_F_READ,
                         .access_cb = report_descriptor_callback,
                         .uuid = BLE_UUID16_DECLARE(GATT_REPORT_REFERENCE_CHAR_UUID) //damit wird angegeben welche report id und report type abgedeckt werden
@@ -264,21 +261,21 @@ gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg)
 
     switch (ctxt->op) {
     case BLE_GATT_REGISTER_OP_SVC:
-        MODLOG_DFLT(DEBUG, "registered service %s with handle=%d\n",
+        ESP_LOGI("ASDF", "registered service %s with handle=%d\n",
                     ble_uuid_to_str(ctxt->svc.svc_def->uuid, buf),
                     ctxt->svc.handle);
         break;
 
     case BLE_GATT_REGISTER_OP_CHR:
-        MODLOG_DFLT(DEBUG, "registering characteristic %s with "
+        ESP_LOGI("ASDF", "registering characteristic %s with "
                     "def_handle=%d val_handle=%d\n",
                     ble_uuid_to_str(ctxt->chr.chr_def->uuid, buf),
                     ctxt->chr.def_handle,
                     ctxt->chr.val_handle);
         break;
 
     case BLE_GATT_REGISTER_OP_DSC:
-        MODLOG_DFLT(DEBUG, "registering descriptor %s with handle=%d\n",
+        ESP_LOGI("ASDF", "registering descriptor %s with handle=%d\n",
                     ble_uuid_to_str(ctxt->dsc.dsc_def->uuid, buf),
                     ctxt->dsc.handle);
         break;

main/main.c

@@ -2,7 +2,11 @@
 //https://macchina.io/blog/internet-of-things/communication-with-low-energy-bluetooth-devices-on-linux/
 
 
-//TODO: ADD notify option; works only with windows
+//TODO: alle geräte funktionieren außer ios; hier reinschauen wie notify gemacht wird; muss wahrscheinlich secure verbindung sein
+//https://github.com/Xi-MingYu/Central/tree/394ccfb02f2c58d8ea7eb0e72b0abe927602f5ea/lib/NimBLE/src
+//vielleicht eine secure verbindung aufbauen https://github.com/h2zero/NimBLE-Arduino/issues/222
+//https://github.com/wakwak-koba/ESP32-NimBLE-Keyboard/blob/ec4ce707f00d260f30286191fe63dc23d65a5934/BleKeyboard.cpp#L141
+// Diese verschlüsselung mal hinzufügen
 
 #include "esp_log.h"
 #include "nvs_flash.h"
@@ -33,7 +37,7 @@ static int blehr_gap_event(struct ble_gap_event *event, void *arg);
 
 static uint8_t blehr_addr_type;
 
-static int tmpVol = 0;
+static bool volumeUp = true;
 
 /**
  * Utility function to log an array of bytes.
@@ -43,7 +47,7 @@ print_bytes(const uint8_t *bytes, int len)
 {
     int i;
     for (i = 0; i < len; i++) {
-        MODLOG_DFLT(INFO, "%s0x%02x", i != 0 ? ":" : "", bytes[i]);
+        ESP_LOGI("ASDF", "%s0x%02x", i != 0 ? ":" : "", bytes[i]);
     }
 }
 
@@ -53,7 +57,7 @@ print_addr(const void *addr)
     const uint8_t *u8p;
 
     u8p = addr;
-    MODLOG_DFLT(INFO, "%02x:%02x:%02x:%02x:%02x:%02x",
+    ESP_LOGI("ASDF", "%02x:%02x:%02x:%02x:%02x:%02x",
                 u8p[5], u8p[4], u8p[3], u8p[2], u8p[1], u8p[0]);
 }
 
@@ -107,7 +111,7 @@ blehr_advertise(void)
 
     rc = ble_gap_adv_set_fields(&fields);
     if (rc != 0) {
-        MODLOG_DFLT(ERROR, "error setting advertisement data; rc=%d\n", rc);
+        ESP_LOGI("ASDF", "error setting advertisement data; rc=%d\n", rc);
         return;
     }
 
@@ -118,15 +122,15 @@ blehr_advertise(void)
     rc = ble_gap_adv_start(blehr_addr_type, NULL, BLE_HS_FOREVER,
                            &adv_params, blehr_gap_event, NULL);
     if (rc != 0) {
-        MODLOG_DFLT(ERROR, "error enabling advertisement; rc=%d\n", rc);
+        ESP_LOGI("ASDF", "error enabling advertisement; rc=%d\n", rc);
         return;
     }
 }
 
 static void
 blehr_tx_hrate_stop(void)
 {
-    tmpVol = 0;
+    volumeUp = true;
     xTimerStop( blehr_tx_timer, 1000 / portTICK_PERIOD_MS );
 }
 
@@ -160,14 +164,13 @@ blehr_tx_hrate(xTimerHandle ev)
     }
 
     /* Simulation of volume */
-    ESP_LOGW("ASDF", "%d",tmpVol);
-    if(tmpVol < 10){
-        tmpVol++;
-        reportData[0] = 0b00000001;
+    ESP_LOGW("ASDF", "%d",volumeUp);
+    if(volumeUp){
+        reportData[0] = 0b00000100;
     } else {
-        tmpVol--;
-        reportData[0] = 0b00000010;
+        reportData[0] = 0b00001000;
     }
+    volumeUp = !volumeUp;
 
     om = ble_hs_mbuf_from_flat(reportData, sizeof(reportData));
     rc = ble_gattc_notify_custom(conn_handle, report_data_handle, om);
@@ -183,31 +186,44 @@ blehr_gap_event(struct ble_gap_event *event, void *arg)
     switch (event->type) {
     case BLE_GAP_EVENT_CONNECT:
         /* A new connection was established or a connection attempt failed */
-        MODLOG_DFLT(INFO, "connection %s; status=%d\n",
+        ESP_LOGI("ASDF", "connection %s; status=%d\n",
                     event->connect.status == 0 ? "established" : "failed",
                     event->connect.status);
 
         if (event->connect.status != 0) {
             /* Connection failed; resume advertising */
             blehr_advertise();
         }
+
+        struct ble_gap_upd_params connectionParameters = {
+            //itvl: These determine how often the devices will "ping-pong" each other and also when they will send any data required. So if you set the value to something like 20, that would mean packets are sent every 25ms, which will obviously consume more power than say a value of 80 (100ms). The reason for the min max values is so the devices can negotiate a compromise for the best possible communication, you can set these to the same value if you prefer.
+            .itvl_min = (int)(11.25/1.25), //1.25ms units; laut apple 11.25 minimum fuer hid
+            .itvl_max = (int)(20/1.25),    //minimum ist laut apple eigentlich 15ms deswegen etwas höher setzen
+            //latency: This is how many "ping-pong" (connection interval) events the slave(server) device is allowed to skip without the client device considering the connection terminated. So if you had a 25ms connection interval and you wanted to sleep for 1 second you could set this value to 40 and the client would consider the connection active for up to 40 skipped intervals.
+            .latency = 30,            //up to 30 connection intervals
+            //timeout: This is the absolute (disconnection) timeout, if no packets are received by either device within this time the connection is considered terminated.
+            .supervision_timeout = 1860/10 //10ms units, laut apple größer als itvl_max * (latency + 1) * 3
+        };
+
+        ESP_ERROR_CHECK(ble_gap_update_params(event->connect.conn_handle, &connectionParameters));
+
         conn_handle = event->connect.conn_handle;
         break;
 
     case BLE_GAP_EVENT_DISCONNECT:
-        MODLOG_DFLT(INFO, "disconnect; reason=%d\n", event->disconnect.reason);
+        ESP_LOGI("ASDF", "disconnect; reason=%d\n", event->disconnect.reason);
 
         /* Connection terminated; resume advertising */
         blehr_advertise();
         break;
 
     case BLE_GAP_EVENT_ADV_COMPLETE:
-        MODLOG_DFLT(INFO, "adv complete\n");
+        ESP_LOGI("ASDF", "adv complete; reason = %d\n", event->adv_complete.reason);
         blehr_advertise();
         break;
 
     case BLE_GAP_EVENT_SUBSCRIBE:
-        MODLOG_DFLT(INFO, "subscribe event; cur_notify=%d\n value handle; val_handle=%d\n", event->subscribe.cur_notify, report_data_handle);
+        ESP_LOGI("ASDF", "subscribe event; cur_notify=%d\n value handle; val_handle=%d\n", event->subscribe.cur_notify, report_data_handle);
         if (event->subscribe.attr_handle == report_data_handle) {
             notify_state = event->subscribe.cur_notify;
             blehr_tx_hrate_reset();
@@ -219,7 +235,7 @@ blehr_gap_event(struct ble_gap_event *event, void *arg)
         break;
 
     case BLE_GAP_EVENT_MTU:
-        MODLOG_DFLT(INFO, "mtu update event; conn_handle=%d mtu=%d\n",
+        ESP_LOGI("ASDF", "mtu update event; mtu already updated; nothing todo; conn_handle=%d mtu=%d\n",
                     event->mtu.conn_handle,
                     event->mtu.value);
         break;
@@ -240,9 +256,9 @@ blehr_on_sync(void)
     uint8_t addr_val[6] = {0};
     rc = ble_hs_id_copy_addr(blehr_addr_type, addr_val, NULL);
 
-    MODLOG_DFLT(INFO, "Device Address: ");
+    ESP_LOGI("ASDF", "Device Address: ");
     print_addr(addr_val);
-    MODLOG_DFLT(INFO, "\n");
+    ESP_LOGI("ASDF", "\n");
 
     /* Begin advertising */
     blehr_advertise();
@@ -251,7 +267,7 @@ blehr_on_sync(void)
 static void
 blehr_on_reset(int reason)
 {
-    MODLOG_DFLT(ERROR, "Resetting state; reason=%d\n", reason);
+    ESP_LOGI("ASDF", "Resetting state; reason=%d\n", reason);
 }
 
 void blehr_host_task(void *param)