From 9c45f903932d87f8d3bb7a17bf580312e1e0eaf1 Mon Sep 17 00:00:00 2001 From: Jonathas Barbosa Date: Sat, 11 May 2024 14:54:43 -0300 Subject: [PATCH] fix esp-idf errors --- .gitmodules | 8 ++++++++ components/ArduinoJson | 1 + components/PNGdec | 1 + main/CMakeLists.txt | 6 +++--- 4 files changed, 13 insertions(+), 3 deletions(-) create mode 160000 components/ArduinoJson create mode 160000 components/PNGdec diff --git a/.gitmodules b/.gitmodules index 73faa99..c643bc2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -53,4 +53,12 @@ [submodule "firmware/clockfaces/cw-cf-0x07"] path = firmware/clockfaces/cw-cf-0x07 url = https://github.com/jnthas/cw-cf-0x07.git + shallow = true +[submodule "components/ArduinoJson"] + path = components/ArduinoJson + url = https://github.com/bblanchon/ArduinoJson + shallow = true +[submodule "components/PNGdec"] + path = components/PNGdec + url = https://github.com/bitbank2/PNGdec shallow = true \ No newline at end of file diff --git a/components/ArduinoJson b/components/ArduinoJson new file mode 160000 index 0000000..071f718 --- /dev/null +++ b/components/ArduinoJson @@ -0,0 +1 @@ +Subproject commit 071f718473294344168357dcee130000c492ff8f diff --git a/components/PNGdec b/components/PNGdec new file mode 160000 index 0000000..a0f4b16 --- /dev/null +++ b/components/PNGdec @@ -0,0 +1 @@ +Subproject commit a0f4b166f547d1238798199e86d61942ccab712b diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 0802304..a039a56 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,9 +1,9 @@ -set(CLOCKFACES cw-cf-0x01 cw-cf-0x02 cw-cf-0x03 cw-cf-0x04 cw-cf-0x05 cw-cf-0x06) +set(CLOCKFACES cw-cf-0x01 cw-cf-0x02 cw-cf-0x03 cw-cf-0x04 cw-cf-0x05 cw-cf-0x06 cw-cf-0x07) idf_component_register( SRC_DIRS "." INCLUDE_DIRS ${PROJECT_DIR}/firmware/src - PRIV_REQUIRES ESP32-HUB75-MatrixPanel-I2S-DMA cw-commons cw-gfx-engine WiFiManager Improv-WiFi-Library arduino Adafruit-GFX-Library ${CLOCKFACES} + PRIV_REQUIRES ESP32-HUB75-MatrixPanel-I2S-DMA cw-commons cw-gfx-engine WiFiManager Improv-WiFi-Library arduino Adafruit-GFX-Library ArduinoJson PNGdec ${CLOCKFACES} ) -target_compile_options(${COMPONENT_TARGET} PUBLIC -DCW_FW_VERSION="1.2.2" -DCW_FW_NAME="Clockwise") +target_compile_options(${COMPONENT_TARGET} PUBLIC -DCW_FW_VERSION="1.4.2" -DCW_FW_NAME="Clockwise")