Autocommit from 2025-11-22 03:08:48

Klipper version: v0.13.0-403-gb4c7cf4a

Moonraker version: v0.9.3-125-g3129d89

Mainsail version: v2.14.0

firmware/octopus-pro.config

@@ -71,6 +71,7 @@ CONFIG_STM32F0_TRIM=16
 # CONFIG_STM32_CANBUS_PA11_PA12 is not set
 # CONFIG_STM32_CANBUS_PA11_PB9 is not set
 # CONFIG_STM32_MMENU_CANBUS_PB8_PB9 is not set
+# CONFIG_STM32_MMENU_CANBUS_PB5_PB6 is not set
 # CONFIG_STM32_MMENU_CANBUS_PB12_PB13 is not set
 # CONFIG_STM32_MMENU_CANBUS_PD0_PD1 is not set
 # CONFIG_STM32_MMENU_CANBUS_PB0_PB1 is not set
@@ -78,6 +79,7 @@ CONFIG_STM32F0_TRIM=16
 # CONFIG_STM32_MMENU_CANBUS_PC2_PC3 is not set
 CONFIG_STM32_USBCANBUS_PA11_PA12=y
 # CONFIG_STM32_CMENU_CANBUS_PB8_PB9 is not set
+# CONFIG_STM32_CMENU_CANBUS_PB5_PB6 is not set
 # CONFIG_STM32_CMENU_CANBUS_PB12_PB13 is not set
 CONFIG_STM32_CMENU_CANBUS_PD0_PD1=y
 # CONFIG_STM32_CMENU_CANBUS_PB0_PB1 is not set
@@ -96,7 +98,6 @@ CONFIG_USB_SERIAL_NUMBER="12345"
 #
 # end of USB ids
 
-<<<<<<< HEAD
 CONFIG_WANT_ADC=y
 CONFIG_WANT_SPI=y
 CONFIG_WANT_SOFTWARE_SPI=y
@@ -109,37 +110,21 @@ 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_WANT_LOAD_CELL_PROBE=y
+CONFIG_NEED_SOS_FILTER=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

firmware/octopus-pro.config.old

@@ -12,7 +12,7 @@ CONFIG_MACH_STM32=y
 # CONFIG_MACH_SIMU is not set
 CONFIG_BOARD_DIRECTORY="stm32"
 CONFIG_MCU="stm32h723xx"
-CONFIG_CLOCK_FREQ=400000000
+CONFIG_CLOCK_FREQ=520000000
 CONFIG_FLASH_SIZE=0x40000
 CONFIG_FLASH_BOOT_ADDRESS=0x8000000
 CONFIG_RAM_START=0x20000000
@@ -98,16 +98,23 @@ CONFIG_USB_SERIAL_NUMBER="12345"
 
 CONFIG_WANT_GPIO_BITBANGING=y
 CONFIG_WANT_DISPLAYS=y
-CONFIG_WANT_SENSORS=y
+CONFIG_WANT_THERMOCOUPLE=y
+CONFIG_WANT_ADXL345=y
 CONFIG_WANT_LIS2DW=y
-CONFIG_WANT_LDC1612=y
+CONFIG_WANT_MPU9250=y
+CONFIG_WANT_ICM20948=y
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
+CONFIG_WANT_LDC1612=y
+CONFIG_WANT_SENSOR_ANGLE=y
 CONFIG_WANT_SOFTWARE_I2C=y
 CONFIG_WANT_SOFTWARE_SPI=y
 CONFIG_NEED_SENSOR_BULK=y
 CONFIG_CANBUS=y
 CONFIG_CANBUS_FREQUENCY=1000000
+CONFIG_INLINE_STEPPER_HACK=y
+CONFIG_HAVE_STEPPER_OPTIMIZED_BOTH_EDGE=y
+CONFIG_WANT_STEPPER_OPTIMIZED_BOTH_EDGE=y
 CONFIG_INITIAL_PINS="PE11"
 CONFIG_HAVE_GPIO=y
 CONFIG_HAVE_GPIO_ADC=y
@@ -116,6 +123,4 @@ CONFIG_HAVE_GPIO_I2C=y
 CONFIG_HAVE_GPIO_HARD_PWM=y
 CONFIG_HAVE_STRICT_TIMING=y
 CONFIG_HAVE_CHIPID=y
-CONFIG_HAVE_STEPPER_BOTH_EDGE=y
 CONFIG_HAVE_BOOTLOADER_REQUEST=y
-CONFIG_INLINE_STEPPER_HACK=y