Autocommit from 2025-01-31 19:57:56

Klipper on commit: 0114d72

Moonraker on commit: 7e3c86e

Mainsail version: v2.13.2

Author: BlackNet

config/filament_runout.cfg

@@ -53,10 +53,6 @@ insert_gcode:
   RESUME_MACRO
 
 
-
-
-<<<<<<< HEAD
-=======
 ## need RESUME_MACRO
 ## need PARK_MACRO
 
@@ -72,4 +68,3 @@ insert_gcode:
 event_delay: 3.0
 pause_delay: 0.5
 switch_pin: !ESTOP3
->>>>>>> a79de44abaae737db7e0181982fc61d72ea803ae

klipper_menuconfigs/config-U2C

@@ -107,12 +107,9 @@ CONFIG_WANT_MPU9250=y
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
 CONFIG_WANT_LDC1612=y
-<<<<<<< HEAD
 CONFIG_WANT_SENSOR_ANGLE=y
-=======
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
->>>>>>> a79de44abaae737db7e0181982fc61d72ea803ae
 CONFIG_WANT_SOFTWARE_I2C=y
 CONFIG_WANT_SOFTWARE_SPI=y
 CONFIG_NEED_SENSOR_BULK=y

klipper_menuconfigs/config-octopus-446

@@ -97,16 +97,10 @@ CONFIG_WANT_MPU9250=y
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
 CONFIG_WANT_LDC1612=y
-<<<<<<< HEAD
 CONFIG_WANT_SENSOR_ANGLE=y
-=======
-<<<<<<< HEAD
 CONFIG_WANT_SENSOR_ANGLE=y
-=======
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
->>>>>>> a79de44abaae737db7e0181982fc61d72ea803ae
->>>>>>> 7fa5654265a8eea8fe4464ea23f6b05f1ccad8cd
 CONFIG_WANT_SOFTWARE_I2C=y
 CONFIG_WANT_SOFTWARE_SPI=y
 CONFIG_NEED_SENSOR_BULK=y

klipper_menuconfigs/config-raspberry-pi

@@ -25,16 +25,8 @@ CONFIG_WANT_MPU9250=y
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
 CONFIG_WANT_LDC1612=y
-<<<<<<< HEAD
 CONFIG_WANT_SENSOR_ANGLE=y
-=======
-<<<<<<< HEAD
 CONFIG_WANT_SENSOR_ANGLE=y
-=======
-CONFIG_WANT_HX71X=y
-CONFIG_WANT_ADS1220=y
->>>>>>> a79de44abaae737db7e0181982fc61d72ea803ae
->>>>>>> 7fa5654265a8eea8fe4464ea23f6b05f1ccad8cd
 CONFIG_WANT_SOFTWARE_I2C=y
 CONFIG_WANT_SOFTWARE_SPI=y
 CONFIG_NEED_SENSOR_BULK=y

klipper_menuconfigs/klipper_make_voron_skirt_buttons.sh~

@@ -1,8 +1,5 @@
-<<<<<<< HEAD
 ########################################################################################################################
-=======
- ########################################################################################################################
->>>>>>> 7fa5654265a8eea8fe4464ea23f6b05f1ccad8cd
+########################################################################################################################
 # Happy Hare MMU Software
 #
 # EDIT THIS FILE BASED ON YOUR SETUP
@@ -57,15 +54,9 @@ selector_max_accel: 1200		# Never to be exceeded selector accelaration regardles
 # unless the 5v power supply has been improved and it is not necessary with standard ERCF builds
 # Make sure your hardware is suitable for the job!
 #
-<<<<<<< HEAD
-servo_up_angle: 35			# ERCF: MG90S: 30  ; SAVOX SH0255MG: 140 ; Tradrack: 145
-servo_down_angle: 105			# ERCF: MG90S: 140 ; SAVOX SH0255MG: 30  ; Tradrack: 1
-servo_move_angle: 50			# Optional angle used when selector is moved (defaults to up position)
-=======
 servo_up_angle: 140			# ERCF: MG90S: 30  ; SAVOX SH0255MG: 140 ; Tradrack: 145
 servo_down_angle: 50			# ERCF: MG90S: 140 ; SAVOX SH0255MG: 30  ; Tradrack: 1
 servo_move_angle: 130			# Optional angle used when selector is moved (defaults to up position)
->>>>>>> 7fa5654265a8eea8fe4464ea23f6b05f1ccad8cd
 servo_duration: 0.2			# Duration of PWM burst sent to servo (default non-active mode, automatically turns off)
 servo_dwell: 0.5			# Minimum time given to servo to complete movement prior to next move
 servo_always_active: 0 			# CAUTION: 1=Force servo to always stay active, 0=Release after movement
@@ -382,11 +373,7 @@ sync_multiplier_low: 0.95		# Minimum factor to apply
 #   defaulting to current gate. A custom gate will disable pre-gate runout detection for EndlessSpool because filament
 #   end must completely pass through the gate for selector to move
 #
-<<<<<<< HEAD
-enable_clog_detection: 2		# 0 = disable, 1 = static length clog detection, 2 = automatic length clog detection
-=======
 enable_clog_detection: 0		# 0 = disable, 1 = static length clog detection, 2 = automatic length clog detection
->>>>>>> 7fa5654265a8eea8fe4464ea23f6b05f1ccad8cd
 enable_endless_spool: 0			# 0 = disable, 1 = enable endless spool
 endless_spool_on_load: 0		# 0 = don't apply endless spool on load, 1 = run endless spool if gate is empty
 endless_spool_eject_gate: -1		# Which gate to eject the filament remains. -1 = current gate