Merge request new version

CHANGELOG.md

@@ -1,7 +1,21 @@
 # Changelog
-This just tracks the most notable changes, if you want all the details checkout the commit history. Probably all versions contain changes regarding documentation, translation, fixes and other minor refactors
+This just tracks the most notable changes, if you want all the details checkout the commit history.
+Probably all versions contain changes regarding documentation, translation, fixes and other minor refactors
 
-## Untagged
+## v0.4.5-*
+
+* basic lockscreen for shows or kids
+
+## v0.4.5  (Oct 28, 2024)
+
+* allow calling KlipperScreen panels from gcode
+* bed_mesh: automatically call for z_tilt or quad_level if not applied
+* show battery status in the topbar
+* macros: keyboard to keypad input switch with auto pre-selection
+
+## v0.4.4  (Sep 16, 2024)
+* support for different moonraker routes
+* allow showing/hiding cursor from the settings
 * some wpa-eap support, adds the security type selector and user field
 * extrude: wait for temp or open temp panel automatically close #1416
 * extrude: show more filament sensors (up to 9)
@@ -17,7 +31,7 @@ This just tracks the most notable changes, if you want all the details checkout
 * gcodes: add extra info to confirm print
 * zcalibrate: add a dropdown with the function name to select
 * job_status: auto-estimated time: use last print time if available
-* gcodes: add option to delete in the confirm
+* gcodes: add option to delete in the confirmation
 
 ## v0.4.2  (Jun 10, 2024)
 * job_status: remove the status message and use the titlebar for that
@@ -83,7 +97,7 @@ This just tracks the most notable changes, if you want all the details checkout
 * add moonraker warnings
 
 ## v0.3.6  (Sep 24, 2023)
-* Led light control, close #991 (#1106)
+* LED light control, close #991 (#1106)
 * pause will auto-open extrude
 * macros: hide the panel if there are no elegible macros
 * job_status: click thumbnail for fullscreen thumbnail
@@ -254,7 +268,7 @@ The Project changed maintainer [alfrix](github.com/alfrix)
 
 ## v0.1.4  (Feb 15, 2021)
 * network: Show wifi information
-* screen_panel: Put icons on a side bar instead of on the header
+* screen_panel: Put icons on a sidebar instead of on the header
 * printer: Include quad_gantry_level
 * wifi: Initial wifi class
 * job_status/settings: Allow different file estimation methods

README.md

@@ -47,6 +47,6 @@ We extend our gratitude to all contributors who have helped along the way. [Meet
 
 ### Sponsors
 
-![LDO](docs/img/LDO-LOGO_SQ.png) ![YUMI](docs/img/YUMI.png)
+![LDO](docs/img/sponsors/LDO.png) ![YUMI](docs/img/sponsors/YUMI.png)
 
-Special thanks to [LDO](https://ldomotors.com/) and [YUMI](https://wiki.yumi-lab.com/) for sponsoring KlipperScreen and the open-source community.
+Special thanks to [LDO](https://ldomotors.com/) and [YUMI](https://wiki.yumi-lab.com/) for sponsoring KlipperScreen and the open-source community.

config/defaults.conf

@@ -5,23 +5,26 @@
 [main]
 
 [preheat PLA]
-bed = 40
-extruder = 195
+bed = 60
+extruder = 215
+extruder1 = 215
 
-[preheat ABS]
-bed = 90
-extruder = 220
+[preheat TPU]
+bed = 65
+extruder = 225
+extruder1 = 225
 
 [preheat PETG]
 bed = 80
-extruder = 240
+extruder = 235
+extruder1 = 235
 
-[preheat FLEX]
-bed = 0
-extruder = 210
+[preheat ABS]
+bed = 110
+extruder = 245
+extruder1 = 245
 
 [include main_menu.conf]
 [include splash_menu.conf]
 [include print_menu.conf]
-
-[include move_menu.conf]
+[include move_menu.conf]

config/main_menu.conf

@@ -50,45 +50,45 @@ icon: bed-mesh
 panel: bed_mesh
 enable: {{ 'bed_mesh' in printer.config_sections }}
 
-[menu __main more zoffset]
-name: {{ gettext('Z Calibrate') }}
-icon: z-farther
-panel: zcalibrate
+# [menu __main more zoffset]
+# name: {{ gettext('Z Calibrate') }}
+# icon: z-farther
+# panel: zcalibrate
 
-[menu __main more limits]
-name: {{ gettext('Limits') }}
-icon: fine-tune
-panel: limits
+# [menu __main more limits]
+# name: {{ gettext('Limits') }}
+# icon: fine-tune
+# panel: limits
 
 [menu __main more fan]
 name: {{ gettext('Fan') }}
 icon: fan
 panel: fan
 enable: {{ printer.fans.count > 0 }}
 
-[menu __main more led]
-name: {{ gettext('Leds') }}
-icon: light
-panel: led
-enable: {{ printer.leds.count > 0 }}
+# [menu __main more led]
+# name: {{ gettext('Leds') }}
+# icon: light
+# panel: led
+# enable: {{ printer.leds.count > 0 }}
 
 [menu __main more macros]
 name: {{ gettext('Macros') }}
 icon: custom-script
 panel: gcode_macros
 enable: {{ printer.gcode_macros.count > 0 }}
 
-[menu __main more pins]
-name: {{ gettext('Pins') }}
-icon: hashtag
-panel: pins
-enable: {{ printer.output_pins.count > 0 or printer.pwm_tools.count > 0 }}
+# [menu __main more pins]
+# name: {{ gettext('Pins') }}
+# icon: hashtag
+# panel: pins
+# enable: {{ printer.output_pins.count > 0 or printer.pwm_tools.count > 0 }}
 
-[menu __main more power]
-name: {{ gettext('Power') }}
-icon: shutdown
-panel: power
-enable: {{ moonraker.power_devices.count > 0 }}
+# [menu __main more power]
+# name: {{ gettext('Power') }}
+# icon: shutdown
+# panel: power
+# enable: {{ moonraker.power_devices.count > 0 }}
 
 [menu __main more camera]
 name: {{ gettext('Camera') }}
@@ -106,21 +106,21 @@ name: {{ gettext('Update') }}
 icon: refresh
 panel: updater
 
-[menu __main more input_shaper]
-name: {{ gettext('Input Shaper') }}
-icon: move
-panel: input_shaper
-enable: {{ 'input_shaper' in printer.config_sections }}
+# [menu __main more input_shaper]
+# name: {{ gettext('Input Shaper') }}
+# icon: move
+# panel: input_shaper
+# enable: {{ 'input_shaper' in printer.config_sections }}
 
-[menu __main more save]
-name: {{ gettext('Save Config') }}
-icon: complete
-method: printer.gcode.script
-params: {"script":"SAVE_CONFIG"}
-confirm:
-    {{ gettext('Save configuration?') }}
+# [menu __main more save]
+# name: {{ gettext('Save Config') }}
+# icon: complete
+# method: printer.gcode.script
+# params: {"script":"SAVE_CONFIG"}
+# confirm:
+#     {{ gettext('Save configuration?') }}
 
-    {{ gettext('Klipper will reboot') }}
+#     {{ gettext('Klipper will reboot') }}
 
 [menu __main more settings]
 name: KlipperScreen
@@ -152,4 +152,4 @@ enable: {{ moonraker.spoolman }}
 name: {{ gettext('System') }}
 icon: info
 panel: system
-enable: {{ moonraker_connected }}
+enable: {{ moonraker_connected }}

config/move_menu.conf

@@ -2,6 +2,12 @@
 # DO NOT EDIT THIS FILE USE KlipperScreen.conf
 #
 
+[menu move homing homeall]
+name: {{ gettext('Home All') }}
+icon: home
+method: printer.gcode.script
+params: {"script":"G28"}
+
 [menu move homing homex]
 name: {{ gettext('Home X') }}
 icon: home-x
@@ -20,28 +26,97 @@ icon: home-z
 method: printer.gcode.script
 params: {"script":"G28 Z"}
 
-[menu move homing homeall]
-name: {{ gettext('Home All') }}
-icon: home
-method: printer.gcode.script
-params: {"script":"G28"}
-
-[menu move homing homexy]
-name: {{ gettext('Home XY') }}
-icon: home
-method: printer.gcode.script
-params: {"script":"G28 X Y"}
-
 [menu move homing quad_gantry_level]
 name: {{ gettext('Quad Gantry Level') }}
 icon: home-z
 method: printer.gcode.script
 params: {"script":"QUAD_GANTRY_LEVEL"}
 enable: {{ 'quad_gantry_level' in printer.config_sections }}
 
+[menu move homing bed_alignment]
+name: {{ gettext('Z Tilt') }}
+icon: z-tilt
+method: printer.gcode.script
+params: {"script":"G34"}
+enable: {{ 'quad_z_tilt_adjust' in printer.gcode_macros.list }}
+
 [menu move homing Z-Tilt]
 name: {{ gettext('Z Tilt') }}
 icon: z-tilt
 method: printer.gcode.script
 params: {"script":"Z_TILT_ADJUST"}
 enable: {{ 'z_tilt' in printer.config_sections }}
+
+[menu move homing bed_mesh_calibrate]
+name: {{ gettext('Bed calibrate') }}
+icon: bed-mesh
+method: printer.gcode.script
+params: {"script":"G29"}
+enable: {{ 'G29' in printer.gcode_macros.list }}
+
+[menu move homing z_min]
+name: {{ gettext('Bed Up') }}
+icon: arrow-up
+method: printer.gcode.script
+params: {"script":"G1 Z5 F1200"}
+
+[menu move homing z_max]
+name: {{ gettext('Bed Down') }}
+icon: arrow-down
+method: printer.gcode.script
+params: {"script":"Z_MAX"}
+enable: {{ 'Z_MAX' in printer.gcode_macros.list }}
+
+[menu move homing pid_calibrate_hotend]
+name: {{ gettext('Autocalibration of PID hotend') }}
+icon: extruder
+method: printer.gcode.script
+params: {"script":"PID_CALIBRATE_HOTEND"}
+enable: {{ 'PID_CALIBRATE_HOTEND' in printer.gcode_macros.list }}
+confirm:
+    {{ gettext('After confirmation, the PID hotend autocalibration will begin') }}
+
+[menu move homing pid_calibrate_hotend0]
+name: {{ gettext('Autocalibration of PID 1st head') }}
+icon: extruder-1
+method: printer.gcode.script
+params: {"script":"PID_CALIBRATE_HOTEND0"}
+enable: {{ 'PID_CALIBRATE_HOTEND0' in printer.gcode_macros.list }}
+confirm:
+    {{ gettext('After confirmation, the autocalibration of PID 1st head will begin') }}
+
+[menu move homing pid_calibrate_hotend1]
+name: {{ gettext('Autocalibration of PID 2nd head') }}
+icon: extruder-2
+method: printer.gcode.script
+params: {"script":"PID_CALIBRATE_HOTEND1"}
+enable: {{ 'PID_CALIBRATE_HOTEND1' in printer.gcode_macros.list }}
+confirm:
+    {{ gettext('After confirmation, the autocalibration of PID 2nd head will begin') }}
+
+[menu move homing pid_calibrate_bed]
+name: {{ gettext('Autocalibration of PID bed') }}
+icon: bed
+method: printer.gcode.script
+params: {"script":"PID_CALIBRATE_BED"}
+enable: {{ 'PID_CALIBRATE_BED' in printer.gcode_macros.list }}
+confirm:
+    {{ gettext('After confirmation, the PID bed autocalibration will begin') }}
+
+[menu move homing calibrate_z-offset]
+name: {{ gettext('Autocalibration of Z-offset of the 2nd head') }}
+icon: toolchanger
+method: printer.gcode.script
+params: {"script":"Zoffset"}
+enable: {{ 'Zoffset' in printer.gcode_macros.list }}
+confirm:
+    {{ gettext('After confirmation, the autocalibration of the 2nd head offset will begin') }}
+
+[menu move homing unsave_lower_bed]
+name: {{ gettext('Bed Down 10mm') }}
+icon: arrow-down
+method: printer.gcode.script
+params: {"script":"UNSAFE_LOWER_BED"}
+enable: {{ 'UNSAFE_LOWER_BED' in printer.gcode_macros.list }}
+confirm:
+    {{ gettext('Make sure that moving the bed 10mm down will be safe for the printer!') }}

config/print_menu.conf

@@ -29,17 +29,17 @@ icon: extrude
 panel: extrude
 enable: {{ printer.extruders.count > 0 }}
 
-[menu __print power]
-name: {{ gettext('Power') }}
-icon: shutdown
-panel: power
-enable: {{ moonraker.power_devices.count > 0 }}
-
-[menu __print led]
-name: {{ gettext('Leds') }}
-icon: light
-panel: led
-enable: {{ printer.leds.count > 0 }}
+# [menu __print power]
+# name: {{ gettext('Power') }}
+# icon: shutdown
+# panel: power
+# enable: {{ moonraker.power_devices.count > 0 }}
+
+# [menu __print led]
+# name: {{ gettext('Leds') }}
+# icon: light
+# panel: led
+# enable: {{ printer.leds.count > 0 }}
 
 [menu __print macros]
 name: {{ gettext('Macros') }}
@@ -59,10 +59,10 @@ name: {{ gettext('Console') }}
 icon: console
 panel: console
 
-[menu __print limits]
-name: {{ gettext('Limits') }}
-icon: fine-tune
-panel: limits
+# [menu __print limits]
+# name: {{ gettext('Limits') }}
+# icon: fine-tune
+# panel: limits
 
 [menu __print network]
 name: {{ gettext('Network') }}
@@ -86,8 +86,8 @@ icon: info
 panel: system
 enable: {{ moonraker_connected }}
 
-[menu __print pins]
-name: {{ gettext('Pins') }}
-icon: hashtag
-panel: pins
-enable: {{ printer.output_pins.count > 0 or printer.pwm_tools.count > 0 }}
+# [menu __print pins]
+# name: {{ gettext('Pins') }}
+# icon: hashtag
+# panel: pins
+# enable: {{ printer.output_pins.count > 0 or printer.pwm_tools.count > 0 }}