Skip to content

Commit 602e8b9

Browse files
BlackNetBlackNet
committed
Autocommit from 2024-08-08 08:36:34
Klipper on commit: d7d9092 Moonraker on commit: b40751b Mainsail version: v2.12.0
1 parent eaea4a5 commit 602e8b9

17 files changed

+530
-86
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/filament_runout.cfg

+14-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,17 @@
1919

2020

2121
## need RESUME_MACRO
22-
## need PARK_MACRO
22+
## need PARK_MACRO
23+
24+
[filament_switch_sensor runout_sensor]
25+
pause_on_runout: True
26+
runout_gcode:
27+
# pause
28+
MR_NOTIFY TITLE="Vor on" MESSAGE="Filament out."
29+
M117 Out of Filament
30+
insert_gcode:
31+
MR_NOTIFY TITLE="Vor on" MESSAGE="Filament Resume."
32+
M117 Resuming
33+
event_delay: 3.0
34+
pause_delay: 0.5
35+
switch_pin: !ESTOP3

‎config/heatsoak.cfg

+1-1
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

‎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+

‎klipper_menuconfigs/config-octopus-446

+2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ CONFIG_WANT_DISPLAYS=y
9393
CONFIG_WANT_SENSORS=y
9494
CONFIG_WANT_LIS2DW=y
9595
CONFIG_WANT_LDC1612=y
96+
CONFIG_WANT_HX71X=y
97+
CONFIG_WANT_ADS1220=y
9698
CONFIG_WANT_SOFTWARE_I2C=y
9799
CONFIG_WANT_SOFTWARE_SPI=y
98100
CONFIG_NEED_SENSOR_BULK=y

‎klipper_menuconfigs/config-octopus-446.old

+111
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
CONFIG_LOW_LEVEL_OPTIONS=y
2+
# CONFIG_MACH_AVR is not set
3+
# CONFIG_MACH_ATSAM is not set
4+
# CONFIG_MACH_ATSAMD is not set
5+
# CONFIG_MACH_LPC176X is not set
6+
CONFIG_MACH_STM32=y
7+
# CONFIG_MACH_HC32F460 is not set
8+
# CONFIG_MACH_RP2040 is not set
9+
# CONFIG_MACH_PRU is not set
10+
# CONFIG_MACH_AR100 is not set
11+
# CONFIG_MACH_LINUX is not set
12+
# CONFIG_MACH_SIMU is not set
13+
CONFIG_BOARD_DIRECTORY="stm32"
14+
CONFIG_MCU="stm32f446xx"
15+
CONFIG_CLOCK_FREQ=180000000
16+
CONFIG_USBSERIAL=y
17+
CONFIG_FLASH_SIZE=0x80000
18+
CONFIG_FLASH_BOOT_ADDRESS=0x8000000
19+
CONFIG_RAM_START=0x20000000
20+
CONFIG_RAM_SIZE=0x20000
21+
CONFIG_STACK_SIZE=512
22+
CONFIG_FLASH_APPLICATION_ADDRESS=0x8008000
23+
CONFIG_STM32_SELECT=y
24+
# CONFIG_MACH_STM32F103 is not set
25+
# CONFIG_MACH_STM32F207 is not set
26+
# CONFIG_MACH_STM32F401 is not set
27+
# CONFIG_MACH_STM32F405 is not set
28+
# CONFIG_MACH_STM32F407 is not set
29+
# CONFIG_MACH_STM32F429 is not set
30+
CONFIG_MACH_STM32F446=y
31+
# CONFIG_MACH_STM32F765 is not set
32+
# CONFIG_MACH_STM32F031 is not set
33+
# CONFIG_MACH_STM32F042 is not set
34+
# CONFIG_MACH_STM32F070 is not set
35+
# CONFIG_MACH_STM32F072 is not set
36+
# CONFIG_MACH_STM32G070 is not set
37+
# CONFIG_MACH_STM32G071 is not set
38+
# CONFIG_MACH_STM32G0B0 is not set
39+
# CONFIG_MACH_STM32G0B1 is not set
40+
# CONFIG_MACH_STM32G431 is not set
41+
# CONFIG_MACH_STM32G474 is not set
42+
# CONFIG_MACH_STM32H723 is not set
43+
# CONFIG_MACH_STM32H743 is not set
44+
# CONFIG_MACH_STM32H750 is not set
45+
# CONFIG_MACH_STM32L412 is not set
46+
# CONFIG_MACH_N32G452 is not set
47+
# CONFIG_MACH_N32G455 is not set
48+
CONFIG_MACH_STM32F4=y
49+
CONFIG_HAVE_STM32_USBOTG=y
50+
CONFIG_HAVE_STM32_CANBUS=y
51+
CONFIG_HAVE_STM32_USBCANBUS=y
52+
CONFIG_STM32_DFU_ROM_ADDRESS=0x1fff0000
53+
CONFIG_STM32_FLASH_START_8000=y
54+
# CONFIG_STM32_FLASH_START_10000 is not set
55+
# CONFIG_STM32_FLASH_START_0000 is not set
56+
# CONFIG_STM32_CLOCK_REF_8M is not set
57+
CONFIG_STM32_CLOCK_REF_12M=y
58+
# CONFIG_STM32_CLOCK_REF_16M is not set
59+
# CONFIG_STM32_CLOCK_REF_20M is not set
60+
# CONFIG_STM32_CLOCK_REF_24M is not set
61+
# CONFIG_STM32_CLOCK_REF_25M is not set
62+
# CONFIG_STM32_CLOCK_REF_INTERNAL is not set
63+
CONFIG_CLOCK_REF_FREQ=12000000
64+
CONFIG_STM32F0_TRIM=16
65+
CONFIG_STM32_USB_PA11_PA12=y
66+
# CONFIG_STM32_SERIAL_USART1 is not set
67+
# CONFIG_STM32_SERIAL_USART1_ALT_PB7_PB6 is not set
68+
# CONFIG_STM32_SERIAL_USART2 is not set
69+
# CONFIG_STM32_SERIAL_USART2_ALT_PD6_PD5 is not set
70+
# CONFIG_STM32_SERIAL_USART3 is not set
71+
# CONFIG_STM32_SERIAL_USART3_ALT_PD9_PD8 is not set
72+
# CONFIG_STM32_CANBUS_PA11_PA12 is not set
73+
# CONFIG_STM32_CANBUS_PA11_PB9 is not set
74+
# CONFIG_STM32_MMENU_CANBUS_PB8_PB9 is not set
75+
# CONFIG_STM32_MMENU_CANBUS_PI9_PH13 is not set
76+
# CONFIG_STM32_MMENU_CANBUS_PB5_PB6 is not set
77+
# CONFIG_STM32_MMENU_CANBUS_PB12_PB13 is not set
78+
# CONFIG_STM32_MMENU_CANBUS_PD0_PD1 is not set
79+
# CONFIG_STM32_USBCANBUS_PA11_PA12 is not set
80+
CONFIG_USB=y
81+
CONFIG_USB_VENDOR_ID=0x1d50
82+
CONFIG_USB_DEVICE_ID=0x614e
83+
CONFIG_USB_SERIAL_NUMBER_CHIPID=y
84+
CONFIG_USB_SERIAL_NUMBER="12345"
85+
86+
#
87+
# USB ids
88+
#
89+
# end of USB ids
90+
91+
CONFIG_WANT_GPIO_BITBANGING=y
92+
CONFIG_WANT_DISPLAYS=y
93+
CONFIG_WANT_SENSORS=y
94+
CONFIG_WANT_LIS2DW=y
95+
CONFIG_WANT_LDC1612=y
96+
CONFIG_WANT_SOFTWARE_I2C=y
97+
CONFIG_WANT_SOFTWARE_SPI=y
98+
CONFIG_NEED_SENSOR_BULK=y
99+
CONFIG_CANBUS_FREQUENCY=1000000
100+
CONFIG_INITIAL_PINS=""
101+
CONFIG_HAVE_GPIO=y
102+
CONFIG_HAVE_GPIO_ADC=y
103+
CONFIG_HAVE_GPIO_SPI=y
104+
CONFIG_HAVE_GPIO_SDIO=y
105+
CONFIG_HAVE_GPIO_I2C=y
106+
CONFIG_HAVE_GPIO_HARD_PWM=y
107+
CONFIG_HAVE_STRICT_TIMING=y
108+
CONFIG_HAVE_CHIPID=y
109+
CONFIG_HAVE_STEPPER_BOTH_EDGE=y
110+
CONFIG_HAVE_BOOTLOADER_REQUEST=y
111+
CONFIG_INLINE_STEPPER_HACK=y

‎klipper_menuconfigs/config-raspberry-pi

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ CONFIG_WANT_DISPLAYS=y
2121
CONFIG_WANT_SENSORS=y
2222
CONFIG_WANT_LIS2DW=y
2323
CONFIG_WANT_LDC1612=y
24+
CONFIG_WANT_HX71X=y
25+
CONFIG_WANT_ADS1220=y
2426
CONFIG_WANT_SOFTWARE_I2C=y
2527
CONFIG_WANT_SOFTWARE_SPI=y
2628
CONFIG_NEED_SENSOR_BULK=y

‎klipper_menuconfigs/config-raspberry-pi.old

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
CONFIG_LOW_LEVEL_OPTIONS=y
2+
# CONFIG_MACH_AVR is not set
3+
# CONFIG_MACH_ATSAM is not set
4+
# CONFIG_MACH_ATSAMD is not set
5+
# CONFIG_MACH_LPC176X is not set
6+
# CONFIG_MACH_STM32 is not set
7+
# CONFIG_MACH_HC32F460 is not set
8+
# CONFIG_MACH_RP2040 is not set
9+
# CONFIG_MACH_PRU is not set
10+
# CONFIG_MACH_AR100 is not set
11+
CONFIG_MACH_LINUX=y
12+
# CONFIG_MACH_SIMU is not set
13+
CONFIG_BOARD_DIRECTORY="linux"
14+
CONFIG_CLOCK_FREQ=50000000
15+
CONFIG_LINUX_SELECT=y
16+
CONFIG_USB_VENDOR_ID=0x1d50
17+
CONFIG_USB_DEVICE_ID=0x614e
18+
CONFIG_USB_SERIAL_NUMBER="12345"
19+
CONFIG_WANT_GPIO_BITBANGING=y
20+
CONFIG_WANT_DISPLAYS=y
21+
CONFIG_WANT_SENSORS=y
22+
CONFIG_WANT_LIS2DW=y
23+
CONFIG_WANT_LDC1612=y
24+
CONFIG_WANT_SOFTWARE_I2C=y
25+
CONFIG_WANT_SOFTWARE_SPI=y
26+
CONFIG_NEED_SENSOR_BULK=y
27+
CONFIG_CANBUS_FREQUENCY=1000000
28+
CONFIG_INITIAL_PINS=""
29+
CONFIG_HAVE_GPIO=y
30+
CONFIG_HAVE_GPIO_ADC=y
31+
CONFIG_HAVE_GPIO_SPI=y
32+
CONFIG_HAVE_GPIO_I2C=y
33+
CONFIG_HAVE_GPIO_HARD_PWM=y
34+
CONFIG_INLINE_STEPPER_HACK=y

‎klipper_menuconfigs/config-voron-skirt-buttons

+2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ CONFIG_WANT_DISPLAYS=y
9090
CONFIG_WANT_SENSORS=y
9191
CONFIG_WANT_LIS2DW=y
9292
CONFIG_WANT_LDC1612=y
93+
CONFIG_WANT_HX71X=y
94+
CONFIG_WANT_ADS1220=y
9395
CONFIG_WANT_SOFTWARE_I2C=y
9496
CONFIG_WANT_SOFTWARE_SPI=y
9597
CONFIG_NEED_SENSOR_BULK=y

0 commit comments

Comments
 (0)