Merge branch 'ender3s1' of https://git.siwatsystem.com/satitchula-printfarm/octoprint-klipper-docker into ender3s1

Dockerfile

@@ -48,14 +48,15 @@ https://github.com/jneilliii/OctoPrint-BedLevelVisualizer/archive/master.zip \
 https://github.com/OctoPrint/OctoPrint-MQTT/archive/master.zip \
 https://github.com/birkbjo/OctoPrint-Themeify/archive/master.zip \
 https://github.com/jneilliii/OctoPrint-Python3PluginCompatibilityCheck/archive/master.zip \
-https://github.com/OllisGit/OctoPrint-PrintJobHistory/releases/latest/download/master.zip \
 https://github.com/marian42/octoprint-preheat/archive/master.zip \
 https://github.com/OllisGit/OctoPrint-FilamentManager/releases/latest/download/master.zip \
+https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip \
+https://github.com/jneilliii/OctoPrint-ConsolidateTempControl/archive/master.zip \
 https://github.com/TheSpaghettiDetective/OctoPrint-TheSpaghettiDetective/archive/master.zip \
+https://github.com/eyal0/OctoPrint-PrintTimeGenius/archive/master.zip \
 https://github.com/jneilliii/OctoPrint-PrusaSlicerThumbnails/archive/master.zip \
 https://gitlab.com/mosaic-mfg/canvas-plugin/-/archive/master/canvas-plugin-master.zip \
-https://github.com/costas-basdekis/MarlinGcodeDocumentation/archive/master.zip \
+https://github.com/costas-basdekis/MarlinGcodeDocumentation/archive/master.zip
-https://github.com/eyal0/OctoPrint-PrintTimeGenius/archive/master.zip \
 
 
 VOLUME /home/octoprint/.octoprint

octoprint_config/cancel_gcode.gcode

@@ -0,0 +1,14 @@
+; move head out of the way
+G91
+G0 Z10
+G28 X Y
+G0 X0Y230
+
+; disable motors
+M84
+
+;disable all heaters
+{% snippet 'disable_hotends' %}
+{% snippet 'disable_bed' %}
+;disable fan
+M106 S0

octoprint_config/config.txt

@@ -0,0 +1,3 @@
+OctoKlipper
+config dir: /home/octoprint/.octoprint
+log: /tmp/klippy.log