diff --git a/CYD-Klipper/platformio.ini b/CYD-Klipper/platformio.ini index 947fad0..469f9b5 100644 --- a/CYD-Klipper/platformio.ini +++ b/CYD-Klipper/platformio.ini @@ -112,4 +112,5 @@ build_flags = # -DCYD_SCREEN_FONT=&lv_font_montserrat_16 # -DCYD_SCREEN_FONT_SMALL=&lv_font_montserrat_12 # -DCYD_SCREEN_SIDEBAR_SIZE_PX=50 -# -DCYD_SCREEN_DRIVER_ESP32_SMARTDISPLAY=1 \ No newline at end of file +# -DCYD_SCREEN_DRIVER_ESP32_SMARTDISPLAY=1 +# -DCYD_SCREEN_DISABLE_TIMEOUT=1 \ No newline at end of file diff --git a/CYD-Klipper/src/core/lv_setup.cpp b/CYD-Klipper/src/core/lv_setup.cpp index c7ea35a..72b466e 100644 --- a/CYD-Klipper/src/core/lv_setup.cpp +++ b/CYD-Klipper/src/core/lv_setup.cpp @@ -24,6 +24,7 @@ void set_screen_brightness() void screen_timer_wake() { +#ifndef CYD_SCREEN_DISABLE_TIMEOUT lv_timer_reset(screenSleepTimer); if (!isScreenInSleep){ @@ -36,16 +37,19 @@ void screen_timer_wake() // Reset cpu freq setCpuFrequencyMhz(CPU_FREQ_HIGH); Serial.printf("CPU Speed: %d MHz\n", ESP.getCpuFreqMHz()); +#endif } void screen_timer_sleep(lv_timer_t *timer) { +#ifndef CYD_SCREEN_DISABLE_TIMEOUT screen_setBrightness(0); isScreenInSleep = true; // Screen is off, no need to make the cpu run fast, the user won't notice ;) setCpuFrequencyMhz(CPU_FREQ_LOW); Serial.printf("CPU Speed: %d MHz\n", ESP.getCpuFreqMHz()); +#endif } void screen_timer_setup() diff --git a/CYD-Klipper/src/ui/panels/settings_panel.cpp b/CYD-Klipper/src/ui/panels/settings_panel.cpp index a1cfefe..847bfe5 100644 --- a/CYD-Klipper/src/ui/panels/settings_panel.cpp +++ b/CYD-Klipper/src/ui/panels/settings_panel.cpp @@ -167,6 +167,7 @@ void settings_panel_init(lv_obj_t* panel){ create_settings_widget("Brightness", dropdown, panel); +#ifndef CYD_SCREEN_DISABLE_TIMEOUT dropdown = lv_dropdown_create(panel); lv_dropdown_set_options(dropdown, wake_timeout_options); lv_obj_add_style(dropdown, get_default_label_style(), 0); @@ -180,6 +181,7 @@ void settings_panel_init(lv_obj_t* panel){ } create_settings_widget("Wake Timeout", dropdown, panel); +#endif toggle = lv_switch_create(panel); lv_obj_set_width(toggle, CYD_SCREEN_MIN_BUTTON_WIDTH_PX * 2); @@ -190,6 +192,7 @@ void settings_panel_init(lv_obj_t* panel){ create_settings_widget("Rotate Screen", toggle, panel); +#ifndef CYD_SCREEN_DISABLE_TIMEOUT toggle = lv_switch_create(panel); lv_obj_set_width(toggle, CYD_SCREEN_MIN_BUTTON_WIDTH_PX * 2); lv_obj_add_event_cb(toggle, on_during_print_switch, LV_EVENT_VALUE_CHANGED, NULL); @@ -198,4 +201,5 @@ void settings_panel_init(lv_obj_t* panel){ lv_obj_add_state(toggle, LV_STATE_CHECKED); create_settings_widget("Screen On During Print", toggle, panel); +#endif } \ No newline at end of file diff --git a/README.md b/README.md index fae3287..36359ad 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ A ESP32-2432S028R is required to run this project. You can find out where to buy ### Features - View printer status -- View print progress +- View print progress and print statistics - Start a print - (When the printer is idle) move the printer - (During a print) set fan speed, flow rate, speed and z offset @@ -36,11 +36,15 @@ There are no 'over the air' updates. Each update has to be applied manually. -|- :-:|:-: -![1](readme/PXL_20231113_142717308.jpg)|![2](readme/PXL_20231113_171701876.jpg) -![3](readme/PXL_20231113_171715809.jpg)|![4](readme/PXL_20231113_171724404.jpg) -![5](readme/PXL_20231113_171751745.jpg)|![6](readme/PXL_20231113_171809315.jpg) +![1](readme/1.jpg)|![2](readme/2.jpg) +![3](readme/3.jpg)|![4](readme/4.jpg) +![5](readme/5.jpg)|![6](readme/6.jpg) +![7](readme/7.jpg)|![8](readme/8.jpg) +![9](readme/9.jpg)|![10](readme/10.jpg) ### Credits - [xtouch](https://github.com/xperiments-in/xtouch) -- [ESP32-Cheap-Yellow-Display](https://github.com/witnessmenow/ESP32-Cheap-Yellow-Display) \ No newline at end of file +- [ESP32-Cheap-Yellow-Display](https://github.com/witnessmenow/ESP32-Cheap-Yellow-Display) +- [OperatorB](https://github.com/OperatorB) for the ESP32-3248S035C display driver +- [esp32-smartdisplay](https://github.com/rzeldent/esp32-smartdisplay) \ No newline at end of file diff --git a/_site/index.html b/_site/index.html index 270dbe8..394226c 100644 --- a/_site/index.html +++ b/_site/index.html @@ -11,26 +11,59 @@ .main { width: fit-content; margin: auto; + max-width: 750px; + } + + .main > section > :not(:first-child) { + margin-left: 20px; + } + + .main a { + color: #F00; + } + + .install .iconify { + color: green; + filter: drop-shadow(0 0 0.75rem lime); } + +
-

CYD-Klipper

-

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

- GitHub release (with filter) - GitHub repo - Donate KoFi +

CYD-Klipper

+

An implementation of a Klipper status display on an ESP32 + screen.
Uses Moonraker to fetch data.
Source code is available on GitHub

+ +
+

Changelog

+

+
+ + +
-

Install on ESP32-2432S028 (Resistive)

+

Install on ESP32-2432S028 (2.8" Resistive)

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

-

Install on ESP32-3248S035 (Capacitive)

+

Install on ESP32-3248S035 (3.5" Capacitive)

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

diff --git a/readme/1.jpg b/readme/1.jpg new file mode 100644 index 0000000..593ac57 Binary files /dev/null and b/readme/1.jpg differ diff --git a/readme/PXL_20231113_171809315.jpg b/readme/10.jpg similarity index 99% rename from readme/PXL_20231113_171809315.jpg rename to readme/10.jpg index ba615b4..fb11bfc 100644 Binary files a/readme/PXL_20231113_171809315.jpg and b/readme/10.jpg differ diff --git a/readme/2.jpg b/readme/2.jpg new file mode 100644 index 0000000..b526e39 Binary files /dev/null and b/readme/2.jpg differ diff --git a/readme/3.jpg b/readme/3.jpg new file mode 100644 index 0000000..9ec8457 Binary files /dev/null and b/readme/3.jpg differ diff --git a/readme/4.jpg b/readme/4.jpg new file mode 100644 index 0000000..e9a8226 Binary files /dev/null and b/readme/4.jpg differ diff --git a/readme/5.jpg b/readme/5.jpg new file mode 100644 index 0000000..cbfbd3c Binary files /dev/null and b/readme/5.jpg differ diff --git a/readme/6.jpg b/readme/6.jpg new file mode 100644 index 0000000..2da22b9 Binary files /dev/null and b/readme/6.jpg differ diff --git a/readme/7.jpg b/readme/7.jpg new file mode 100644 index 0000000..651cc2f Binary files /dev/null and b/readme/7.jpg differ diff --git a/readme/8.jpg b/readme/8.jpg new file mode 100644 index 0000000..93ffdeb Binary files /dev/null and b/readme/8.jpg differ diff --git a/readme/PXL_20231113_171751745.jpg b/readme/9.jpg similarity index 99% rename from readme/PXL_20231113_171751745.jpg rename to readme/9.jpg index 6428716..c9860a7 100644 Binary files a/readme/PXL_20231113_171751745.jpg and b/readme/9.jpg differ diff --git a/readme/PXL_20231113_142717308.jpg b/readme/PXL_20231113_142717308.jpg deleted file mode 100644 index b6b3aca..0000000 Binary files a/readme/PXL_20231113_142717308.jpg and /dev/null differ diff --git a/readme/PXL_20231113_171701876.jpg b/readme/PXL_20231113_171701876.jpg deleted file mode 100644 index 02b16ab..0000000 Binary files a/readme/PXL_20231113_171701876.jpg and /dev/null differ diff --git a/readme/PXL_20231113_171715809.jpg b/readme/PXL_20231113_171715809.jpg deleted file mode 100644 index 7a54176..0000000 Binary files a/readme/PXL_20231113_171715809.jpg and /dev/null differ diff --git a/readme/PXL_20231113_171724404.jpg b/readme/PXL_20231113_171724404.jpg deleted file mode 100644 index 4b5bc80..0000000 Binary files a/readme/PXL_20231113_171724404.jpg and /dev/null differ