From c0651a50a7028b773cc127fc2ffc6228bf756a74 Mon Sep 17 00:00:00 2001 From: suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com> Date: Mon, 13 Nov 2023 17:07:54 +0100 Subject: [PATCH] Initial release --- .github/workflows/compile.yaml | 9 +++-- .../.gitignore | 0 .../.vscode/extensions.json | 0 .../.vscode/settings.json | 0 .../CMakeLists.txt | 2 +- .../include/README | 0 .../lib/README | 0 .../platformio.ini | 0 .../sdkconfig.esp32dev | 0 .../src/CMakeLists.txt | 0 .../src/conf/global_config.cpp | 0 .../src/conf/global_config.h | 0 .../src/conf/lv_conf.h | 0 .../src/core/data_setup.cpp | 0 .../src/core/data_setup.h | 0 .../src/core/files_query.cpp | 0 .../src/core/files_query.h | 0 .../src/core/screen_driver.cpp | 0 .../src/core/screen_driver.h | 0 .../src/main.cpp | 0 .../src/ui/ip_setup.cpp | 0 .../src/ui/ip_setup.h | 0 .../src/ui/main_ui.cpp | 0 .../src/ui/main_ui.h | 0 .../src/ui/nav_buttons.cpp | 0 .../src/ui/nav_buttons.h | 0 .../src/ui/panels/move_panel.cpp | 0 .../src/ui/panels/panel.h | 0 .../src/ui/panels/print_panel.cpp | 0 .../src/ui/panels/progress_panel.cpp | 0 .../src/ui/panels/settings_panel.cpp | 0 .../src/ui/panels/temp_panel.cpp | 0 .../src/ui/wifi_setup.cpp | 0 .../src/ui/wifi_setup.h | 0 .../test/README | 0 _site/index.html | 40 ++++++++++++++----- _site/manifest.json | 4 +- _site/manifest_wipe.json | 2 +- 38 files changed, 39 insertions(+), 18 deletions(-) rename {CYD-Klipper-Display => CYD-Klipper}/.gitignore (100%) rename {CYD-Klipper-Display => CYD-Klipper}/.vscode/extensions.json (100%) rename {CYD-Klipper-Display => CYD-Klipper}/.vscode/settings.json (100%) rename {CYD-Klipper-Display => CYD-Klipper}/CMakeLists.txt (75%) rename {CYD-Klipper-Display => CYD-Klipper}/include/README (100%) rename {CYD-Klipper-Display => CYD-Klipper}/lib/README (100%) rename {CYD-Klipper-Display => CYD-Klipper}/platformio.ini (100%) rename {CYD-Klipper-Display => CYD-Klipper}/sdkconfig.esp32dev (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/CMakeLists.txt (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/conf/global_config.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/conf/global_config.h (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/conf/lv_conf.h (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/core/data_setup.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/core/data_setup.h (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/core/files_query.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/core/files_query.h (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/core/screen_driver.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/core/screen_driver.h (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/main.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/ip_setup.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/ip_setup.h (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/main_ui.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/main_ui.h (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/nav_buttons.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/nav_buttons.h (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/panels/move_panel.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/panels/panel.h (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/panels/print_panel.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/panels/progress_panel.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/panels/settings_panel.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/panels/temp_panel.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/wifi_setup.cpp (100%) rename {CYD-Klipper-Display => CYD-Klipper}/src/ui/wifi_setup.h (100%) rename {CYD-Klipper-Display => CYD-Klipper}/test/README (100%) diff --git a/.github/workflows/compile.yaml b/.github/workflows/compile.yaml index 9cd14fb..179f9e4 100644 --- a/.github/workflows/compile.yaml +++ b/.github/workflows/compile.yaml @@ -28,7 +28,7 @@ jobs: - name: Build PlatformIO Project run: | - cd CYD-Klipper-Display + cd CYD-Klipper pio run - name: Make output dir @@ -37,9 +37,9 @@ jobs: - name: Build Binary run: | - cp ./CYD-Klipper-Display/.pio/build/esp32dev/bootloader.bin output - cp ./CYD-Klipper-Display/.pio/build/esp32dev/partitions.bin output - cp ./CYD-Klipper-Display/.pio/build/esp32dev/firmware.bin output + cp ./CYD-Klipper/.pio/build/esp32dev/bootloader.bin output + cp ./CYD-Klipper/.pio/build/esp32dev/partitions.bin output + cp ./CYD-Klipper/.pio/build/esp32dev/firmware.bin output cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin output python3 -m esptool --chip esp32 merge_bin -o ./output/merged-firmware.bin --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 ./output/bootloader.bin 0x8000 ./output/partitions.bin 0xe000 ./output/boot_app0.bin 0x10000 ./output/firmware.bin cp -r ./output ./_site @@ -59,6 +59,7 @@ jobs: url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest needs: build + if: github.event_name == 'push' && github.ref == 'refs/heads/master' steps: - name: Print GitHub event name run: | diff --git a/CYD-Klipper-Display/.gitignore b/CYD-Klipper/.gitignore similarity index 100% rename from CYD-Klipper-Display/.gitignore rename to CYD-Klipper/.gitignore diff --git a/CYD-Klipper-Display/.vscode/extensions.json b/CYD-Klipper/.vscode/extensions.json similarity index 100% rename from CYD-Klipper-Display/.vscode/extensions.json rename to CYD-Klipper/.vscode/extensions.json diff --git a/CYD-Klipper-Display/.vscode/settings.json b/CYD-Klipper/.vscode/settings.json similarity index 100% rename from CYD-Klipper-Display/.vscode/settings.json rename to CYD-Klipper/.vscode/settings.json diff --git a/CYD-Klipper-Display/CMakeLists.txt b/CYD-Klipper/CMakeLists.txt similarity index 75% rename from CYD-Klipper-Display/CMakeLists.txt rename to CYD-Klipper/CMakeLists.txt index 1d8e4c7..a6d263b 100644 --- a/CYD-Klipper-Display/CMakeLists.txt +++ b/CYD-Klipper/CMakeLists.txt @@ -1,3 +1,3 @@ cmake_minimum_required(VERSION 3.16.0) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(CYD-Klipper-Display) +project(CYD-Klipper) diff --git a/CYD-Klipper-Display/include/README b/CYD-Klipper/include/README similarity index 100% rename from CYD-Klipper-Display/include/README rename to CYD-Klipper/include/README diff --git a/CYD-Klipper-Display/lib/README b/CYD-Klipper/lib/README similarity index 100% rename from CYD-Klipper-Display/lib/README rename to CYD-Klipper/lib/README diff --git a/CYD-Klipper-Display/platformio.ini b/CYD-Klipper/platformio.ini similarity index 100% rename from CYD-Klipper-Display/platformio.ini rename to CYD-Klipper/platformio.ini diff --git a/CYD-Klipper-Display/sdkconfig.esp32dev b/CYD-Klipper/sdkconfig.esp32dev similarity index 100% rename from CYD-Klipper-Display/sdkconfig.esp32dev rename to CYD-Klipper/sdkconfig.esp32dev diff --git a/CYD-Klipper-Display/src/CMakeLists.txt b/CYD-Klipper/src/CMakeLists.txt similarity index 100% rename from CYD-Klipper-Display/src/CMakeLists.txt rename to CYD-Klipper/src/CMakeLists.txt diff --git a/CYD-Klipper-Display/src/conf/global_config.cpp b/CYD-Klipper/src/conf/global_config.cpp similarity index 100% rename from CYD-Klipper-Display/src/conf/global_config.cpp rename to CYD-Klipper/src/conf/global_config.cpp diff --git a/CYD-Klipper-Display/src/conf/global_config.h b/CYD-Klipper/src/conf/global_config.h similarity index 100% rename from CYD-Klipper-Display/src/conf/global_config.h rename to CYD-Klipper/src/conf/global_config.h diff --git a/CYD-Klipper-Display/src/conf/lv_conf.h b/CYD-Klipper/src/conf/lv_conf.h similarity index 100% rename from CYD-Klipper-Display/src/conf/lv_conf.h rename to CYD-Klipper/src/conf/lv_conf.h diff --git a/CYD-Klipper-Display/src/core/data_setup.cpp b/CYD-Klipper/src/core/data_setup.cpp similarity index 100% rename from CYD-Klipper-Display/src/core/data_setup.cpp rename to CYD-Klipper/src/core/data_setup.cpp diff --git a/CYD-Klipper-Display/src/core/data_setup.h b/CYD-Klipper/src/core/data_setup.h similarity index 100% rename from CYD-Klipper-Display/src/core/data_setup.h rename to CYD-Klipper/src/core/data_setup.h diff --git a/CYD-Klipper-Display/src/core/files_query.cpp b/CYD-Klipper/src/core/files_query.cpp similarity index 100% rename from CYD-Klipper-Display/src/core/files_query.cpp rename to CYD-Klipper/src/core/files_query.cpp diff --git a/CYD-Klipper-Display/src/core/files_query.h b/CYD-Klipper/src/core/files_query.h similarity index 100% rename from CYD-Klipper-Display/src/core/files_query.h rename to CYD-Klipper/src/core/files_query.h diff --git a/CYD-Klipper-Display/src/core/screen_driver.cpp b/CYD-Klipper/src/core/screen_driver.cpp similarity index 100% rename from CYD-Klipper-Display/src/core/screen_driver.cpp rename to CYD-Klipper/src/core/screen_driver.cpp diff --git a/CYD-Klipper-Display/src/core/screen_driver.h b/CYD-Klipper/src/core/screen_driver.h similarity index 100% rename from CYD-Klipper-Display/src/core/screen_driver.h rename to CYD-Klipper/src/core/screen_driver.h diff --git a/CYD-Klipper-Display/src/main.cpp b/CYD-Klipper/src/main.cpp similarity index 100% rename from CYD-Klipper-Display/src/main.cpp rename to CYD-Klipper/src/main.cpp diff --git a/CYD-Klipper-Display/src/ui/ip_setup.cpp b/CYD-Klipper/src/ui/ip_setup.cpp similarity index 100% rename from CYD-Klipper-Display/src/ui/ip_setup.cpp rename to CYD-Klipper/src/ui/ip_setup.cpp diff --git a/CYD-Klipper-Display/src/ui/ip_setup.h b/CYD-Klipper/src/ui/ip_setup.h similarity index 100% rename from CYD-Klipper-Display/src/ui/ip_setup.h rename to CYD-Klipper/src/ui/ip_setup.h diff --git a/CYD-Klipper-Display/src/ui/main_ui.cpp b/CYD-Klipper/src/ui/main_ui.cpp similarity index 100% rename from CYD-Klipper-Display/src/ui/main_ui.cpp rename to CYD-Klipper/src/ui/main_ui.cpp diff --git a/CYD-Klipper-Display/src/ui/main_ui.h b/CYD-Klipper/src/ui/main_ui.h similarity index 100% rename from CYD-Klipper-Display/src/ui/main_ui.h rename to CYD-Klipper/src/ui/main_ui.h diff --git a/CYD-Klipper-Display/src/ui/nav_buttons.cpp b/CYD-Klipper/src/ui/nav_buttons.cpp similarity index 100% rename from CYD-Klipper-Display/src/ui/nav_buttons.cpp rename to CYD-Klipper/src/ui/nav_buttons.cpp diff --git a/CYD-Klipper-Display/src/ui/nav_buttons.h b/CYD-Klipper/src/ui/nav_buttons.h similarity index 100% rename from CYD-Klipper-Display/src/ui/nav_buttons.h rename to CYD-Klipper/src/ui/nav_buttons.h diff --git a/CYD-Klipper-Display/src/ui/panels/move_panel.cpp b/CYD-Klipper/src/ui/panels/move_panel.cpp similarity index 100% rename from CYD-Klipper-Display/src/ui/panels/move_panel.cpp rename to CYD-Klipper/src/ui/panels/move_panel.cpp diff --git a/CYD-Klipper-Display/src/ui/panels/panel.h b/CYD-Klipper/src/ui/panels/panel.h similarity index 100% rename from CYD-Klipper-Display/src/ui/panels/panel.h rename to CYD-Klipper/src/ui/panels/panel.h diff --git a/CYD-Klipper-Display/src/ui/panels/print_panel.cpp b/CYD-Klipper/src/ui/panels/print_panel.cpp similarity index 100% rename from CYD-Klipper-Display/src/ui/panels/print_panel.cpp rename to CYD-Klipper/src/ui/panels/print_panel.cpp diff --git a/CYD-Klipper-Display/src/ui/panels/progress_panel.cpp b/CYD-Klipper/src/ui/panels/progress_panel.cpp similarity index 100% rename from CYD-Klipper-Display/src/ui/panels/progress_panel.cpp rename to CYD-Klipper/src/ui/panels/progress_panel.cpp diff --git a/CYD-Klipper-Display/src/ui/panels/settings_panel.cpp b/CYD-Klipper/src/ui/panels/settings_panel.cpp similarity index 100% rename from CYD-Klipper-Display/src/ui/panels/settings_panel.cpp rename to CYD-Klipper/src/ui/panels/settings_panel.cpp diff --git a/CYD-Klipper-Display/src/ui/panels/temp_panel.cpp b/CYD-Klipper/src/ui/panels/temp_panel.cpp similarity index 100% rename from CYD-Klipper-Display/src/ui/panels/temp_panel.cpp rename to CYD-Klipper/src/ui/panels/temp_panel.cpp diff --git a/CYD-Klipper-Display/src/ui/wifi_setup.cpp b/CYD-Klipper/src/ui/wifi_setup.cpp similarity index 100% rename from CYD-Klipper-Display/src/ui/wifi_setup.cpp rename to CYD-Klipper/src/ui/wifi_setup.cpp diff --git a/CYD-Klipper-Display/src/ui/wifi_setup.h b/CYD-Klipper/src/ui/wifi_setup.h similarity index 100% rename from CYD-Klipper-Display/src/ui/wifi_setup.h rename to CYD-Klipper/src/ui/wifi_setup.h diff --git a/CYD-Klipper-Display/test/README b/CYD-Klipper/test/README similarity index 100% rename from CYD-Klipper-Display/test/README rename to CYD-Klipper/test/README diff --git a/_site/index.html b/_site/index.html index 3cf1822..67118a8 100644 --- a/_site/index.html +++ b/_site/index.html @@ -1,12 +1,32 @@ - + - + + + + + + +
+

CYD-Klipper

+

An implementation of a Klipper status display on an ESP32 + screen.
Uses Moonraker to fetch data.

+ GitHub release (with filter) + GitHub repo +
+

Install

+

Note: You may need to hold the 'BOOT' button on the device while pressing install

+ +
+
+ \ No newline at end of file diff --git a/_site/manifest.json b/_site/manifest.json index 053e058..d8029dc 100644 --- a/_site/manifest.json +++ b/_site/manifest.json @@ -1,6 +1,6 @@ { - "name": "CYD-Klipper-Display", - "new_install_prompt_erase": false, + "name": "CYD-Klipper", + "new_install_prompt_erase": true, "builds": [ { "chipFamily": "ESP32", diff --git a/_site/manifest_wipe.json b/_site/manifest_wipe.json index 3e065f3..8e471f8 100644 --- a/_site/manifest_wipe.json +++ b/_site/manifest_wipe.json @@ -1,5 +1,5 @@ { - "name": "CYD-Klipper-Display", + "name": "CYD-Klipper", "new_install_prompt_erase": false, "builds": [ {