update to esp-idf 5.0

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
+                    REQUIRES bt nimble_peripheral_utils ssd1306 crsf nvs_flash
                     PRIV_REQUIRES )

components/ble/ble.c

@@ -18,7 +18,8 @@ void initBLE(){
     }
     ESP_ERROR_CHECK(ret);
 
-    ESP_ERROR_CHECK(esp_nimble_hci_and_controller_init());
+    //Controller initialization, enable and HCI initialization calls have been moved to nimble_port_init. This function can be deleted directly.
+    //ESP_ERROR_CHECK(esp_nimble_hci_and_controller_init());
 
     nimble_port_init();
 

components/ble/gap.c

@@ -186,11 +186,11 @@ int bleGAPEevent(struct ble_gap_event *event, void *arg) {
         if (event->passkey.params.action == BLE_SM_IOACT_DISP) {
             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", pkey.passkey);
+            ESP_LOGI(tag_GAP, "Enter passkey %d on the peer side", (int)pkey.passkey);
             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", event->passkey.params.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");
             pkey.action = event->passkey.params.action;
             if (scli_receive_key(&key)) {

components/crsf/crsf.c

@@ -83,7 +83,7 @@ void crsf_get_ChannelData_task(void *arg)
         if(length){
 
             //read uart data
-            int len = uart_read_bytes(UART_NUM_2, data, length, 20 / portTICK_RATE_MS);
+            int len = uart_read_bytes(UART_NUM_2, data, length, 20 / portTICK_PERIOD_MS);
 
             //RX Buffer leeren wenn Frame im temporären buffer
             uart_flush(UART_NUM_2);
@@ -227,6 +227,7 @@ void crsf_get_ChannelData_task(void *arg)
 
                                     if(notify_state){
                                         om = ble_hs_mbuf_from_flat(&channelData, sizeof(channelData));
+                                        //Deprecated. Should not be used. Use ble_gatts_notify_custom instead.
                                         rc = ble_gattc_notify_custom(conn_handle, report_data_handle, om);
 
                                         //assert(rc == 0);

components/ssd1306/CMakeLists.txt

@@ -1,4 +1,5 @@
 set(srcs "ssd1306.c")
 
 idf_component_register(SRCS "${srcs}"
-                    INCLUDE_DIRS "include")
+                    INCLUDE_DIRS "include"
+                    REQUIRES driver)

components/ssd1306/include/ssd1306.h

@@ -66,7 +66,7 @@
 #define SSD1306_CMD_DEACTIVE_SCROLL        0x2E
 
 //buffer damit der aktuelle Output auch im Speicher des ESP vorhanden ist
-uint8_t* ssd1306_buffer;
+static uint8_t* ssd1306_buffer;
 
 void ssd1306_init();
 void I2C_master_init();