Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix esp-idf errors in cw-cf-0x07 #70

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix esp-idf errors in cw-cf-0x07 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions components/ArduinoJson
Open in desktop
Submodule ArduinoJson added at 071f71
1 change: 1 addition & 0 deletions components/PNGdec
Open in desktop
Submodule PNGdec added at a0f4b1
6 changes: 3 additions & 3 deletions main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Loading