From 99c949c2f9574bdc7cb56fef8e3bf50e4171e137 Mon Sep 17 00:00:00 2001 From: siwat Date: Sat, 30 Apr 2022 13:51:13 +0700 Subject: [PATCH 01/10] remove temp sensor from mcu --- printer.cfg | 6 ------ 1 file changed, 6 deletions(-) diff --git a/printer.cfg b/printer.cfg index 08de079..e820801 100644 --- a/printer.cfg +++ b/printer.cfg @@ -116,12 +116,6 @@ mesh_max: 225, 189 algorithm: bicubic probe_count: 5,5 -[temperature_sensor Board_MCU] -sensor_type: temperature_mcu -min_temp: 0 -max_temp: 100 - - [virtual_sdcard] path: ~/gcode_files From ade3118e5d03e6c478e405606e9a2b85ac3ce974 Mon Sep 17 00:00:00 2001 From: siwat Date: Sat, 30 Apr 2022 17:19:43 +0700 Subject: [PATCH 02/10] Update 'printer.cfg' --- printer.cfg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/printer.cfg b/printer.cfg index e820801..873f52b 100644 --- a/printer.cfg +++ b/printer.cfg @@ -79,9 +79,12 @@ heater_temp: 50.0 pin: PA0 [mcu] -serial: /printerserial +serial: /dev/ttyEnder restart_method: command +[palette2] +serial: /dev/ttyPalette + [printer] kinematics: cartesian max_velocity: 500 From b25fd88beae3af49cbed1fa4aa7fc6cd4b79a00b Mon Sep 17 00:00:00 2001 From: siwat Date: Sun, 1 May 2022 11:53:56 +0700 Subject: [PATCH 03/10] Update 'start.sh' --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index 9da995f..529bcf6 100644 --- a/start.sh +++ b/start.sh @@ -1,6 +1,6 @@ #Copy over Initial Printer Config cp -n /printer.cfg /home/octoprint/.octoprint/printer.cfg -chmod 777 -v ./printer.cfg +chmod 777 -v /home/octoprint/.octoprint/printer.cfg #Start OctoPrint and Klipper python3 /start.py \ No newline at end of file From b31694361e8f44b311e428af8defea11123e9f46 Mon Sep 17 00:00:00 2001 From: siwat Date: Sun, 1 May 2022 11:56:33 +0700 Subject: [PATCH 04/10] Update 'Dockerfile' --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 33f217f..cb16d84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,7 +54,8 @@ 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/TheSpaghettiDetective/OctoPrint-TheSpaghettiDetective/archive/master.zip \ +https://github.com/jneilliii/OctoPrint-PrusaSlicerThumbnails/archive/master.zip VOLUME /home/octoprint/.octoprint From 0f57a36107b4d185629eadb09011c294e0949367 Mon Sep 17 00:00:00 2001 From: siwat Date: Sun, 1 May 2022 12:00:41 +0700 Subject: [PATCH 05/10] Update 'printer.cfg' --- printer.cfg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/printer.cfg b/printer.cfg index 873f52b..a9831df 100644 --- a/printer.cfg +++ b/printer.cfg @@ -82,9 +82,6 @@ pin: PA0 serial: /dev/ttyEnder restart_method: command -[palette2] -serial: /dev/ttyPalette - [printer] kinematics: cartesian max_velocity: 500 @@ -119,8 +116,9 @@ mesh_max: 225, 189 algorithm: bicubic probe_count: 5,5 + [virtual_sdcard] -path: ~/gcode_files +path: /home/octoprint/.octoprint/uploads [display_status] From 8667fb51851bf213f9a88e877c55b0ed323cd88b Mon Sep 17 00:00:00 2001 From: siwat Date: Sun, 1 May 2022 12:07:48 +0700 Subject: [PATCH 06/10] Update 'printer.cfg' --- printer.cfg | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/printer.cfg b/printer.cfg index a9831df..0844e3c 100644 --- a/printer.cfg +++ b/printer.cfg @@ -124,6 +124,13 @@ path: /home/octoprint/.octoprint/uploads [pause_resume] +[gcode_macro G29] +description: Mesh Bed Leveling +gcode: + G28 + BED_MESH_CALIBRATE + G0 X0Y0Z5 + [gcode_macro PAUSE] description: Pause the actual running print rename_existing: PAUSE_BASE From 819886ab8a4bd8b57550b50afa4ca51dc9ad9fa7 Mon Sep 17 00:00:00 2001 From: siwat Date: Sun, 1 May 2022 20:00:27 +0700 Subject: [PATCH 07/10] Update 'printer.cfg' --- printer.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/printer.cfg b/printer.cfg index 0844e3c..0dc4e6b 100644 --- a/printer.cfg +++ b/printer.cfg @@ -96,7 +96,7 @@ sensor_pin: ^PC14 control_pin: PC13 x_offset: -32 y_offset: -41 -z_offset: 2.80 +z_offset: 0.75 speed:10 samples:1 samples_result:average From 0389d5a53a1ac1bbb2da5e3c627b4c7a30807805 Mon Sep 17 00:00:00 2001 From: siwat Date: Tue, 3 May 2022 20:04:47 +0700 Subject: [PATCH 08/10] Update 'printer.cfg' --- printer.cfg | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/printer.cfg b/printer.cfg index 0dc4e6b..20de03d 100644 --- a/printer.cfg +++ b/printer.cfg @@ -30,7 +30,7 @@ microsteps: 16 rotation_distance: 8 endstop_pin: probe:z_virtual_endstop position_max: 270 -position_min: -5 +position_min: -1 [extruder] max_extrude_only_distance: 100.0 @@ -49,9 +49,13 @@ pid_Kp: 22.865 pid_Ki: 1.292 pid_Kd: 101.178 min_temp: 0 -max_temp: 250 +max_temp: 270 pressure_advance = 0.12 +[input_shaper] +shaper_freq_x: 40 +shaper_freq_y: 40 + [filament_switch_sensor RunoutSensor] pause_on_runout: False runout_gcode: PAUSE @@ -69,6 +73,15 @@ pid_Kd: 938.565 min_temp: 0 max_temp: 130 +[respond] +default_type: echo + +[endstop_phase stepper_x] + +[endstop_phase stepper_y] + +[gcode_arcs] +resolution: 1.0 [heater_fan hotend_fan] pin: PC0 @@ -96,7 +109,7 @@ sensor_pin: ^PC14 control_pin: PC13 x_offset: -32 y_offset: -41 -z_offset: 0.75 +z_offset: 0 speed:10 samples:1 samples_result:average From 3f034d6e3ab565b3cd74ac0f0968e2492d84f948 Mon Sep 17 00:00:00 2001 From: siwat Date: Tue, 3 May 2022 20:08:17 +0700 Subject: [PATCH 09/10] Update 'Dockerfile' --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cb16d84..7d26c77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,9 @@ https://github.com/OllisGit/OctoPrint-FilamentManager/releases/latest/download/m 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/jneilliii/OctoPrint-PrusaSlicerThumbnails/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 VOLUME /home/octoprint/.octoprint From b6fa2cf98a68152a35a9621d263d533942558fa3 Mon Sep 17 00:00:00 2001 From: siwat Date: Wed, 4 May 2022 12:07:46 +0700 Subject: [PATCH 10/10] Update 'Dockerfile' --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7d26c77..8063e6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,6 @@ RUN git clone --branch $tag https://github.com/foosel/OctoPrint.git /opt/octopri && ./venv/bin/pip install . RUN /opt/octoprint/venv/bin/python -m pip install \ -https://github.com/AlexVerrico/Octoprint-Display-ETA/archive/master.zip \ https://github.com/1r0b1n0/OctoPrint-Tempsgraph/archive/master.zip \ https://github.com/tpmullan/OctoPrint-DetailedProgress/archive/master.zip \ https://github.com/AliceGrey/OctoprintKlipperPlugin/archive/master.zip \ @@ -52,12 +51,12 @@ https://github.com/jneilliii/OctoPrint-Python3PluginCompatibilityCheck/archive/m 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/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