From a8ca031f2cc9616db5f3f6a7450aa0128978c3f8 Mon Sep 17 00:00:00 2001 From: Harun Date: Wed, 7 May 2025 06:55:45 +0000 Subject: [PATCH 1/4] Refactor CMakeLists.txt for ESP-IDF compatibility, update README with dependency instructions, and add idf_component.yml for project metadata --- CMakeLists.txt | 15 ++++++++------- README.md | 6 ++++++ idf_component.yml | 4 ++++ 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 idf_component.yml diff --git a/CMakeLists.txt b/CMakeLists.txt index b4637c7d..5e1f270c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,11 @@ +# ESP_PLATFORM: Set to 1 when the CMake file is processed within the ESP-IDF build system. if(ESP_PLATFORM) - # for arduino as component ESP-IDF - # get_filename_component(dir ${CMAKE_CURRENT_LIST_FILE} PATH) - # FILE(GLOB_RECURSE app_sources ${dir}/src/eez/*.c*) - # idf_component_register(SRCS ${app_sources} - # INCLUDE_DIRS "src" "src/eez/libs/agg" - # PRIV_REQUIRES arduino lvgl - # ) + + file(GLOB_RECURSE app_sources src/eez/*.c*) + idf_component_register(SRCS ${app_sources} + INCLUDE_DIRS "src" "src/eez/libs/agg" "src/eez/platform/simulator/" + PRIV_REQUIRES lvgl + ) else() cmake_minimum_required(VERSION 3.12) @@ -23,3 +23,4 @@ else() target_include_directories(eez-framework SYSTEM PUBLIC ./src ./src/eez/libs/agg) endif() + diff --git a/README.md b/README.md index 119427ca..c1c2f422 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,12 @@ This library, called eez-framework, is used in combination with the [EEZ Studio](https://github.com/eez-open/studio). When EEZ Studio generates C/C++ for your eez-project, and your eez-project is using EEZ Flow or EEZ-GUI, then you will need this library. It is written in C++. +# For ESP-IDF Users + +``` +idf.py add-dependency haruny/eez-framework +``` + # For LVGL users Only if you want to use EEZ Flow with your LVGL based project you will need this libary. diff --git a/idf_component.yml b/idf_component.yml new file mode 100644 index 00000000..a52b03e7 --- /dev/null +++ b/idf_component.yml @@ -0,0 +1,4 @@ +description: EEZ Framework for ESP-IDF +license: MIT +url: https://github.com/haruny/eez-framework/tree/esp-idf +version: 0.0.1 \ No newline at end of file From f1a326f1a8f9d8715f3eb393d546ecec9a280ba3 Mon Sep 17 00:00:00 2001 From: Harun Y Date: Wed, 7 May 2025 00:18:51 -0700 Subject: [PATCH 2/4] Update idf_component.yml correcting the URL for pull request. --- idf_component.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idf_component.yml b/idf_component.yml index a52b03e7..4a601120 100644 --- a/idf_component.yml +++ b/idf_component.yml @@ -1,4 +1,4 @@ description: EEZ Framework for ESP-IDF license: MIT -url: https://github.com/haruny/eez-framework/tree/esp-idf -version: 0.0.1 \ No newline at end of file +url: https://github.com/eez-open/eez-framework +version: 0.0.1 From ea9a77ec3eb2c1a604123a46c4dc0e018ffb029c Mon Sep 17 00:00:00 2001 From: Harun Y Date: Wed, 7 May 2025 00:19:32 -0700 Subject: [PATCH 3/4] Update README.md correcting the URL for pull request. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c1c2f422..d3ea57aa 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This library, called eez-framework, is used in combination with the [EEZ Studio] # For ESP-IDF Users ``` -idf.py add-dependency haruny/eez-framework +idf.py add-dependency eez-open/eez-framework ``` # For LVGL users From 9cb7c3b766cd9b61bf2e80f823ab463e81fac005 Mon Sep 17 00:00:00 2001 From: Harun Y Date: Wed, 7 May 2025 00:27:42 -0700 Subject: [PATCH 4/4] Update README.md please revert these lines if you are submitting your own repository --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d3ea57aa..06237143 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,12 @@ This library, called eez-framework, is used in combination with the [EEZ Studio](https://github.com/eez-open/studio). When EEZ Studio generates C/C++ for your eez-project, and your eez-project is using EEZ Flow or EEZ-GUI, then you will need this library. It is written in C++. # For ESP-IDF Users +Add the following lines in your idf_components.yml ``` -idf.py add-dependency eez-open/eez-framework + eez-framework: + version: * + git: https://github.com/eez-open/eez-framework.git ``` # For LVGL users