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
Autocommit from 2025-05-17 13:10:21
2025-05-17 13:11:17 +03:00 · 2025-05-17 13:10:21 +03:00 · 2025-05-17 06:54:36 +03:00 · 2025-05-12 07:48:07 +03:00 · 2025-04-27 09:53:57 +03:00 · 2025-04-03 03:23:59 +03:00
17 changed files with 790 additions and 275 deletions
--- a/..gitignore.swp
+++ b/..gitignore.swp
--- a/crowsnest.conf
+++ b/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
--- a/firmware/.CAN
+++ b/firmware/.CAN
@@ -0,0 +1,59 @@
+# 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_GPIO_BITBANGING=y
+CONFIG_WANT_DISPLAYS=y
+CONFIG_WANT_THERMOCOUPLE=y
+CONFIG_WANT_ADXL345=y
+CONFIG_WANT_LIS2DW=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_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
--- a/firmware/config.manta723.CAN
+++ b/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
--- a/firmware/hbb.cfg
+++ b/firmware/hbb.cfg
@@ -0,0 +1,109 @@
+CONFIG_LOW_LEVEL_OPTIONS=y
+# CONFIG_MACH_AVR is not set
+# 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=y
+# 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_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
+
+<<<<<<< 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
+CONFIG_HAVE_STEPPER_OPTIMIZED_BOTH_EDGE=y
+CONFIG_WANT_STEPPER_OPTIMIZED_BOTH_EDGE=y
+CONFIG_INITIAL_PINS=""
+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
+CONFIG_HAVE_CHIPID=y
+CONFIG_HAVE_BOOTLOADER_REQUEST=y
+<<<<<<< HEAD
+CONFIG_HAVE_SOFTWARE_DIVIDE_REQUIRED=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
--- a/firmware/hbb.cfg.old
+++ b/firmware/hbb.cfg.old
@@ -0,0 +1,126 @@
+<<<<<<< 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
+# 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"
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
+CONFIG_WANT_GPIO_BITBANGING=y
+CONFIG_WANT_DISPLAYS=y
+CONFIG_WANT_THERMOCOUPLE=y
+CONFIG_WANT_ADXL345=y
+CONFIG_WANT_LIS2DW=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_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
--- a/firmware/octopus-pro.config
+++ b/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,18 +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_SENSORS=y
+CONFIG_WANT_THERMOCOUPLE=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
+CONFIG_WANT_ADXL345=y
 CONFIG_WANT_LIS2DW=y
-CONFIG_WANT_LDC1612=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
@@ -116,6 +148,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
--- a/firmware/octopus-pro.config.old
+++ b/firmware/octopus-pro.config.old
@@ -0,0 +1,121 @@
+CONFIG_LOW_LEVEL_OPTIONS=y
+# CONFIG_MACH_AVR is not set
+# CONFIG_MACH_ATSAM is not set
+# CONFIG_MACH_ATSAMD is not set
+# CONFIG_MACH_LPC176X is not set
+CONFIG_MACH_STM32=y
+# 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_BOARD_DIRECTORY="stm32"
+CONFIG_MCU="stm32h723xx"
+CONFIG_CLOCK_FREQ=400000000
+CONFIG_FLASH_SIZE=0x40000
+CONFIG_FLASH_BOOT_ADDRESS=0x8000000
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_SIZE=0x20000
+CONFIG_STACK_SIZE=512
+CONFIG_FLASH_APPLICATION_ADDRESS=0x8020000
+CONFIG_STM32_SELECT=y
+# CONFIG_MACH_STM32F103 is not set
+# CONFIG_MACH_STM32F207 is not set
+# CONFIG_MACH_STM32F401 is not set
+# CONFIG_MACH_STM32F405 is not set
+# CONFIG_MACH_STM32F407 is not set
+# CONFIG_MACH_STM32F429 is not set
+# CONFIG_MACH_STM32F446 is not set
+# CONFIG_MACH_STM32F765 is not set
+# CONFIG_MACH_STM32F031 is not set
+# CONFIG_MACH_STM32F042 is not set
+# CONFIG_MACH_STM32F070 is not set
+# CONFIG_MACH_STM32F072 is not set
+# CONFIG_MACH_STM32G070 is not set
+# CONFIG_MACH_STM32G071 is not set
+# CONFIG_MACH_STM32G0B0 is not set
+# CONFIG_MACH_STM32G0B1 is not set
+# CONFIG_MACH_STM32G431 is not set
+# CONFIG_MACH_STM32G474 is not set
+CONFIG_MACH_STM32H723=y
+# CONFIG_MACH_STM32H743 is not set
+# CONFIG_MACH_STM32H750 is not set
+# CONFIG_MACH_STM32L412 is not set
+# CONFIG_MACH_N32G452 is not set
+# CONFIG_MACH_N32G455 is not set
+CONFIG_MACH_STM32H7=y
+CONFIG_HAVE_STM32_USBOTG=y
+CONFIG_HAVE_STM32_FDCANBUS=y
+CONFIG_HAVE_STM32_USBCANBUS=y
+CONFIG_STM32_DFU_ROM_ADDRESS=0x1ff09800
+CONFIG_STM32_FLASH_START_20000=y
+# CONFIG_STM32_FLASH_START_0000 is not set
+# CONFIG_STM32_CLOCK_REF_8M is not set
+# CONFIG_STM32_CLOCK_REF_12M is not set
+# CONFIG_STM32_CLOCK_REF_16M is not set
+# CONFIG_STM32_CLOCK_REF_20M is not set
+# CONFIG_STM32_CLOCK_REF_24M is not set
+CONFIG_STM32_CLOCK_REF_25M=y
+# CONFIG_STM32_CLOCK_REF_INTERNAL is not set
+CONFIG_CLOCK_REF_FREQ=25000000
+CONFIG_STM32F0_TRIM=16
+# CONFIG_STM32_USB_PA11_PA12 is not set
+# CONFIG_STM32_SERIAL_USART1 is not set
+# CONFIG_STM32_SERIAL_USART1_ALT_PB7_PB6 is not set
+# CONFIG_STM32_SERIAL_USART2 is not set
+# CONFIG_STM32_SERIAL_USART2_ALT_PD6_PD5 is not set
+# CONFIG_STM32_SERIAL_USART3 is not set
+# CONFIG_STM32_SERIAL_USART3_ALT_PD9_PD8 is not set
+# CONFIG_STM32_SERIAL_UART4 is not set
+# 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_PB12_PB13 is not set
+# CONFIG_STM32_MMENU_CANBUS_PD0_PD1 is not set
+# CONFIG_STM32_MMENU_CANBUS_PB0_PB1 is not set
+# CONFIG_STM32_MMENU_CANBUS_PD12_PD13 is not set
+# 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_PB12_PB13 is not set
+CONFIG_STM32_CMENU_CANBUS_PD0_PD1=y
+# CONFIG_STM32_CMENU_CANBUS_PB0_PB1 is not set
+# CONFIG_STM32_CMENU_CANBUS_PD12_PD13 is not set
+# CONFIG_STM32_CMENU_CANBUS_PC2_PC3 is not set
+CONFIG_STM32_CANBUS_PD0_PD1=y
+CONFIG_USBCANBUS=y
+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_WANT_GPIO_BITBANGING=y
+CONFIG_WANT_DISPLAYS=y
+CONFIG_WANT_SENSORS=y
+CONFIG_WANT_LIS2DW=y
+CONFIG_WANT_LDC1612=y
+CONFIG_WANT_HX71X=y
+CONFIG_WANT_ADS1220=y
+CONFIG_WANT_SOFTWARE_I2C=y
+CONFIG_WANT_SOFTWARE_SPI=y
+CONFIG_NEED_SENSOR_BULK=y
+CONFIG_CANBUS=y
+CONFIG_CANBUS_FREQUENCY=1000000
+CONFIG_INITIAL_PINS="PE11"
+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
+CONFIG_HAVE_CHIPID=y
+CONFIG_HAVE_STEPPER_BOTH_EDGE=y
+CONFIG_HAVE_BOOTLOADER_REQUEST=y
+CONFIG_INLINE_STEPPER_HACK=y
--- a/firmware/rp_sb2209.CAN
+++ b/firmware/rp_sb2209.CAN
@@ -43,20 +43,49 @@ 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_SENSORS=y
+CONFIG_WANT_THERMOCOUPLE=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
+CONFIG_WANT_ADXL345=y
 CONFIG_WANT_LIS2DW=y
-CONFIG_WANT_LDC1612=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
 CONFIG_CANBUS_FREQUENCY=1000000
 CONFIG_CANBUS_FILTER=y
+CONFIG_INLINE_STEPPER_HACK=y
+CONFIG_HAVE_STEPPER_OPTIMIZED_BOTH_EDGE=y
+CONFIG_WANT_STEPPER_OPTIMIZED_BOTH_EDGE=y
 CONFIG_INITIAL_PINS="!gpio6"
 CONFIG_HAVE_GPIO=y
 CONFIG_HAVE_GPIO_ADC=y
@@ -65,6 +94,8 @@ 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
+<<<<<<< HEAD
+CONFIG_HAVE_SOFTWARE_DIVIDE_REQUIRED=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
--- a/firmware/rp_sb2209.CAN.old
+++ b/firmware/rp_sb2209.CAN.old
@@ -0,0 +1,70 @@
+CONFIG_LOW_LEVEL_OPTIONS=y
+# CONFIG_MACH_AVR is not set
+# 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=y
+# 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_BOARD_DIRECTORY="rp2040"
+CONFIG_MCU="rp2040"
+CONFIG_CLOCK_FREQ=12000000
+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=0x10004000
+CONFIG_RPXXXX_SELECT=y
+CONFIG_MACH_RP2040=y
+# CONFIG_MACH_RP2350 is not set
+CONFIG_RPXXXX_HAVE_BOOTLOADER=y
+# CONFIG_RPXXXX_FLASH_START_0100 is not set
+CONFIG_RPXXXX_FLASH_START_4000=y
+CONFIG_RP2040_STAGE2_FILE="boot2_w25q080.S"
+CONFIG_RP2040_STAGE2_CLKDIV=2
+# CONFIG_RPXXXX_USB is not set
+# 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=y
+# CONFIG_RPXXXX_USBCANBUS is not set
+CONFIG_RPXXXX_CANBUS_GPIO_RX=4
+CONFIG_RPXXXX_CANBUS_GPIO_TX=5
+CONFIG_USB_VENDOR_ID=0x1d50
+CONFIG_USB_DEVICE_ID=0x614e
+CONFIG_USB_SERIAL_NUMBER="12345"
+CONFIG_WANT_GPIO_BITBANGING=y
+CONFIG_WANT_DISPLAYS=y
+CONFIG_WANT_SENSORS=y
+CONFIG_WANT_LIS2DW=y
+CONFIG_WANT_LDC1612=y
+CONFIG_WANT_HX71X=y
+CONFIG_WANT_ADS1220=y
+CONFIG_WANT_SOFTWARE_I2C=y
+CONFIG_WANT_SOFTWARE_SPI=y
+CONFIG_NEED_SENSOR_BULK=y
+CONFIG_CANSERIAL=y
+CONFIG_CANBUS=y
+CONFIG_CANBUS_FREQUENCY=1000000
+CONFIG_CANBUS_FILTER=y
+CONFIG_INITIAL_PINS="!gpio6"
+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
+CONFIG_HAVE_CHIPID=y
+CONFIG_HAVE_STEPPER_BOTH_EDGE=y
+CONFIG_HAVE_BOOTLOADER_REQUEST=y
+CONFIG_INLINE_STEPPER_HACK=y
--- a/firmware/update_fw.sh
+++ b/firmware/update_fw.sh
@@ -10,8 +10,8 @@
 #rp_sb2209=350f10596216
 #sht36_v2=8ce295109ef0

-toolhed_name=rp_sb2209 
-toolhed_uuid=350f10596216
+toolhead_name=rp_sb2209 
+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"
--- a/macros/homing.cfg.old
+++ b/macros/homing.cfg.old
@@ -1,174 +0,0 @@
-[gcode_macro MOVE_UP]
-variable_set_kinematic_z: 20
-variable_up_z: 10
-gcode:
-  SAVE_GCODE_STATE NAME=my_move_up_state
-  {% if not 'z' in printer.toolhead.homed_axes %}
-    SET_KINEMATIC_POSITION Z={set_kinematic_z}
-  {% endif %}
-  G91
-  G0 Z{up_z} F1200
-  RESTORE_GCODE_STATE NAME=my_move_up_state
-
-[gcode_macro _HOME_X]
-variable_homing_current: 0.65
-variable_start_retract: 15
-gcode:
-    # Always use consistent run_current on A/B steppers during sensorless homing
-    {% set RUN_CURRENT_X = printer.configfile.settings['tmc2240 stepper_x'].run_current|float %}
-    {% set RUN_CURRENT_Y = printer.configfile.settings['tmc2240 stepper_y'].run_current|float %}
-    SET_TMC_CURRENT STEPPER=stepper_x CURRENT={homing_current}
-    SET_TMC_CURRENT STEPPER=stepper_y CURRENT={homing_current}
-    
-    M117 Homing X...
-
-    SET_KINEMATIC_POSITION X={start_retract}
-    G91
-    G1 X-{start_retract} F1200
-
-    M400     
-    G28 X
-    
-    G91
-    G1 X-60 F1200
-    #G4 P500
-    
-    M117
-    
-    SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
-    SET_TMC_CURRENT STEPPER=stepper_y CURRENT={RUN_CURRENT_Y}      
-    
-
-[gcode_macro _HOME_Y]
-variable_homing_current: 0.65
-variable_start_retract: 15
-gcode:
-    # Set current for sensorless homing
-    {% set RUN_CURRENT_X = printer.configfile.settings['tmc2240 stepper_x'].run_current|float %}
-    {% set RUN_CURRENT_Y = printer.configfile.settings['tmc2240 stepper_y'].run_current|float %}
-    SET_TMC_CURRENT STEPPER=stepper_x CURRENT={homing_current}
-    SET_TMC_CURRENT STEPPER=stepper_y CURRENT={homing_current}
-    #SET_TMC_FIELD FIELD=SGT STEPPER=stepper_x VALUE=1
-    #G4 P1000
-
-    M117 Homing Y...
-
-    SET_KINEMATIC_POSITION Y={start_retract}
-    G91
-    G1 Y-{start_retract} F1200    
-
-    M400 
-    G28 Y
-    
-    G91
-    G1 Y-10 F1200
-    #G4 P500
-    
-    M117
-    # Set current during print
-    SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
-    SET_TMC_CURRENT STEPPER=stepper_y CURRENT={RUN_CURRENT_Y}
-
-
-[homing_override]
-axes: xyz
-gcode:
-  {% set home_all = 'X' not in params and 'Y' not in params and 'Z' not in params %}
-  {% set move_x = params.X|default(printer.toolhead.axis_maximum.y/2)|int %}    
-  {% set move_y = params.Y|default(printer.toolhead.axis_maximum.y/2)|int %}    
-  {% if params.Z == '' %}
-       {% set move_z = 10 %}
-     {% else %}
-       {% set move_z = params.Z|default(10)|int %}
-  {% endif %}
-  
-  SET_GCODE_VARIABLE MACRO=_KNOMI_STATUS VARIABLE=homing VALUE=True
-  STATUS_HOMING  
-  
-  {% if home_all or 'X' or 'Y' in params %}
-    INIT_TMC STEPPER=stepper_y
-    INIT_TMC STEPPER=stepper_x
-  {% endif %}
-
-  {% if home_all or 'Z' in params %}
-    BED_MESH_CLEAR  
-    MOVE_UP
-  {% endif %}
-  
-  {% if home_all or 'X' in params %}
-    _HOME_X
-  {% endif %}
-  
-  {% if home_all or 'Y' in params %}
-    _HOME_Y
-  {% endif %}
-  
-
-  G90
-  
-  {% if home_all or 'Z' in params %}
-    G1 X{printer.toolhead.axis_maximum.x/2} Y{printer.toolhead.axis_maximum.y/2} F12000 #probe point
-    G28 Z
-    G1 Z{move_z} F1200
-  {% endif %}
-
-  #{ action_respond_info("Move X,Y => {},{}".format(params.X,params.Y)) }
-
-  {% if params.X %}
-    
-    G1 X{move_x} F12000
-  {% endif %}
-
-  {% if params.Y %}
-    G1 Y{move_y} F12000
-  {% endif %}
-  
-  STATUS_OFF
-  SET_GCODE_VARIABLE MACRO=_KNOMI_STATUS VARIABLE=homing VALUE=False
-
-[gcode_macro CG28]
-gcode:
-    {% if "xyz" not in printer.toolhead.homed_axes %}
-        G28
-    {% endif %}
-
-[gcode_macro PARKFRONT]
-gcode:
-    CG28                              ; home if not already homed
-    SAVE_GCODE_STATE NAME=PARKFRONT
-    G90                               ; absolute positioning
-    G0 X{printer.toolhead.axis_maximum.x/2} Y{printer.toolhead.axis_minimum.y+5} Z{printer.toolhead.axis_maximum.z/2} F6000        
-    RESTORE_GCODE_STATE NAME=PARKFRONT
-
-[gcode_macro PARKFRONTLOW]
-gcode:
-    CG28                             ; home if not already homed
-    SAVE_GCODE_STATE NAME=PARKFRONT
-    G90                              ; absolute positioning
-    G0 X{printer.toolhead.axis_maximum.x/2} Y{printer.toolhead.axis_minimum.y+5} Z20 F6000                                     
-    RESTORE_GCODE_STATE NAME=PARKFRONT
-
-[gcode_macro PARKREAR]
-gcode:
-    CG28                             ; home if not already homed
-    SAVE_GCODE_STATE NAME=PARKREAR
-    G90                              ; absolute positioning
-    G0 X{printer.toolhead.axis_minimum.x+10} Y{printer.toolhead.axis_maximum.y-10} Z{printer.toolhead.axis_maximum.z-50} F6000     
-    RESTORE_GCODE_STATE NAME=PARKREAR
-
-[gcode_macro PARKCENTER]
-gcode:
-    CG28                              ; home if not already homed
-    SAVE_GCODE_STATE NAME=PARKCENTER
-    G90                               ; absolute positioning
-    G0 X{printer.toolhead.axis_maximum.x/2} Y{printer.toolhead.axis_maximum.y/2} Z{printer.toolhead.axis_maximum.z/2} F6000    
-    RESTORE_GCODE_STATE NAME=PARKCENTER
-
-[gcode_macro PARKBED]
-gcode:
-    CG28                               ; home if not already homed
-    SAVE_GCODE_STATE NAME=PARKBED
-    G90                                ; absolute positioning
-    G0 X{printer.toolhead.axis_maximum.x/2} Y{printer.toolhead.axis_maximum.y/2} Z15 F6000                                     
-    RESTORE_GCODE_STATE NAME=PARKBED
-
--- a/macros/main.cfg
+++ b/macros/main.cfg
@@ -16,6 +16,7 @@ gcode:
 [include ../KAMP_Settings.cfg]
 #[include ../KAMP/KAMP_Settings.cfg]
 [include tools.cfg]
+[include nevermore.cfg]



@@ -155,6 +156,9 @@ gcode:
    #M190 S{BED_TEMP}    
    M109 S{EXTRUDER_TEMP}               ; M109 heat and wait for it to reach temp
    SFS_ENABLE
+    {% if BED_TEMP > 100 %}
+      _NEVERMORE_ON
+    {% endif %}
    M117   
    STATUS_CLEANING
    VORON_PURGE
@@ -173,7 +177,7 @@ variable_park_xy: [350,350]
 variable_up_z: 4 #12
 gcode:
    {% set max_velocity = printer.configfile.settings['extruder'].max_extrude_only_velocity  * 60 %}
-    STATUS_BUSY
+    STATUS_BUSY    
    SET_SKEW CLEAR=1
    M400                           ; wait for buffer to clear
    G92 E0                         ; zero the extruder
@@ -186,7 +190,8 @@ gcode:
    G90                            ; absolute positioning
    G0 X{park_xy[0]} Y{park_xy[1]} F{park_speed}            ; park nozzle at rear
    #BED_MESH_CLEAR
-    SFS_DISABLE    
+    SFS_DISABLE
+    _NEVERMORE_OFF
    #M141 S35
    SET_STEPPER_ENABLE STEPPER=extruder ENABLE=0 #disable stepper
    STATUS_OFF    
@@ -207,13 +212,13 @@ gcode:
 [gcode_macro M141]
 gcode:
    {% set s = params.S|default(0)|float %}
-    SET_TEMPERATURE_FAN_TARGET temperature_fan=chamber target={s}
+    #SET_TEMPERATURE_FAN_TARGET temperature_fan=chamber target={s}

 [gcode_macro M191]
 gcode:
    {% set s = params.S|default(0)|float %}
    M141 S{s}
-    TEMPERATURE_WAIT SENSOR="temperature_fan chamber" MINIMUM={s}  
+    #TEMPERATURE_WAIT SENSOR="temperature_fan chamber" MINIMUM={s}  



@@ -222,6 +227,24 @@ gcode:
    #LCDRGB R=0 G=1 B=0  ; Turn LCD green
    PAUSE                ; Pause

+#[gcode_macro M106] 
+#rename_existing: M99106
+#variable_fan_aliases: { 'exhaust_fan': ['fan3'] }
+#gcode:
+    #{% set fan = 'fan' + (params.P|int if params.P is defined else 0)|string %}
+    #{% set speed = (params.S|float / 255 if params.S is defined else 1.0) %}
+    #{ action_respond_info("M106 P{} S{}".format(params.P, params.S)) }
+    #{% if params.P is defined  %}
+      #{% for key in fan_aliases %}
+        #{% if fan in fan_aliases[key] %}
+          #SET_FAN_SPEED FAN={key} SPEED={speed}            
+        #{% endif %}
+      #{% endfor %}  
+    #{% else %}
+      #M99106 S{speed}
+    #{% endif %}    
+    
+
 [gcode_macro PAUSE]
 rename_existing: BASE_PAUSE
 gcode:
@@ -333,7 +356,7 @@ gcode:

 [gcode_macro INIT_BED_TYPE]
 variable_bed_z_offset: 0
-variable_bed_types: { 'Textured PEI Plate': 0.00, 'None': 0 }
+variable_bed_types: { 'Textured PEI Plate': -0.03, 'None': 0 }
 gcode:
    {% set bed_type = params.BED_TYPE|default("None") %}    
    {% set new_bed_z_offset = bed_types[bed_type] %}
@@ -359,6 +382,7 @@ gcode:
    SAVE_GCODE_STATE NAME=load_state
    G91
    G92 E0
+    G1 E{16} F300 # fast-load
    G1 E{load_distance} F{max_velocity} # fast-load
    G1 E{purge_distance} F{speed} # purge
    RESTORE_GCODE_STATE NAME=load_state
--- a/macros/nevermore.cfg
+++ b/macros/nevermore.cfg
@@ -9,30 +9,6 @@
 ## (or less fan depending on your needs, like SPEED=0.8)
 ## in your end print code, add "UPDATE_DELAYED_GCODE ID=filter_off DURATION=180"
 ## this keeps your Nevermore running for 180s after the print finishes to clean the chamber a bit more.
-
-[fan_generic Nevermore]
-## Nevermore - FAN5 on Octopus
-## Adjust if you use a different board or a different terminal.
-pin: PD15
-
-[menu __main __control __nevermoreonoff]
-type: command
-name: Nevermore {'ON' if printer['fan_generic Nevermore'].speed > 0 else 'OFF'}
-enable: {'fan_generic Nevermore' in printer}
-gcode:
-    TOGGLE_NEVERMORE
-
-[menu __main __control __filterspeed]
-type: input
-enable: {'fan_generic Nevermore' in printer}
-name: Filter %: {'%3d' % (menu.input*100)}%
-input: {printer["fan_generic Nevermore"].speed}
-input_min: 0
-input_max: 1
-input_step: 0.1
-gcode:
-    SET_FAN_SPEED FAN=Nevermore SPEED={menu.input}
-
 [delayed_gcode filter_off]
 gcode:
    SET_FAN_SPEED FAN=Nevermore SPEED=0
@@ -44,3 +20,11 @@ gcode:
    {% else %}
      SET_FAN_SPEED FAN=Nevermore SPEED=1
    {% endif %}
+
+[gcode_macro _NEVERMORE_ON]
+gcode:
+    SET_FAN_SPEED FAN=Nevermore SPEED=1
+
+[gcode_macro _NEVERMORE_OFF]
+gcode:
+    SET_FAN_SPEED FAN=Nevermore SPEED=0
--- a/octopus_pro_1.1.cfg
+++ b/octopus_pro_1.1.cfg
@@ -4,6 +4,10 @@ canbus_uuid: afcf80281237
 [temperature_sensor OctopusPro]
 sensor_type: temperature_mcu

+[temperature_sensor Chamber]
+sensor_type: ATC Semitec 104NT-4-R025H42G
+sensor_pin: PF4
+
 [output_pin ps_on]
 pin: PE11
 value: 1
@@ -155,30 +159,50 @@ stepper: stepper_x, stepper_y
 idle_speed: 0
 fan_speed: 0.6

-[heater_fan Nevermore]
+#[heater_fan Nevermore]
+#pin: PE5
+#heater_temp: 90
+#max_power: 1.0
+#kick_start_time: 0.5
+#heater: heater_bed
+#fan_speed: 1
+
+[fan_generic Nevermore]
+## Nevermore - FAN5 on Octopus
+## Adjust if you use a different board or a different terminal.
 pin: PE5
-heater_temp: 90
-max_power: 1.0
-kick_start_time: 0.5
-heater: heater_bed
-fan_speed: 1

-[temperature_fan chamber]
+[fan] #CPAP
+pin: PD15
+max_power: 0.8 
+shutdown_speed: 0 
+cycle_time: 0.005 
+hardware_pwm: False 
+kick_start_time: 0.100 
+off_below: 0.03
+
+#[temperature_fan chamber]
+#pin: PD14
+#max_power: 1.0
+#shutdown_speed: 0.0
+#kick_start_time: 5.0
+#cycle_time:0.01
+#off_below:0.1
+#hardware_pwm: True
+#sensor_type: ATC Semitec 104NT-4-R025H42G
+#sensor_pin: PF4
+#min_temp: 0
+#max_temp: 70
+#target_temp: 40
+#control: watermark
+#gcode_id: C
+
+# this is the exhaust fan
+# comment out it if you don't have exhaust fan
+[fan_generic exhaust_fan]
 pin: PD14
-max_power: 1.0
-shutdown_speed: 0.0
-kick_start_time: 5.0
-cycle_time:0.01
-off_below:0.1
-hardware_pwm: True
-sensor_type: ATC Semitec 104NT-4-R025H42G
-sensor_pin: PF4
-min_temp: 0
-max_temp: 70
-target_temp: 40
-control: watermark
-gcode_id: C
-
+cycle_time: 0.01
+hardware_pwm: false

 [multi_pin soc_pin]
 pins: PD12, PD13
--- a/printer.cfg
+++ b/printer.cfg
@@ -1,7 +1,7 @@

 [include mainsail.cfg]
 [include timelapse.cfg]
-#[include hbb.cfg]
+[include hbb.cfg]

 [mcu host]
 serial: /tmp/klipper_host_mcu
@@ -202,26 +202,27 @@ algorithm: bicubic
 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
 #*#
 #*# [skew_correction default]
-#*# xy_skew = -0.002120454472795053
+#*# xy_skew = -0.0028242858197175757
 #*# xz_skew = 0.0
 #*# yz_skew = 0.0
 #*#
 #*# [bed_mesh default]
 #*# version = 1
 #*# points =
-#*# 	-0.006875, -0.011875, -0.006875
-#*# 	0.012812, 0.002812, -0.003438
-#*# 	0.023125, 0.008750, 0.015937
-#*# x_count = 3
-#*# y_count = 3
+#*# 	  0.030000, -0.002813, -0.000000, 0.052812
+#*# 	  0.031562, 0.004375, 0.020000, 0.061875
+#*# 	  0.033125, -0.002188, 0.000625, 0.059687
+#*# 	  0.038750, 0.025625, 0.032500, 0.070937
+#*# x_count = 4
+#*# y_count = 4
 #*# mesh_x_pps = 2
 #*# mesh_y_pps = 2
 #*# algo = lagrange
 #*# tension = 0.2
-#*# min_x = 154.289
-#*# max_x = 195.529
-#*# min_y = 154.83499999999998
-#*# max_y = 195.33499999999998
+#*# min_x = 82.47999999999999
+#*# max_x = 267.46
+#*# min_y = 76.6553
+#*# max_y = 272.82529999999997
 #*#
 #*# [probe]
-#*# z_offset = -0.820
+#*# z_offset = -0.870
--- a/toolhead_sb.cfg
+++ b/toolhead_sb.cfg
@@ -34,15 +34,24 @@ 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_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 

 [temperature_sensor SB2209]
 sensor_type: temperature_mcu
 sensor_mcu: EBBCan

+[temperature_sensor Ebb]
+sensor_type: Generic 3950
+sensor_pin: EBBCan:gpio28
+

 #####################################################################
 # 	Extruder
@@ -101,6 +110,43 @@ run_current: 0.65 #0.6
 [autotune_tmc extruder]
 motor: ldo-36sth20-1004ahg-9T

+
+
+[filament_switch_sensor G2E]
+pause_on_runout: True
+#   When set to True, a PAUSE will execute immediately after a runout
+#   is detected. Note that if pause_on_runout is False and the
+#   runout_gcode is omitted then runout detection is disabled. Default
+#   is True.
+runout_gcode:
+#   A list of G-Code commands to execute after a filament runout is
+#   detected. See docs/Command_Templates.md for G-Code format. If
+#   pause_on_runout is set to True this G-Code will run after the
+#   PAUSE is complete. The default is not to run any G-Code commands.
+  UNLOAD_FILAMENT
+insert_gcode:
+#   A list of G-Code commands to execute after a filament insert is
+#   detected. See docs/Command_Templates.md for G-Code format. The
+#   default is not to run any G-Code commands, which disables insert
+#   detection.
+  LOAD_FILAMENT
+#event_delay: 3.0
+#   The minimum amount of time in seconds to delay between events.
+#   Events triggered during this time period will be silently
+#   ignored. The default is 3 seconds.
+#pause_delay: 0.5
+#   The amount of time to delay, in seconds, between the pause command
+#   dispatch and execution of the runout_gcode. It may be useful to
+#   increase this delay if OctoPrint exhibits strange pause behavior.
+#   Default is 0.5 seconds.
+#debounce_delay: 1
+#   A period of time in seconds to debounce events prior to running the
+#   switch gcode. The switch must he held in a single state for at least
+#   this long to activate. If the switch is toggled on/off during this delay,
+#   the event is ignored. Default is 0.
+switch_pin: ^!EBBCan:gpio22
+
+
 #####################################################################
 # 	Probe
 #####################################################################
@@ -113,19 +159,20 @@ pin: ^!EBBCan:gpio24
 #####################################################################

 [fan]
-hardware_pwm: True
-off_below: 0.05
+#hardware_pwm: False
+#pin: EBBCan:gpio13 #gpio15 
+#off_below: 0.05
+#cycle_time: 0.00008
+
 # Время (в секундах), необходимое для запуска вентилятора на полной скорости при первом включении 
 # или увеличении ее более чем на 50% (помогает запустить вентилятор). Значение по умолчанию равно 0,100 секунды.
-#kick_start_time: 0.200
-#kick_start_time: 0.5 
+#kick_start_time: 0.150
 # Время (в секундах), затрачиваемое на каждый цикл подачи питания на вентилятор с помощью ШИМ. 
 # Рекомендуется, чтобы это значение составляло 10 миллисекунд или более при использовании программного управления ШИМ. 
 # Значение по умолчанию равно 0,010 секунды.
 #cycle_time: 0.01
-pin: EBBCan:gpio15
-tachometer_pin: EBBCan:gpio12
-tachometer_poll_interval: 0.0005 #0.0005
+#tachometer_pin: EBBCan:gpio12
+#tachometer_poll_interval: 0.0005 #0.0005
 #tachometer_ppr: 1

 [heater_fan hotend_fan]
@@ -137,20 +184,16 @@ heater: extruder
 ##	If you are experiencing back flow, you can reduce fan_speed
 #fan_speed: 1.0

-[temperature_fan EbbFan]
-pin: EBBCan:gpio6
-max_power: 1.0
-shutdown_speed: 0.0
-#kick_start_time: 5.0
-#cycle_time:0.01
-#off_below:0.1
-sensor_type: Generic 3950
-sensor_pin: EBBCan:gpio28
-min_temp: 0
-max_temp: 100
-target_temp: 60.0
-control: watermark
-#gcode_id: C
+#[temperature_fan EbbFan]
+#pin: EBBCan:gpio6
+#max_power: 1.0
+#shutdown_speed: 0.0
+#sensor_type: Generic 3950
+#sensor_pin: EBBCan:gpio28
+#min_temp: 0
+#max_temp: 100
+#target_temp: 60.0
+#control: watermark


 #####################################################################
Author	SHA1	Message	Date
Mikhail Shahovalov	342a4640c0	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	2025-05-17 13:11:17 +03:00
Mikhail Shahovalov	2e41cfb036	Autocommit from 2025-05-17 13:10:21 Klipper version: v0.13.0-114-g841a9ca2 Moonraker version: v0.9.3-74-g1c12414 Mainsail version: v2.14.0	2025-05-17 13:10:21 +03:00
mikhail	7bdc831c64	Autocommit from 2025-05-17 06:54:36 Klipper version: v0.13.0-0-g61c0c8d2e Moonraker version: v0.9.3-3-gccfe32f Mainsail version: v2.14.0	2025-05-17 06:54:36 +03:00
mikhail	8e45c646f1	Autocommit from 2025-05-12 07:48:07 Klipper version: v0.13.0-0-g61c0c8d2e Moonraker version: v0.9.3-3-gccfe32f Mainsail version: v2.13.2	2025-05-12 07:48:07 +03:00
mikhail	bfc580ced7	Autocommit from 2025-04-27 09:53:57 Klipper version: v0.12.0-382-ga18c74be0 Moonraker version: v0.9.3-3-gccfe32f Mainsail version: v2.13.2	2025-04-27 09:53:57 +03:00
mikhail	56ec65bdb7	Autocommit from 2025-04-03 03:23:59 Klipper version: v0.12.0-382-ga18c74be0 Moonraker version: v0.9.3-3-gccfe32f Mainsail version: v2.13.2	2025-04-03 03:23:59 +03:00
mikhail	729965dbcd	Autocommit from 2025-03-29 08:17:20 Klipper version: v0.12.0-382-ga18c74be0 Moonraker version: v0.9.3-3-gccfe32f Mainsail version: v2.13.2	2025-03-29 08:17:20 +03:00
mikhail	e540d474f1	Autocommit from 2025-03-28 17:22:49 Klipper version: v0.12.0-382-ga18c74be0 Moonraker version: v0.9.3-3-gccfe32f Mainsail version: v2.13.2	2025-03-28 17:22:49 +03:00
mikhail	bf96f740ab	Autocommit from 2025-03-26 19:42:52 Klipper version: v0.12.0-382-ga18c74be0 Moonraker version: v0.9.3-3-gccfe32f Mainsail version: v2.13.2	2025-03-26 19:42:52 +03:00
mikhail	dcce6b7bef	Autocommit from 2025-03-23 14:42:44 Klipper version: v0.12.0-382-ga18c74be0 Moonraker version: v0.9.3-3-gccfe32f Mainsail version: v2.13.2	2025-03-23 14:42:44 +03:00
mikhail	9f20d5f8d6	Autocommit from 2025-03-19 13:48:20 Klipper version: v0.12.0-382-ga18c74be0 Moonraker version: v0.9.3-3-gccfe32f Mainsail version: v2.13.2	2025-03-19 13:48:20 +03:00