diff --git a/Dockerfile b/Dockerfile index ee61135..a1ed7d7 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 \ @@ -54,7 +53,11 @@ 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/eyal0/OctoPrint-PrintTimeGenius/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 + VOLUME /home/octoprint/.octoprint diff --git a/printer.cfg b/printer.cfg index 08de079..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 @@ -79,7 +92,7 @@ heater_temp: 50.0 pin: PA0 [mcu] -serial: /printerserial +serial: /dev/ttyEnder restart_method: command [printer] @@ -96,7 +109,7 @@ sensor_pin: ^PC14 control_pin: PC13 x_offset: -32 y_offset: -41 -z_offset: 2.80 +z_offset: 0 speed:10 samples:1 samples_result:average @@ -116,19 +129,21 @@ 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 +path: /home/octoprint/.octoprint/uploads [display_status] [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 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