small changes

Author: fabiankuffer

.gitignore

@@ -1,2 +1,3 @@
 build/
-sdkconfig
+sdkconfig
+sdkconfig.old

components/ble/CMakeLists.txt

@@ -3,4 +3,4 @@ set(srcs "gap.c" "gatt.c" "ble.c")
 idf_component_register(SRCS "${srcs}"
                     INCLUDE_DIRS "include"
                     REQUIRES bt
-                    PRIV_REQUIRES nimble_peripheral_utils)
+                    PRIV_REQUIRES nimble_peripheral_utils ssd1306)

components/ble/ble.c

@@ -76,9 +76,6 @@ void initBLE(){
 void bleOnSync(void){
     int rc;
 
-    /* Generate a non-resolvable private address. */
-    //ble_app_set_addr();
-
     ble_hs_pvcy_rpa_config(1);
 
     /* Make sure we have proper identity address set (public preferred) */
@@ -90,7 +87,12 @@ void bleOnSync(void){
     assert(rc == 0);
 
     uint8_t addr_val[6] = {0};
-    rc = ble_hs_id_copy_addr(bleAddressType, addr_val, NULL);
+    if(BLE_HS_ENOADDR == ble_hs_id_copy_addr(BLE_ADDR_PUBLIC, addr_val, NULL)) {
+        ble_hs_id_copy_addr(BLE_ADDR_RANDOM, addr_val, NULL);
+        ESP_LOGI(tag_BLE, "Device Address-Type: random");
+    } else {
+        ESP_LOGI(tag_BLE, "Device Address-Type: public");
+    }
 
     ESP_LOGI(tag_BLE, "Device Address: ");
     print_addr(addr_val);

components/ble/gap.c

@@ -6,6 +6,10 @@
  *     o Undirected connectable mode
  */
 void bleAdvertise(void){
+    ssd1306_clear();
+    ssd1306_setString("Connecting",10,9);
+    ssd1306_display();
+
     struct ble_gap_adv_params adv_params;
     struct ble_hs_adv_fields fields;
     int rc;
@@ -81,6 +85,10 @@ int bleGAPEevent(struct ble_gap_event *event, void *arg) {
             /* Connection failed; resume advertising */
             bleAdvertise();
         } else {
+            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
@@ -101,15 +109,20 @@ int bleGAPEevent(struct ble_gap_event *event, void *arg) {
 
     case BLE_GAP_EVENT_DISCONNECT:
         ESP_LOGI(tag_GAP, "disconnect; reason=%d\n", event->disconnect.reason);
+        ESP_LOGI(tag_GAP, "%d",event->disconnect.conn.conn_handle);
+        print_addr(event->disconnect.conn.peer_id_addr.val);
         //531 = Remote User Terminated Connection
+        //517 = Authentication Failure
 
         /* Connection terminated; resume advertising */
         bleAdvertise();
         break;
 
     case BLE_GAP_EVENT_ADV_COMPLETE:
         ESP_LOGI(tag_GAP, "adv complete; reason = %d\n", event->adv_complete.reason);
-        bleAdvertise();
+        if(event->adv_complete.reason != 0){
+            bleAdvertise();
+        }
         break;
 
     case BLE_GAP_EVENT_SUBSCRIBE:
@@ -149,7 +162,7 @@ int bleGAPEevent(struct ble_gap_event *event, void *arg) {
          * establish a new secure link.  This app sacrifices security for
          * convenience: just throw away the old bond and accept the new link.
          */
-        ESP_LOGI(tag_GAP, "establisch new secure link");
+        ESP_LOGI(tag_GAP, "establish new secure link");
 
         /* Delete the old bond. */
         rc = ble_gap_conn_find(event->repeat_pairing.conn_handle, &desc);

components/ble/include/gap.h

@@ -10,6 +10,7 @@
 
 #include "gatt.h"
 #include "ble.h"
+#include "ssd1306.h"
 
 static const char *tag_GAP = "SimLinkModule_GAP";
 static const ble_uuid16_t hid_service_uuid = BLE_UUID16_INIT(0x1812);

main/CMakeLists.txt

@@ -1,2 +1,2 @@
-idf_component_register(SRCS "main.c" "gatt_svr.c"
+idf_component_register(SRCS "main.c"
                     INCLUDE_DIRS ".")

main/blehr_sens.h

@@ -11,22 +11,6 @@ static xTimerHandle blehr_tx_timer;
 
 static bool volumeUp = true;
 
-static void
-ble_app_set_addr(void)
-{
-    ble_addr_t addr;
-    int rc;
-
-    /* generate new non-resolvable private address */
-    rc = ble_hs_id_gen_rnd(0, &addr);
-    assert(rc == 0);
-
-    /* set generated address */
-    rc = ble_hs_id_set_rnd(addr.val);
-
-    assert(rc == 0);
-}
-
 /**
  * Utility function to log an array of bytes.
  */