fix esp-idf errors

jnthas · May 11, 2024 · 9c45f90 · 9c45f90
1 parent 8183749
commit 9c45f90
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git 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
diff --git a/components/ArduinoJson b/components/ArduinoJson
diff --git a/components/PNGdec b/components/PNGdec
diff --git 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")