Skip to content

Commit

Permalink
Merge branch 'fix/chatgpt_factory_nvs' into 'master'
Browse files Browse the repository at this point in the history
example(chatgpt): fix build with idf 5.2

See merge request ae_group/esp-box!107
  • Loading branch information
leeebo committed Apr 26, 2024
2 parents 78531c7 + 24219f7 commit a9bbead
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
17 changes: 2 additions & 15 deletions examples/chatgpt_demo/factory_nvs/main/app/app_ui_events.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,7 @@
#include "esp_system.h"
#include "esp_log.h"
#include "lvgl.h"

#if (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 3)
#include "hal/usb_wrap_ll.h"
#elif (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 1)
#include "hal/usb_fsls_phy_ll.h"
#else
#include "hal/usb_phy_ll.h"
#endif
#include "esp_tinyuf2.h"

static char *TAG = "NVS: ui-events";

Expand All @@ -22,12 +15,6 @@ void EventBtnSetupClick(lv_event_t *e)
ESP_LOGI(TAG, "btn click!");
// Configure USB PHY, Change back to USB-Serial-Jtag

#if (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 3)
usb_wrap_ll_phy_enable_external(&USB_WRAP, true);
#elif (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 1)
usb_fsls_phy_ll_int_jtag_enable(&USB_SERIAL_JTAG);
#else
usb_phy_ll_int_jtag_enable(&USB_SERIAL_JTAG);
#endif
esp_tinyuf2_uninstall();
esp_restart();
}
3 changes: 2 additions & 1 deletion examples/chatgpt_demo/factory_nvs/main/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## IDF Component Manager Manifest File
dependencies:
espressif/esp_tinyuf2: "^0.1.0"
espressif/esp_tinyuf2:
version: "0.2.*"
# espressif/esp-box: "~2.2.0"
## Required IDF version
idf:
Expand Down

0 comments on commit a9bbead

Please sign in to comment.