Skip to content

Commit 7fa5654

Browse files
BlackNetBlackNet
committed
Autocommit from 2025-01-31 19:43:20
Klipper on commit: 0114d72 Moonraker on commit: 7e3c86e Mainsail version: v2.13.2
2 parents 49565f4 + a79de44 commit 7fa5654

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1422
-60
lines changed

‎KlipperScreen.conf

+15-4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ extruder:245
1616
heater_bed: 110
1717
chamber: 40
1818

19+
[menu __main Preheat ABS]
20+
name: Preheat_ABS
21+
method: printer.gcode.script
22+
params: {"script":"PREHEAT_ABS"}
23+
1924
[preheat PLA]
2025
extruder: 220
2126
heater_bed: 55
@@ -38,18 +43,24 @@ panel: temperature
3843
# icon: print
3944
# panel: print
4045

41-
[menu __main Lights-ON]
42-
name: Lights On
43-
icon: home
46+
[menu __main _ABS]
47+
name: _ABS
48+
icon: heat-up
4449
method: printer.gcode.script
45-
params: {"script":"Lights_ON"}
50+
params: {"script":"PREHEAT_ABS"}
4651

4752
[menu __main Lights-OFF]
4853
name: Lights Off
4954
icon: home
5055
method: printer.gcode.script
5156
params: {"script":"Lights_OFF"}
5257

58+
[menu __main Lights-ON]
59+
name: Lights On
60+
icon: home
61+
method: printer.gcode.script
62+
params: {"script":"Lights_ON"}
63+
5364

5465
# [menu __main G3200]
5566
# name: Prep

‎config-other/skirt-buttons.cfg

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ gcode:
7070
gcode:
7171
_CLR_Button
7272
_status_button_busy BUTTON=7
73-
M118 Toolhead T6
73+
;M118 Toolhead T6
74+
PARKCENTER
7475
MMU_CHANGE_TOOL TOOL=6
7576

7677

‎config/Z.cfg

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# https://www.klipper3d.org/Rotation_Distance.html
1414
rotation_distance: 40 # can be off, measure and set. 48
1515
gear_ratio: 80:16
16-
microsteps: 128
16+
microsteps: 32
1717
## endstop_pin: ESTOP2
1818
endstop_pin: probe:z_virtual_endstop
1919

@@ -54,7 +54,7 @@
5454
enable_pin: !MOT3_EN
5555
rotation_distance: 40
5656
gear_ratio: 80:16
57-
microsteps: 128
57+
microsteps: 32
5858

5959
[tmc2209 stepper_z1]
6060
uart_pin: MOT3_CS
@@ -77,7 +77,7 @@
7777
enable_pin: !MOT4_EN
7878
rotation_distance: 40
7979
gear_ratio: 80:16
80-
microsteps: 128
80+
microsteps: 32
8181

8282
[tmc2209 stepper_z2]
8383
uart_pin: MOT4_CS
@@ -100,7 +100,7 @@
100100
enable_pin: !MOT5_EN
101101
rotation_distance: 40
102102
gear_ratio: 80:16
103-
microsteps: 128
103+
microsteps: 32
104104
[tmc2209 stepper_z3]
105105
uart_pin: MOT5_CS
106106
#For best positional accuracy consider using spreadCycle mode and disable interpolation (set interpolate: False in the TMC driver config

‎config/config_backup.cfg

+6-35
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,20 @@
1010
gcode:
1111
RUN_SHELL_COMMAND CMD=backup_cfg
1212

13-
##
14-
## update RPI firmware
15-
##
16-
17-
[gcode_shell_command fw_RPI]
18-
command: ~/printer_data/config/klipper_make_raspberry.sh
19-
timeout: 30
20-
verbose: True
21-
22-
[gcode_macro fw_RPI]
23-
description: FIRMWARE UPGRADE
24-
gcode:
25-
RUN_SHELL_COMMAND CMD=fw_RPI
26-
FIRMWARE_RESTART
2713

2814

2915
##
30-
## update octopus firmware
16+
## set the camera values to optimal
3117
##
3218

33-
[gcode_shell_command fw_octo]
34-
command: ~/printer_data/config/klipper_make_octopus-466.sh
19+
[gcode_shell_command do_camera]
20+
command: ~/printer_data/config/do_cam.sh
3521
timeout: 30
3622
verbose: True
3723

38-
[gcode_macro fw_octo]
39-
description: FIRMWARE UPGRADE
24+
[gcode_macro DO_CAM]
25+
description: set the camera
4026
gcode:
41-
RUN_SHELL_COMMAND CMD=fw_octo
42-
FIRMWARE_RESTART
27+
RUN_SHELL_COMMAND CMD=do_camera
4328

44-
##
45-
## update skirt buttons firmware
46-
##
47-
48-
[gcode_shell_command fw_skirt]
49-
command: ~/printer_data/config/klipper_make_voron_skirt_buttons.sh
50-
timeout: 30
51-
verbose: True
52-
53-
[gcode_macro fw_skirt]
54-
description: FIRMWARE UPGRADE
55-
gcode:
56-
RUN_SHELL_COMMAND CMD=fw_skirt
57-
FIRMWARE_RESTART
5829

‎config/extruder.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
sensor_type: PT1000
4747
sensor_pin: T0
4848
min_temp: 10
49-
max_temp: 270
49+
max_temp: 290
5050
max_power: 1.0
5151
min_extrude_temp: 180
5252
#min_extrude_temp: 20

‎config/filament.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gcode:
1313
M82
1414

1515
status_ready
16-
MR_NOTIFY TITLE="Vor on" MESSAGE="Filament Unloaded!"
16+
MR_NOTIFY TITLE=" " MESSAGE="Filament Unloaded!"
1717

1818

1919
#####################################################################
@@ -30,7 +30,7 @@ gcode:
3030
M82
3131

3232
status_ready
33-
MR_NOTIFY TITLE="Vor on" MESSAGE="Filament loaded!"
33+
MR_NOTIFY TITLE=" " MESSAGE="Filament loaded!"
3434

3535
######################################################################
3636
# Filament Change

‎config/filament_runout.cfg

+18
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,21 @@ insert_gcode:
5555

5656

5757

58+
<<<<<<< HEAD
59+
=======
60+
## need RESUME_MACRO
61+
## need PARK_MACRO
62+
63+
[filament_switch_sensor runout_sensor]
64+
pause_on_runout: True
65+
runout_gcode:
66+
# pause
67+
MR_NOTIFY TITLE=" " MESSAGE="Filament out."
68+
M117 Out of Filament
69+
insert_gcode:
70+
MR_NOTIFY TITLE=" " MESSAGE="Filament Resume."
71+
M117 Resuming
72+
event_delay: 3.0
73+
pause_delay: 0.5
74+
switch_pin: !ESTOP3
75+
>>>>>>> a79de44abaae737db7e0181982fc61d72ea803ae

‎config/heatsoak.cfg

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description: Heatsoak chamber to a specific temperature
1010
gcode:
1111

1212
STATUS_HEATING ; LED status
13-
{% set TEMP = params.TEMP|default(40)|int %} ; default to 40C
13+
{% set TEMP = params.TEMP|default(50)|int %} ; default to 40C
1414
{% set BED = params.BED|default(110)|int %} ; default to 110C
1515
{% set FAN = params.FAN|default(80)|int %} ; default to 80%
1616

@@ -51,9 +51,9 @@ gcode:
5151
# this is for mobileraker notifications
5252
# https://github.com/Clon1998/mobileraker_companion/blob/main/docs/Custom_Notifications.md
5353
# M117 $MR$: End Chamber heatsoak {TEMP}
54-
MR_NOTIFY TITLE="I am $printer_name" MESSAGE="End Chamber heatsoak {TEMP}"
54+
MR_NOTIFY TITLE=" " MESSAGE="End Chamber heatsoak {TEMP}"
5555
{% else %}
56-
MR_NOTIFY TITLE="I am $printer_name" MESSAGE="Chamber heatsoak bypass {CHAMBER_NOW}"
56+
MR_NOTIFY TITLE=" " MESSAGE="Chamber heatsoak bypass {CHAMBER_NOW}"
5757
{% endif %}
5858

5959
#####################################################################
@@ -92,7 +92,7 @@ gcode:
9292
# this is for mobileraker notifications
9393
# https://github.com/Clon1998/mobileraker_companion/blob/main/docs/Custom_Notifications.md
9494
# M117 $MR$: End Bed heatsoak {TEMP} for {TIME}
95-
MR_NOTIFY TITLE="I am $printer_name" MESSAGE="End Bed heatsoak {TEMP} for {TIME}"
95+
MR_NOTIFY TITLE=" " MESSAGE="End Bed heatsoak {TEMP} for {TIME}"
9696

9797
STATUS_READY
9898

‎config/macros.cfg

+61-4
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ gcode:
111111
M118 NOZZLE_SIZE: {NOZZLE_SIZE}, LAYERS: {LAYERS}
112112
M118 FILAMENT_TYPE: {FILAMENT_TYPE}
113113

114-
# {% set mesh_min_x = MESH_MIN.split(",")[0]|float %}
115-
# {% set mesh_min_y = MESH_MIN.split(",")[1]|float %}
116-
# {% set mesh_max_x = MESH_MAX.split(",")[0]|float %}
117-
# {% set mesh_max_y = MESH_MAX.split(",")[1]|float %}
114+
{% set mesh_min_x = MESH_MIN.split(",")[0]|float %}
115+
{% set mesh_min_y = MESH_MIN.split(",")[1]|float %}
116+
{% set mesh_max_x = MESH_MAX.split(",")[0]|float %}
117+
{% set mesh_max_y = MESH_MAX.split(",")[1]|float %}
118118

119119
# Filament type, used for chamber temps
120120
SAVE_VARIABLE VARIABLE=filament_type = VALUE='"{FILAMENT_TYPE}"'
@@ -169,6 +169,10 @@ gcode:
169169
SET_GCODE_OFFSET Z=0 MOVE=0
170170
SET_GCODE_OFFSET Z_ADJUST=+1.3 MOVE=0
171171

172+
#Bed mesh stuff here
173+
BED_MESH_CALIBRATE mesh_min={mesh_min_x},{mesh_min_y} mesh_max={mesh_max_x},{mesh_max_y} PROBE_COUNT=5,5
174+
175+
172176
#Move to the middle of the bed
173177
STATUS_READY
174178
PARKCENTER z=25
@@ -405,3 +409,56 @@ gcode:
405409

406410
CANCEL_PRINT
407411

412+
413+
#####################################################################
414+
#
415+
# PREHEAT_ABS
416+
#
417+
#####################################################################
418+
[gcode_macro PREHEAT_ABS]
419+
description: Preheat bed/hotend/chamber/fans
420+
gcode:
421+
#variables
422+
{% set BED_TEMP = 110%}
423+
{% set EXTRUDER_TEMP = 150%}
424+
{% set CHAMBER_TEMP = 50%}
425+
{% set FILAMENT_TYPE = ABS%}
426+
427+
# process order is
428+
# set bed temp
429+
# set nevermore / bed fans on
430+
# home / QGL if needed
431+
# park center
432+
433+
# Start bed heating
434+
# Wait for the bed to reach the temperature
435+
STATUS_HEATING
436+
M118 Bed temp {BED_TEMP}
437+
M140 S{BED_TEMP}
438+
# M190 S{BED_TEMP}
439+
440+
# nevermore on.
441+
SET_FAN_SPEED FAN=Nevermore SPEED=1
442+
443+
# turn on bed fans 1 and 2
444+
SET_FAN_SPEED FAN=Bed_Fan1 SPEED=1
445+
SET_FAN_SPEED FAN=Bed_Fan2 SPEED=1
446+
447+
# home / QGL
448+
{% if printer.quad_gantry_level.applied == False %}
449+
{% if "xyz" not in printer.toolhead.homed_axes %}
450+
STATUS_HOMING
451+
G28 ; home if not already homed
452+
{% endif %}
453+
STATUS_LEVELING
454+
M118 QGL
455+
QUAD_GANTRY_LEVEL
456+
{% endif %}
457+
458+
# park center
459+
STATUS_READY
460+
PARKCENTER
461+
462+
HEATSOAK_CHAMBER TEMP=50 BED=110
463+
MR_NOTIFY TITLE="Vor on" MESSAGE="Ready to print A B S!"
464+

‎config/probe.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
samples_result: median
3939
sample_retract_dist: 3.0
4040
samples_tolerance: 0.006
41-
samples_tolerance_retries: 3
41+
samples_tolerance_retries: 7
4242
lift_speed: 30
4343

4444

‎do_cam.sh

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/usr/bin/env bash
2+
3+
#####################################################################
4+
5+
6+
v4l2-ctl -d /dev/video0 --set-ctrl=auto_exposure=1
7+
v4l2-ctl -d /dev/video0 --set-ctrl=focus_automatic_continuous=0
8+
v4l2-ctl -d /dev/video0 --set-ctrl=white_balance_automatic=0
9+
v4l2-ctl -d /dev/video0 --set-ctrl=power_line_frequency=2
10+
v4l2-ctl -d /dev/video0 --set-ctrl=exposure_time_absolute=200
11+
v4l2-ctl -d /dev/video0 --set-ctrl=focus_absolute=40
12+
v4l2-ctl -d /dev/video0 --set-ctrl=white_balance_temperature=4395
13+
v4l2-ctl -d /dev/video0 --set-ctrl=tilt_absolute=36000
14+
v4l2-ctl -d /dev/video0 --set-ctrl=pan_absolute=3600
15+
v4l2-ctl -d /dev/video0 --set-ctrl=zoom_absolute=600
16+
v4l2-ctl -d /dev/video0 --set-ctrl=sharpness=200
17+
v4l2-ctl -d /dev/video0 --set-ctrl=gain=15
18+
v4l2-ctl -d /dev/video0 --set-ctrl=contrast=130
19+
v4l2-ctl -d /dev/video0 --set-ctrl=saturation=120
20+
v4l2-ctl -d /dev/video0 --set-ctrl=brightness=150

‎do_cam.sh~

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/usr/bin/env bash
2+
3+
#####################################################################
4+
5+
6+
v4l2-ctl -d /dev/video0 --set-ctrl=auto_exposure=1
7+
v4l2-ctl -d /dev/video0 --set-ctrl=focus_automatic_continuous=0
8+
v4l2-ctl -d /dev/video0 --set-ctrl=white_balance_automatic=0
9+
v4l2-ctl -d /dev/video0 --set-ctrl=power_line_frequency=2
10+
v4l2-ctl -d /dev/video0 --set-ctrl=exposure_time_absolute=200
11+
v4l2-ctl -d /dev/video0 --set-ctrl=focus_absolute=40
12+
v4l2-ctl -d /dev/video0 --set-ctrl=white_balance_temperature=4395
13+
v4l2-ctl -d /dev/video0 --set-ctrl=tilt_absolute=-36000
14+
v4l2-ctl -d /dev/video0 --set-ctrl=pan_absolute=3600
15+
v4l2-ctl -d /dev/video0 --set-ctrl=zoom_absolute=600
16+
v4l2-ctl -d /dev/video0 --set-ctrl=sharpness=200
17+
v4l2-ctl -d /dev/video0 --set-ctrl=gain=15
18+
v4l2-ctl -d /dev/video0 --set-ctrl=contrast=130
19+
v4l2-ctl -d /dev/video0 --set-ctrl=saturation=120
20+
v4l2-ctl -d /dev/video0 --set-ctrl=brightness=150

‎klipper_menuconfigs/config-U2C

+5
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,12 @@ CONFIG_WANT_MPU9250=y
107107
CONFIG_WANT_HX71X=y
108108
CONFIG_WANT_ADS1220=y
109109
CONFIG_WANT_LDC1612=y
110+
<<<<<<< HEAD
110111
CONFIG_WANT_SENSOR_ANGLE=y
112+
=======
113+
CONFIG_WANT_HX71X=y
114+
CONFIG_WANT_ADS1220=y
115+
>>>>>>> a79de44abaae737db7e0181982fc61d72ea803ae
111116
CONFIG_WANT_SOFTWARE_I2C=y
112117
CONFIG_WANT_SOFTWARE_SPI=y
113118
CONFIG_NEED_SENSOR_BULK=y

0 commit comments

Comments
 (0)