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

crowsnest.conf

@@ -43,7 +43,7 @@ no_proxy: false
 [cam head]
 #mode: ustreamer
 mode: MJPG
-port: 8081          
+port: 8080          
 #device: /dev/v4l/by-path/platform-5101000.usb-usb-0:1.1:1.0-video-index0
 device: /dev/v4l/by-id/usb-DSJ_UC60_Video_200901010001-video-index0
 resolution: 1280x960 #176x144, 320x240, 352x288, 640x480, 640x360, 640x400, 800x600, 1024x768, 1280x720, 1280x960, 1600x1200, 1920x1080, 2048x1536, 2560x1440, 2592x1944

firmware/config.manta723.CAN

@@ -0,0 +1,67 @@
+# CONFIG_LOW_LEVEL_OPTIONS is not set
+CONFIG_MACH_AVR=y
+# CONFIG_MACH_ATSAM is not set
+# CONFIG_MACH_ATSAMD is not set
+# CONFIG_MACH_LPC176X is not set
+# CONFIG_MACH_STM32 is not set
+# CONFIG_MACH_HC32F460 is not set
+# CONFIG_MACH_RPXXXX is not set
+# CONFIG_MACH_PRU is not set
+# CONFIG_MACH_AR100 is not set
+# CONFIG_MACH_LINUX is not set
+# CONFIG_MACH_SIMU is not set
+CONFIG_AVR_SELECT=y
+CONFIG_BOARD_DIRECTORY="avr"
+CONFIG_MACH_atmega2560=y
+# CONFIG_MACH_atmega1280 is not set
+# CONFIG_MACH_at90usb1286 is not set
+# CONFIG_MACH_at90usb646 is not set
+# CONFIG_MACH_atmega32u4 is not set
+# CONFIG_MACH_atmega1284p is not set
+# CONFIG_MACH_atmega644p is not set
+# CONFIG_MACH_atmega328p is not set
+# CONFIG_MACH_atmega328 is not set
+# CONFIG_MACH_atmega168 is not set
+CONFIG_MCU="atmega2560"
+CONFIG_AVRDUDE_PROTOCOL="wiring"
+CONFIG_CLOCK_FREQ=16000000
+CONFIG_AVR_CLKPR=-1
+CONFIG_AVR_STACK_SIZE=256
+CONFIG_AVR_WATCHDOG=y
+CONFIG_SERIAL=y
+CONFIG_SERIAL_BAUD_U2X=y
+CONFIG_SERIAL_PORT=0
+CONFIG_SERIAL_BAUD=250000
+CONFIG_USB_VENDOR_ID=0x1d50
+CONFIG_USB_DEVICE_ID=0x614e
+CONFIG_USB_SERIAL_NUMBER="12345"
+CONFIG_WANT_ADC=y
+CONFIG_WANT_SPI=y
+CONFIG_WANT_SOFTWARE_SPI=y
+CONFIG_WANT_I2C=y
+CONFIG_WANT_SOFTWARE_I2C=y
+CONFIG_WANT_HARD_PWM=y
+CONFIG_WANT_BUTTONS=y
+CONFIG_WANT_TMCUART=y
+CONFIG_WANT_NEOPIXEL=y
+CONFIG_WANT_PULSE_COUNTER=y
+CONFIG_WANT_ST7920=y
+CONFIG_WANT_HD44780=y
+CONFIG_WANT_ADXL345=y
+CONFIG_WANT_LIS2DW=y
+CONFIG_WANT_MPU9250=y
+CONFIG_WANT_ICM20948=y
+CONFIG_WANT_THERMOCOUPLE=y
+CONFIG_WANT_HX71X=y
+CONFIG_WANT_ADS1220=y
+CONFIG_WANT_LDC1612=y
+CONFIG_WANT_SENSOR_ANGLE=y
+CONFIG_NEED_SENSOR_BULK=y
+CONFIG_CANBUS_FREQUENCY=1000000
+CONFIG_INLINE_STEPPER_HACK=y
+CONFIG_HAVE_GPIO=y
+CONFIG_HAVE_GPIO_ADC=y
+CONFIG_HAVE_GPIO_SPI=y
+CONFIG_HAVE_GPIO_I2C=y
+CONFIG_HAVE_GPIO_HARD_PWM=y
+CONFIG_HAVE_STRICT_TIMING=y

firmware/hbb.cfg

@@ -54,19 +54,41 @@ CONFIG_USB_SERIAL_NUMBER="12345"
 #
 # end of USB ids
 
+<<<<<<< HEAD
+CONFIG_WANT_ADC=y
+CONFIG_WANT_SPI=y
+CONFIG_WANT_SOFTWARE_SPI=y
+CONFIG_WANT_I2C=y
+CONFIG_WANT_SOFTWARE_I2C=y
+CONFIG_WANT_HARD_PWM=y
+CONFIG_WANT_BUTTONS=y
+CONFIG_WANT_TMCUART=y
+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_FREQUENCY=1000000
 CONFIG_INLINE_STEPPER_HACK=y
@@ -81,3 +103,7 @@ CONFIG_HAVE_GPIO_HARD_PWM=y
 CONFIG_HAVE_STRICT_TIMING=y
 CONFIG_HAVE_CHIPID=y
 CONFIG_HAVE_BOOTLOADER_REQUEST=y
+<<<<<<< HEAD
+CONFIG_HAVE_SOFTWARE_DIVIDE_REQUIRED=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9

firmware/hbb.cfg.old

@@ -1,15 +1,70 @@
+<<<<<<< HEAD
+CONFIG_LOW_LEVEL_OPTIONS=y
+# CONFIG_MACH_AVR is not set
+=======
 # CONFIG_LOW_LEVEL_OPTIONS is not set
 CONFIG_MACH_AVR=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 # CONFIG_MACH_ATSAM is not set
 # CONFIG_MACH_ATSAMD is not set
 # CONFIG_MACH_LPC176X is not set
 # CONFIG_MACH_STM32 is not set
 # CONFIG_MACH_HC32F460 is not set
+<<<<<<< HEAD
+CONFIG_MACH_RPXXXX=y
+=======
 # CONFIG_MACH_RPXXXX is not set
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 # CONFIG_MACH_PRU is not set
 # CONFIG_MACH_AR100 is not set
 # CONFIG_MACH_LINUX is not set
 # CONFIG_MACH_SIMU is not set
+<<<<<<< HEAD
+CONFIG_BOARD_DIRECTORY="rp2040"
+CONFIG_MCU="rp2040"
+CONFIG_CLOCK_FREQ=12000000
+CONFIG_USBSERIAL=y
+CONFIG_FLASH_SIZE=0x200000
+CONFIG_FLASH_BOOT_ADDRESS=0x10000100
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_SIZE=0x42000
+CONFIG_STACK_SIZE=512
+CONFIG_FLASH_APPLICATION_ADDRESS=0x10000100
+CONFIG_RPXXXX_SELECT=y
+CONFIG_MACH_RP2040=y
+# CONFIG_MACH_RP2350 is not set
+CONFIG_RP2040_HAVE_STAGE2=y
+CONFIG_RPXXXX_FLASH_START_0100=y
+# CONFIG_RPXXXX_FLASH_START_4000 is not set
+CONFIG_RP2040_FLASH_W25Q080=y
+# CONFIG_RP2040_FLASH_GENERIC_03 is not set
+CONFIG_RP2040_STAGE2_FILE="boot2_w25q080.S"
+CONFIG_RP2040_STAGE2_CLKDIV=2
+CONFIG_RPXXXX_USB=y
+# CONFIG_RPXXXX_SERIAL_UART0_PINS_0_1 is not set
+# CONFIG_RPXXXX_SERIAL_UART0_PINS_12_13 is not set
+# CONFIG_RPXXXX_SERIAL_UART0_PINS_16_17 is not set
+# CONFIG_RPXXXX_SERIAL_UART0_PINS_28_29 is not set
+# CONFIG_RPXXXX_SERIAL_UART1_PINS_4_5 is not set
+# CONFIG_RPXXXX_SERIAL_UART1_PINS_8_9 is not set
+# CONFIG_RPXXXX_SERIAL_UART1_PINS_20_21 is not set
+# CONFIG_RPXXXX_SERIAL_UART1_PINS_24_25 is not set
+# CONFIG_RPXXXX_CANBUS is not set
+# CONFIG_RPXXXX_USBCANBUS is not set
+CONFIG_RPXXXX_CANBUS_GPIO_RX=4
+CONFIG_RPXXXX_CANBUS_GPIO_TX=5
+CONFIG_USB=y
+CONFIG_USB_VENDOR_ID=0x1d50
+CONFIG_USB_DEVICE_ID=0x614e
+CONFIG_USB_SERIAL_NUMBER_CHIPID=y
+CONFIG_USB_SERIAL_NUMBER="12345"
+
+#
+# USB ids
+#
+# end of USB ids
+
+=======
 CONFIG_AVR_SELECT=y
 CONFIG_BOARD_DIRECTORY="avr"
 CONFIG_MACH_atmega2560=y
@@ -35,6 +90,7 @@ CONFIG_SERIAL_BAUD=250000
 CONFIG_USB_VENDOR_ID=0x1d50
 CONFIG_USB_DEVICE_ID=0x614e
 CONFIG_USB_SERIAL_NUMBER="12345"
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_GPIO_BITBANGING=y
 CONFIG_WANT_DISPLAYS=y
 CONFIG_WANT_THERMOCOUPLE=y
@@ -51,9 +107,20 @@ CONFIG_WANT_SOFTWARE_SPI=y
 CONFIG_NEED_SENSOR_BULK=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
+CONFIG_INITIAL_PINS=""
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_HAVE_GPIO=y
 CONFIG_HAVE_GPIO_ADC=y
 CONFIG_HAVE_GPIO_SPI=y
 CONFIG_HAVE_GPIO_I2C=y
 CONFIG_HAVE_GPIO_HARD_PWM=y
 CONFIG_HAVE_STRICT_TIMING=y
+<<<<<<< HEAD
+CONFIG_HAVE_CHIPID=y
+CONFIG_HAVE_BOOTLOADER_REQUEST=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9

firmware/octopus-pro.config

@@ -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
@@ -96,25 +96,50 @@ CONFIG_USB_SERIAL_NUMBER="12345"
 #
 # end of USB ids
 
+<<<<<<< HEAD
+CONFIG_WANT_ADC=y
+CONFIG_WANT_SPI=y
+CONFIG_WANT_SOFTWARE_SPI=y
+CONFIG_WANT_I2C=y
+CONFIG_WANT_SOFTWARE_I2C=y
+CONFIG_WANT_HARD_PWM=y
+CONFIG_WANT_BUTTONS=y
+CONFIG_WANT_TMCUART=y
+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

firmware/rp_sb2209.CAN

@@ -43,19 +43,41 @@ CONFIG_RPXXXX_CANBUS_GPIO_TX=5
 CONFIG_USB_VENDOR_ID=0x1d50
 CONFIG_USB_DEVICE_ID=0x614e
 CONFIG_USB_SERIAL_NUMBER="12345"
+<<<<<<< HEAD
+CONFIG_WANT_ADC=y
+CONFIG_WANT_SPI=y
+CONFIG_WANT_SOFTWARE_SPI=y
+CONFIG_WANT_I2C=y
+CONFIG_WANT_SOFTWARE_I2C=y
+CONFIG_WANT_HARD_PWM=y
+CONFIG_WANT_BUTTONS=y
+CONFIG_WANT_TMCUART=y
+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_CANSERIAL=y
 CONFIG_CANBUS=y
@@ -73,3 +95,7 @@ CONFIG_HAVE_GPIO_HARD_PWM=y
 CONFIG_HAVE_STRICT_TIMING=y
 CONFIG_HAVE_CHIPID=y
 CONFIG_HAVE_BOOTLOADER_REQUEST=y
+<<<<<<< HEAD
+CONFIG_HAVE_SOFTWARE_DIVIDE_REQUIRED=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9

firmware/update_fw.sh

@@ -10,8 +10,8 @@
 #rp_sb2209=350f10596216
 #sht36_v2=8ce295109ef0
 
-toolhed_name=rp_sb2209 
+toolhead_name=rp_sb2209 
-toolhed_uuid=350f10596216
+toolhead_uuid=350f10596216
 mcu_uuid=afcf80281237
 mcu_path=/dev/serial/by-id/usb-katapult_stm32h723xx_320006001751313431393536-if00
 config_path=/home/biqu/printer_data/config/firmware/
@@ -26,7 +26,7 @@ make -j4 KCONFIG_CONFIG="${config_path}octopus-pro.config"
 mv ~/klipper/out/klipper.bin ~/firmware/octopus_klipper.bin
 
 make clean
-toolhead_config="${config_path}/${used_toolhed}.CAN"
+toolhead_config="${config_path}/${toolhead_name}.CAN"
 make -j4 KCONFIG_CONFIG=$toolhead_config
 mv ~/klipper/out/klipper.bin ~/firmware/toolhead_klipper.bin
 
@@ -41,7 +41,7 @@ sleep 2
 
 # Update Toolhead MCU
 echo "Start update Toolhead MCU"
-python3 flash_can.py -i can0 -u $toolhed_uuid -f ~/firmware/toolhead_klipper.bin
+python3 flash_can.py -i can0 -u $toolhead_uuid -f ~/firmware/toolhead_klipper.bin
 sleep 2
 #read -p "MCU EBB36 firmware flashed, please check above for any errors. Press [Enter] to continue, or [Ctrl+C] to abort"
 #echo "Finish update MCU EBB36"

toolhead_sb.cfg

@@ -34,13 +34,13 @@ accel_per_hz: 125
 hz_per_sec: 1
 
 [input_shaper]
-#shaper_type_x: mzv
-#shaper_freq_x: 51
-#shaper_type_y: mzv
-#shaper_freq_y: 41.6
 #max 4000
-shaper_type_x: 2hump_ei 
+#shaper_type_x: 2hump_ei 
-shaper_freq_x: 74.800
+#shaper_freq_x: 74.800
+#shaper_type_y: mzv 
+#shaper_freq_y: 40.200 
+shaper_type_x:mzv 
+shaper_freq_x:51.000 
 shaper_type_y:mzv 
 shaper_freq_y:40.200