From 231e1dfb4a0f0d8cdca94d07f4f5d06828eaeb27 Mon Sep 17 00:00:00 2001 From: demik Date: Sun, 19 Sep 2021 23:32:58 +0200 Subject: [PATCH] compile against SDK v4.2.2 --- ChangeLog.md | 5 +++++ main/SDK/quack.diff | 8 ++++---- sdkconfig | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index bd9678b..531e754 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,8 @@ +## v1.4.1 +- update to ESP-IDF v4.2.2: + - https://github.com/espressif/esp-idf/releases/tag/v4.2.2 + - fixed controller not reporting disconnect event + ## v1.4.0 - Initial firmare release - 1.4.x series is compatible with PCB 1.4 (EDA subfolder) diff --git a/main/SDK/quack.diff b/main/SDK/quack.diff index fac7b7f..95c774f 100644 --- a/main/SDK/quack.diff +++ b/main/SDK/quack.diff @@ -1,5 +1,5 @@ diff --git a/components/bt/host/bluedroid/bta/hh/bta_hh_le.c b/components/bt/host/bluedroid/bta/hh/bta_hh_le.c -index 6c86cb9be..8fdf1a1dc 100644 +index 6c86cb9be7..8fdf1a1dc3 100644 --- a/components/bt/host/bluedroid/bta/hh/bta_hh_le.c +++ b/components/bt/host/bluedroid/bta/hh/bta_hh_le.c @@ -498,7 +498,7 @@ tBTA_HH_LE_RPT *bta_hh_le_find_rpt_by_idtype(tBTA_HH_LE_RPT *p_head, UINT8 mode, @@ -12,7 +12,7 @@ index 6c86cb9be..8fdf1a1dc 100644 for (i = 0 ; i < BTA_HH_LE_RPT_MAX; i ++, p_rpt++) { diff --git a/components/esp_hid/include/esp_hidh.h b/components/esp_hid/include/esp_hidh.h -index b1a826430..bedcb42b6 100644 +index b1a8264307..bedcb42b65 100644 --- a/components/esp_hid/include/esp_hidh.h +++ b/components/esp_hid/include/esp_hidh.h @@ -100,6 +100,7 @@ typedef union { @@ -24,7 +24,7 @@ index b1a826430..bedcb42b6 100644 /** diff --git a/components/esp_hid/src/ble_hidh.c b/components/esp_hid/src/ble_hidh.c -index 5fe54f2fa..28cc35e29 100644 +index 5fe54f2fa7..28cc35e295 100644 --- a/components/esp_hid/src/ble_hidh.c +++ b/components/esp_hid/src/ble_hidh.c @@ -617,7 +617,7 @@ esp_err_t esp_ble_hidh_init(const esp_hidh_config_t *config) @@ -37,7 +37,7 @@ index 5fe54f2fa..28cc35e29 100644 }; ret = esp_event_loop_create(&event_task_args, &event_loop_handle); diff --git a/components/esp_hid/src/bt_hidh.c b/components/esp_hid/src/bt_hidh.c -index 1a17e6aa3..6ae12958f 100644 +index 1a17e6aa35..6ae12958ff 100644 --- a/components/esp_hid/src/bt_hidh.c +++ b/components/esp_hid/src/bt_hidh.c @@ -320,7 +320,7 @@ esp_err_t esp_bt_hidh_init(const esp_hidh_config_t *config) diff --git a/sdkconfig b/sdkconfig index e3a272b..023f3fd 100644 --- a/sdkconfig +++ b/sdkconfig @@ -549,6 +549,7 @@ CONFIG_ESP32_XTAL_FREQ_40=y CONFIG_ESP32_XTAL_FREQ=40 # CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set # CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set +# CONFIG_ESP32_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set # CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5 # end of ESP32-specific