Autocommit from 2025-05-17 13:11:17

Klipper version: v0.13.0-114-g841a9ca2

Moonraker version: v0.9.3-74-g1c12414

Mainsail version: v2.14.0

firmware/octopus-pro.config

@@ -96,6 +96,7 @@ CONFIG_USB_SERIAL_NUMBER="12345"
 #
 # end of USB ids
 
+<<<<<<< HEAD
 CONFIG_WANT_ADC=y
 CONFIG_WANT_SPI=y
 CONFIG_WANT_SOFTWARE_SPI=y
@@ -108,19 +109,37 @@ CONFIG_WANT_NEOPIXEL=y
 CONFIG_WANT_PULSE_COUNTER=y
 CONFIG_WANT_ST7920=y
 CONFIG_WANT_HD44780=y
+=======
+CONFIG_WANT_GPIO_BITBANGING=y
+CONFIG_WANT_DISPLAYS=y
+CONFIG_WANT_THERMOCOUPLE=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_ADXL345=y
 CONFIG_WANT_LIS2DW=y
 CONFIG_WANT_MPU9250=y
 CONFIG_WANT_ICM20948=y
+<<<<<<< HEAD
 CONFIG_WANT_THERMOCOUPLE=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
 CONFIG_WANT_LDC1612=y
 CONFIG_WANT_SENSOR_ANGLE=y
+<<<<<<< HEAD
+=======
+CONFIG_WANT_SOFTWARE_I2C=y
+CONFIG_WANT_SOFTWARE_SPI=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_NEED_SENSOR_BULK=y
 CONFIG_CANBUS=y
 CONFIG_CANBUS_FREQUENCY=1000000
 CONFIG_INLINE_STEPPER_HACK=y
+<<<<<<< HEAD
+=======
+CONFIG_HAVE_STEPPER_OPTIMIZED_BOTH_EDGE=y
+CONFIG_WANT_STEPPER_OPTIMIZED_BOTH_EDGE=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_INITIAL_PINS="PE11"
 CONFIG_HAVE_GPIO=y
 CONFIG_HAVE_GPIO_ADC=y