diff --git a/.github/workflows/esp-idf.yml b/.github/workflows/esp-idf.yml deleted file mode 100644 index 7e936b0..0000000 --- a/.github/workflows/esp-idf.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: ESP-IDF CI Actions - -on: - push: - paths-ignore: - - '**.md' - pull_request: - paths-ignore: - - '**.md' - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - name: Checkout repo - uses: actions/checkout@v3 - with: - submodules: 'recursive' - - name: esp-idf build - uses: espressif/esp-idf-ci-action@v1 - with: - esp_idf_version: v4.4.4 - target: esp32 diff --git a/.gitignore b/.gitignore index e7b6bb0..d528ae6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,3 @@ -# Ignore the "build" directory created by esp-idf -build - -# Ignore the user-customized project configuration file. -# (https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/kconfig.html) -sdkconfig* -# Unignore the default project configuration file. -!sdkconfig.defaults - # Ignore IDE configs .vscode diff --git a/.gitmodules b/.gitmodules index c643bc2..b03df47 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,47 +18,11 @@ path = firmware/clockfaces/cw-cf-0x05 url = https://github.com/jnthas/cw-cf-0x05 shallow = true -[submodule "components/ezTime"] - path = components/ezTime - url = https://github.com/ropg/ezTime.git - shallow = true -[submodule "components/ESP32-HUB75-MatrixPanel-I2S-DMA"] - path = components/ESP32-HUB75-MatrixPanel-I2S-DMA - url = https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-I2S-DMA.git - shallow = true -[submodule "components/Adafruit_BusIO"] - path = components/Adafruit_BusIO - url = https://github.com/adafruit/Adafruit_BusIO.git - shallow = true -[submodule "components/Adafruit-GFX-Library"] - path = components/Adafruit-GFX-Library - url = https://github.com/adafruit/Adafruit-GFX-Library.git - shallow = true -[submodule "components/arduino"] - path = components/arduino - url = https://github.com/espressif/arduino-esp32.git - shallow = true -[submodule "components/Improv-WiFi-Library"] - path = components/Improv-WiFi-Library - url = https://github.com/jnthas/Improv-WiFi-Library.git - shallow = true [submodule "firmware/clockfaces/cw-cf-0x06"] path = firmware/clockfaces/cw-cf-0x06 url = https://github.com/jnthas/cw-cf-0x06.git shallow = true -[submodule "components/WiFiManager"] - path = components/WiFiManager - url = https://github.com/tzapu/WiFiManager - shallow = true [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/CHECKLIST.md b/CHECKLIST.md index 23479dc..826423c 100644 --- a/CHECKLIST.md +++ b/CHECKLIST.md @@ -12,7 +12,5 @@ Just a checklist to follow the steps to be done when releasing a new version of - [ ] For new clockfaces - [ ] Add new folder with the clockface code in the branch [gh-pages](https://github.com/jnthas/clockwise/tree/gh-pages/static/firmware/cw-cf-0x01) - [ ] Include the new clockface in the [CI/CD file](https://github.com/jnthas/clockwise/blob/main/.github/workflows/clockwise-ci.yml) - - [ ] Add the [CMakeLists.txt](https://github.com/jnthas/cw-cf-0x07/blob/12eb5e70f0d4993d8531b871ad02f3964b76e582/CMakeLists.txt) in the new clokface repository -- [ ] Check if [ESP-IDF CI](https://github.com/jnthas/clockwise/actions) is passing without errors - [ ] Create a branch called releases/1.x.x (it will trigger the build and release) - [ ] Create a tag (add the same description of the CHANGELOG) diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 86a373a..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -set(EXTRA_COMPONENT_DIRS "firmware/clockfaces" "firmware/lib") -include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(clockwise) diff --git a/README.md b/README.md index 50caacb..69323c7 100644 --- a/README.md +++ b/README.md @@ -62,12 +62,9 @@ Mario Bros | Words | World Map | Castlevania | Pacman | Pokedex | Canvas ## How to Build -You can start developing and customizing Clockwise in two different ways: +You can start developing and customizing Clockwise using **PlatformIO** — advanced usage for developers. -1. **PlatformIO** — advanced usage for developers -2. **ESP-IDF** — for full control - -👉 [Both are described in the Flashing section of the Wiki](https://github.com/jnthas/clockwise/wiki/%F0%9F%92%BE-Flashing-the-Firmware) +👉 [It is described in the Flashing section of the Wiki](https://github.com/jnthas/clockwise/wiki/%F0%9F%92%BE-Flashing-the-Firmware) --- diff --git a/components/Adafruit-GFX-Library b/components/Adafruit-GFX-Library deleted file mode 160000 index 2b3e458..0000000 --- a/components/Adafruit-GFX-Library +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2b3e45853a9457e915f71602c3a1060d271a58bc diff --git a/components/Adafruit_BusIO b/components/Adafruit_BusIO deleted file mode 160000 index 42e31a2..0000000 --- a/components/Adafruit_BusIO +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 42e31a252f3cfd81aaa5668258d3dcb837524660 diff --git a/components/ArduinoJson b/components/ArduinoJson deleted file mode 160000 index 071f718..0000000 --- a/components/ArduinoJson +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 071f718473294344168357dcee130000c492ff8f diff --git a/components/ESP32-HUB75-MatrixPanel-I2S-DMA b/components/ESP32-HUB75-MatrixPanel-I2S-DMA deleted file mode 160000 index ebdf46d..0000000 --- a/components/ESP32-HUB75-MatrixPanel-I2S-DMA +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ebdf46da193d83c15b46dd2b6d31b144f05c594c diff --git a/components/Improv-WiFi-Library b/components/Improv-WiFi-Library deleted file mode 160000 index 9a7eed9..0000000 --- a/components/Improv-WiFi-Library +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9a7eed963418e053d4418998f23d7ea76c4a8aca diff --git a/components/PNGdec b/components/PNGdec deleted file mode 160000 index a0f4b16..0000000 --- a/components/PNGdec +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a0f4b166f547d1238798199e86d61942ccab712b diff --git a/components/WiFiManager b/components/WiFiManager deleted file mode 160000 index aa8856a..0000000 --- a/components/WiFiManager +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aa8856adf30b55d3e26100212d4b42b5f29717f4 diff --git a/components/arduino b/components/arduino deleted file mode 160000 index f49931f..0000000 --- a/components/arduino +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f49931f902406f23b40e457e31bdb84cec974e78 diff --git a/components/ezTime b/components/ezTime deleted file mode 160000 index 7b3c8aa..0000000 --- a/components/ezTime +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7b3c8aa020be818ac149e0762543ac5e81ccfabe diff --git a/firmware/lib/cw-commons/CMakeLists.txt b/firmware/lib/cw-commons/CMakeLists.txt deleted file mode 100644 index ce3d9de..0000000 --- a/firmware/lib/cw-commons/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -# ezTime -# This can be removed if https://github.com/ropg/ezTime/pull/157 is merged in. -set (SRC_DIRS ${PROJECT_DIR}/components/ezTime/src) -set (INCLUDE_DIRS ${PROJECT_DIR}/components/ezTime/src) - - -idf_component_register( - INCLUDE_DIRS "." ${SRC_DIRS} - SRC_DIRS "." ${INCLUDE_DIRS} - REQUIRES arduino - ) - -project(cw-gfx-commons) diff --git a/firmware/lib/cw-gfx-engine/CMakeLists.txt b/firmware/lib/cw-gfx-engine/CMakeLists.txt deleted file mode 100644 index 371f064..0000000 --- a/firmware/lib/cw-gfx-engine/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -idf_component_register( - INCLUDE_DIRS "." - SRC_DIRS "." - REQUIRES arduino Adafruit-GFX-Library - ) -project(cw-gfx-engine) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt deleted file mode 100644 index a039a56..0000000 --- a/main/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -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 ArduinoJson PNGdec ${CLOCKFACES} - ) - -target_compile_options(${COMPONENT_TARGET} PUBLIC -DCW_FW_VERSION="1.4.2" -DCW_FW_NAME="Clockwise") diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild deleted file mode 100644 index 845d7d9..0000000 --- a/main/Kconfig.projbuild +++ /dev/null @@ -1,30 +0,0 @@ -menu "Clockwise Configuration" - - config HUB75_BLUE_GREEN_SWAP - bool "Swap blue and green colors" - help - Some 64x64 HUB75 displays have the green and blue pins reversed. Enable this option to swap these pins. - - choice CLOCKFACE - prompt "Clockwise display" - default CLOCKFACE_MARIO - - config CLOCKFACE_MARIO - bool "Mario" - - config CLOCKFACE_TIME_IN_WORDS - bool "Time in words" - - config CLOCKFACE_WORLDMAP - bool "World map" - - config CLOCKFACE_CASTLEVANIA - bool "Castlevania" - - config CLOCKFACE_PACMAN - bool "Pacman" - - - endchoice # CLOCKFACE - -endmenu diff --git a/main/main.cpp b/main/main.cpp deleted file mode 100644 index c225717..0000000 --- a/main/main.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include - -#define HUB75_BLUE_GREEN_SWAP CONFIG_HUB75_BLUE_GREEN_SWAP - -#include "../firmware/src/main.cpp" diff --git a/sdkconfig.defaults b/sdkconfig.defaults deleted file mode 100644 index a1664b3..0000000 --- a/sdkconfig.defaults +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_AUTOSTART_ARDUINO=y -CONFIG_FREERTOS_HZ=1000