From 715bcc05067fd6ab1b1edbc8c24fc7951d297a08 Mon Sep 17 00:00:00 2001 From: Mikhail Shahovalov Date: Sat, 22 Nov 2025 03:08:48 +0300 Subject: [PATCH] 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 --- config-20250807-195608.zip | Bin 5722 -> 0 bytes firmware/octopus-pro.config | 23 ++++------------------- firmware/octopus-pro.config.old | 15 ++++++++++----- macros/main.cfg | 2 +- printer.cfg | 18 +++++++++--------- toolhead_sb.cfg | 5 ++--- 6 files changed, 26 insertions(+), 37 deletions(-) delete mode 100644 config-20250807-195608.zip diff --git a/config-20250807-195608.zip b/config-20250807-195608.zip deleted file mode 100644 index 6842ce8e6e409e25a33356d3da3492058928a812..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5722 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 G!2baF^y2ye diff --git a/firmware/octopus-pro.config b/firmware/octopus-pro.config index 4d3f6d4..31eb564 100644 --- a/firmware/octopus-pro.config +++ b/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 diff --git a/firmware/octopus-pro.config.old b/firmware/octopus-pro.config.old index 8a5a8be..18179dc 100644 --- a/firmware/octopus-pro.config.old +++ b/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 diff --git a/macros/main.cfg b/macros/main.cfg index 66ed458..57cc3b9 100644 --- a/macros/main.cfg +++ b/macros/main.cfg @@ -141,7 +141,7 @@ gcode: M117 Heating... #M190 S{BED_TEMP} M109 S{EXTRUDER_TEMP} ; M109 heat and wait for it to reach temp - {% if BED_TEMP > 100 %} + {% if BED_TEMP > 90 %} _NEVERMORE_ON {% endif %} M117 diff --git a/printer.cfg b/printer.cfg index abd797b..ebe778e 100644 --- a/printer.cfg +++ b/printer.cfg @@ -215,19 +215,19 @@ algorithm: bicubic #*# [bed_mesh default] #*# version = 1 #*# points = -#*# 0.005312, 0.005625, 0.016875 -#*# -0.001250, -0.008125, 0.015312 -#*# 0.016250, 0.004687, 0.022812 -#*# x_count = 3 +#*# 0.047812, 0.011875, 0.018437, 0.068750 +#*# 0.045312, 0.025312, 0.030625, 0.085937 +#*# 0.057500, 0.017812, 0.029375, 0.089062 +#*# x_count = 4 #*# y_count = 3 #*# mesh_x_pps = 2 #*# mesh_y_pps = 2 #*# algo = lagrange #*# tension = 0.2 -#*# min_x = 132.6 -#*# max_x = 217.0 -#*# min_y = 133.25 -#*# max_y = 217.07 +#*# min_x = 99.89129999999997 +#*# max_x = 270.62129999999996 +#*# min_y = 264.187 +#*# max_y = 283.447 #*# #*# [probe] -#*# z_offset = -0.850 +#*# z_offset = -0.835 diff --git a/toolhead_sb.cfg b/toolhead_sb.cfg index aa887b0..d8ff907 100644 --- a/toolhead_sb.cfg +++ b/toolhead_sb.cfg @@ -36,10 +36,9 @@ hz_per_sec: 1 [input_shaper] #max 4000 shaper_type_x:mzv -shaper_freq_x:53.800 +shaper_freq_x:53.400 shaper_type_y:mzv -shaper_freq_y:42.400 - +shaper_freq_y:42.200 [temperature_sensor SB2209] sensor_type: temperature_mcu