removed unnecessary component and display output updated

Author: fabiankuffer

components/ble/CMakeLists.txt

@@ -2,5 +2,5 @@ set(srcs "gap.c" "gatt.c" "ble.c")
 
 idf_component_register(SRCS "${srcs}"
                     INCLUDE_DIRS "include"
-                    REQUIRES bt nimble_peripheral_utils ssd1306 crsf nvs_flash battery
+                    REQUIRES bt ssd1306 crsf nvs_flash battery
                     PRIV_REQUIRES )

components/ble/ble.c

@@ -48,7 +48,8 @@ void initBLE(){
     //BLE_SM_IO_CAP_KEYBOARD_ONLY = Keyboard only
     //BLE_SM_IO_CAP_NO_IO = just work
     //BLE_SM_IO_CAP_KEYBOARD_DISP = Keyboard and display
-    ble_hs_cfg.sm_io_cap = BLE_SM_IO_CAP_NO_IO;
+    //BLE_SM_IO_CAP_KEYBOARD_ONLY && BLE_SM_IO_CAP_KEYBOARD_DISP not implemented
+    ble_hs_cfg.sm_io_cap = BLE_SM_IO_CAP_DISP_YES_NO;
     /*Security Manager secure connections flag
     if set proper flag in pairing request/response will be set. this results in using LE Secure Connections for pairing if also supported by remote device. Fallback to legacy pairing if not supported by remote.*/
     ble_hs_cfg.sm_sc = 1;

components/ble/gap.c

@@ -92,7 +92,6 @@ int bleGAPEevent(struct ble_gap_event *event, void *arg) {
             ssd1306_clear();
             ssd1306_display();
 
-
             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
@@ -167,6 +166,10 @@ int bleGAPEevent(struct ble_gap_event *event, void *arg) {
     case BLE_GAP_EVENT_ENC_CHANGE:
         ESP_LOGI(tag_GAP, "encryption change event; status=%d ",
                     event->enc_change.status);
+        if(event->enc_change.status == 0){
+            ssd1306_setConnectedImage();
+            ssd1306_display();
+        }
         break;
     case BLE_GAP_EVENT_REPEAT_PAIRING:
         /* We already have a bond with the peer, but it is attempting to
@@ -187,46 +190,46 @@ int bleGAPEevent(struct ble_gap_event *event, void *arg) {
         break;
 
     case BLE_GAP_EVENT_PASSKEY_ACTION:
+        //https://community.nxp.com/t5/Wireless-Connectivity-Knowledge/KW36-Enabling-Out-Of-Band-Pairing-on-a-Bluetooth-LE-Central-and/tac-p/1238698
         ESP_LOGI(tag_GAP, "PASSKEY_ACTION_EVENT started \n");
 
         struct ble_sm_io pkey = {0};
         int key = 0;
 
         if (event->passkey.params.action == BLE_SM_IOACT_DISP) {
+            //BLE_SM_IO_CAP_DISP_ONLY option
             pkey.action = event->passkey.params.action;
-            pkey.passkey = 123456; // This is the passkey to be entered on peer
-            ESP_LOGI(tag_GAP, "Enter passkey %d on the peer side", (int)pkey.passkey);
+            pkey.passkey = 123456;
+            
+            ssd1306_clear();
+            ssd1306_setString("PIN",48,0);
+            ssd1306_setString("123456",31,18);
+            ssd1306_display();
+            //display passkey for the other side 123456
+
             rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey);
             ESP_LOGI(tag_GAP, "ble_sm_inject_io result: %d\n", rc);
         } else if (event->passkey.params.action == BLE_SM_IOACT_NUMCMP) {
-            ESP_LOGI(tag_GAP, "Passkey on device's display: %d", (int)event->passkey.params.numcmp);
-            ESP_LOGI(tag_GAP, "Accept or reject the passkey through console in this format -> key Y or key N");
+            //BLE_SM_IO_CAP_DISP_YES_NO option
+
+            //gegenseite kann auch mit yes oder no bestätigen den pin
+            //verify with buttons Yes or No --> add timeout after x seconds
+            char pinStr[12];
+            snprintf(pinStr, 12,"%d", (int)event->passkey.params.numcmp);
+            ssd1306_clear();
+            ssd1306_setString(pinStr,0,0);
+            ssd1306_setString("ja",0,18);
+            ssd1306_setString("nein",128-43,18);
+            ssd1306_display();
+
             pkey.action = event->passkey.params.action;
-            if (scli_receive_key(&key)) {
-                pkey.numcmp_accept = key;
+            if (true) {
+                pkey.numcmp_accept = true;
             } else {
                 pkey.numcmp_accept = 0;
                 ESP_LOGE(tag_GAP, "Timeout! Rejecting the key");
             }
-            rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey);
-            ESP_LOGI(tag_GAP, "ble_sm_inject_io result: %d\n", rc);
-        } else if (event->passkey.params.action == BLE_SM_IOACT_OOB) {
-            static uint8_t tem_oob[16] = {0};
-            pkey.action = event->passkey.params.action;
-            for (int i = 0; i < 16; i++) {
-                pkey.oob[i] = tem_oob[i];
-            }
-            rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey);
-            ESP_LOGI(tag_GAP, "ble_sm_inject_io result: %d\n", rc);
-        } else if (event->passkey.params.action == BLE_SM_IOACT_INPUT) {
-            ESP_LOGI(tag_GAP, "Enter the passkey through console in this format-> key 123456");
-            pkey.action = event->passkey.params.action;
-            if (scli_receive_key(&key)) {
-                pkey.passkey = key;
-            } else {
-                pkey.passkey = 0;
-                ESP_LOGE(tag_GAP, "Timeout! Passing 0 as the key");
-            }
+
             rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey);
             ESP_LOGI(tag_GAP, "ble_sm_inject_io result: %d\n", rc);
         }
@@ -235,6 +238,10 @@ int bleGAPEevent(struct ble_gap_event *event, void *arg) {
         //Represents a transmitted ATT notification or indication, or a
         //completed indication transaction.
         return 0;
+    case BLE_GAP_EVENT_IDENTITY_RESOLVED:
+        ssd1306_setConnectedImage();
+        ssd1306_display();
+        return 0;
     default:
         ESP_LOGI(tag_GAP, "GAP EVENT ID: %d\n",event->type);
     }

components/ble/include/gap.h

@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "host/ble_hs.h"
-#include "esp_peripheral.h"
 
 #include "esp_log.h"
 

components/nimble_peripheral_utils/CMakeLists.txt

@@ -75,5 +75,6 @@ void ssd1306_display();
 void ssd1306_setPixel(uint8_t x, uint8_t y, bool status);
 void ssd1306_setChar(char c, uint8_t x, uint8_t y);
 void ssd1306_setString(const char* str, uint8_t x, uint8_t y);
+void ssd1306_setConnectedImage();
 
 #endif

components/nimble_peripheral_utils/esp_peripheral.h

@@ -0,0 +1,10 @@
+#ifndef SSD1306_IMAGES_H
+#define SSD1306_IMAGES_H
+
+//drawn in: https://www.pixilart.com/draw
+//converted from png to bitstring with: https://www.dcode.fr/binary-image
+//convert bitstring to hex array: Bin2Hex.py <filename> in tools folder
+
+const uint8_t connectedImage[] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xC0,0xE0,0xF0,0xF8,0xF8,0xFC,0xFC,0xFC,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0x00,0x00,0x00,0x00,0x00,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFC,0xFC,0xFC,0xF8,0xF8,0xF0,0xE0,0xC0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xC0,0xE0,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0xC0,0xC0,0xC0,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x80,0x80,0xF0,0xFC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x06,0x06,0x06,0x06,0x06,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0xF0,0xE0,0xE0,0x60,0x60,0x60,0x70,0x30,0x30,0x30,0x38,0x18,0x18,0x18,0x18,0x18,0x1C,0x0C,0x0E,0x0E,0x06,0x06,0x06,0x06,0x0E,0x0C,0x0C,0x0C,0x0C,0x0C,0x1C,0x1C,0x18,0x18,0x38,0x38,0x30,0x30,0x70,0xE0,0xE0,0xC0,0x80,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x03,0x03,0x07,0x06,0x0E,0x0E,0x0C,0x1C,0x18,0x18,0x18,0x18,0x18,0x1C,0x0C,0x0C,0x0C,0x0C,0x0E,0x0E,0x06,0x06,0x06,0x07,0x03,0x03,0x03,0x03,0x01,0x01,0x0F,0x3F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x60,0x60,0x60,0x60,0x60,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x3F,0x0F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x0F,0x1F,0x1F,0x3F,0x3F,0x3F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x00,0x00,0x00,0x00,0x00,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x3F,0x3F,0x3F,0x1F,0x1F,0x0F,0x07,0x03,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+#endif