diff --git a/components/domotic_display/CMakeLists.txt b/components/domotic_display/CMakeLists.txt index 4b45e4c..dc025ac 100644 --- a/components/domotic_display/CMakeLists.txt +++ b/components/domotic_display/CMakeLists.txt @@ -8,7 +8,7 @@ make_font(24) idf_component_register(SRC_DIRS . fonts INCLUDE_DIRS "include" - REQUIRES meteofrance eventsManager lvgl) + REQUIRES meteofrance eventsManager lvgl esp32_p4_function_ev_board) if(${IDF_TARGET} STREQUAL "esp32p4") diff --git a/components/domotic_display/ihm.c b/components/domotic_display/ihm.c index c6bfd93..62d372c 100644 --- a/components/domotic_display/ihm.c +++ b/components/domotic_display/ihm.c @@ -5,6 +5,7 @@ #include "meteofrance.h" #include "cJSON.h" #include "eventsManager.h" +#include "bsp/esp-bsp.h" #define upEvent "monter" @@ -40,13 +41,6 @@ static lv_subject_t wifiStatus; LV_IMAGE_DECLARE(wifi_ok); LV_IMAGE_DECLARE(wifi_ko); -int bsp_display_lock(int arg){ - return 1; -} -void bsp_display_unlock(){ - -} - static void wifiStatus_obs_cb(lv_observer_t * observer, lv_subject_t * subject) { ESP_LOGV(TAG, "On passe dans le callback de chgt de statut; %li", lv_subject_get_int(subject)); diff --git a/components/domotic_display/test_host/mock/bsp/esp-bsp.h b/components/domotic_display/test_host/mock/bsp/esp-bsp.h new file mode 100644 index 0000000..9fd455d --- /dev/null +++ b/components/domotic_display/test_host/mock/bsp/esp-bsp.h @@ -0,0 +1,6 @@ +int bsp_display_lock(int arg){ + return 1; +} +void bsp_display_unlock(){ + +} \ No newline at end of file diff --git a/components/meteofrance/meteofrance.c b/components/meteofrance/meteofrance.c index 3727103..64214e3 100644 --- a/components/meteofrance/meteofrance.c +++ b/components/meteofrance/meteofrance.c @@ -11,8 +11,6 @@ #include "meteofrance.h" -#include "FreeRTOS.h" -#include "task.h" #include "esp_system.h" #include "esp_log.h" diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 12a6880..181713e 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -3,7 +3,7 @@ set(EXTRA_COMPONENT_DIRS ../components) set(comps heap nvs_flash meteofrance esp_netif image_downloader fatfs protocol_examples_common mqtt domotic_display ) if(${IDF_TARGET} STREQUAL "esp32p4") - list(APPEND comps sdmmc vfs littlefs wifi_logger app_update esp_https_ota espcoredump esp_http_server esp_wifi) + list(APPEND comps bsp_extra esp32_p4_function_ev_board sdmmc vfs littlefs wifi_logger app_update esp_https_ota espcoredump esp_http_server esp_wifi ) endif() idf_component_register(SRC_DIRS . INCLUDE_DIRS "." diff --git a/main/idf_component.yml b/main/idf_component.yml index 13754ee..4ef0e38 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -1,28 +1,29 @@ dependencies: - espressif/bh1750: "^1.0.3" - espressif/esp_wifi_remote: + espressif/bh1750: ^1.0.3 + espressif/esp_wifi_remote: rules: - - if: target in ["esp32p4"] - version: "0.14.4" + - if: target in ["esp32p4"] + version: 0.14.4 - suda-morris/am2302_rmt: - version: "^1.0.0" - rules: - - if: target in ["esp32p4"] - joltwallet/littlefs: + suda-morris/am2302_rmt: + version: ^1.0.0 rules: - - if: target in ["esp32p4"] - version: "^1.14.8" + - if: target in ["esp32p4"] + joltwallet/littlefs: + rules: + - if: target in ["esp32p4"] + version: ^1.14.8 esp_lcd_touch_gt911: rules: - - if: target in ["esp32p4"] + - if: target in ["esp32p4"] esp_lvgl_port: rules: - - if: target in ["esp32p4"] + - if: target in ["esp32p4"] version: 2.6.0 idf: - version: '5.5.*' + version: 5.5.* lvgl/lvgl: version: 9.4.0 #espressif/esp32_p4_function_ev_board: - # version: "4.1.*" \ No newline at end of file + # version: "4.1.*" + espressif/esp32_p4_function_ev_board: '*'