From 03bda9c56cb64ea372ebae6f267142f84924f268 Mon Sep 17 00:00:00 2001 From: Mikhail Shahovalov Date: Mon, 18 Aug 2025 08:29:51 +0300 Subject: [PATCH] Autocommit from 2025-08-18 08:29:51 Klipper version: v0.13.0-154-g9346ad19 Moonraker version: v0.9.3-77-gccbfd64 Mainsail version: v2.14.0 --- config-20250807-195608.zip | Bin 0 -> 5722 bytes firmware/boot_rp_sb2209.can | 54 ++++++++++++++++++++ firmware/boot_rp_sb2209.can.old | 53 ++++++++++++++++++++ firmware/ebb_rp2240.CAN | 86 ++++++++++++++++++++++++++++++++ firmware/ebb_rp2240.CAN.old | 69 +++++++++++++++++++++++++ firmware/update_fw.sh | 4 +- macros/main.cfg | 60 ++++++++-------------- mmu/base/mmu_hardware.cfg | 30 +++++------ mmu/base/mmu_macro_vars.cfg | 2 +- mmu/base/mmu_parameters.cfg | 18 ++++--- mmu/mmu_vars.cfg | 38 +++++++------- octopus_pro_1.1.cfg | 10 ++-- printer.cfg | 22 ++++---- toolhead_sb.cfg | 29 +++++------ 14 files changed, 361 insertions(+), 114 deletions(-) create mode 100644 config-20250807-195608.zip create mode 100644 firmware/boot_rp_sb2209.can create mode 100644 firmware/boot_rp_sb2209.can.old create mode 100644 firmware/ebb_rp2240.CAN create mode 100644 firmware/ebb_rp2240.CAN.old diff --git a/config-20250807-195608.zip b/config-20250807-195608.zip new file mode 100644 index 0000000000000000000000000000000000000000..6842ce8e6e409e25a33356d3da3492058928a812 GIT binary patch literal 5722 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 G!2baF^y2ye literal 0 HcmV?d00001 diff --git a/firmware/boot_rp_sb2209.can b/firmware/boot_rp_sb2209.can new file mode 100644 index 0000000..51393be --- /dev/null +++ b/firmware/boot_rp_sb2209.can @@ -0,0 +1,54 @@ +CONFIG_LOW_LEVEL_OPTIONS=y +# CONFIG_MACH_LPC176X is not set +# CONFIG_MACH_STM32 is not set +CONFIG_MACH_RPXXXX=y +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_FLASH_START=0x10000000 +CONFIG_LAUNCH_APP_ADDRESS=0x10004000 +CONFIG_BLOCK_SIZE=64 +CONFIG_RPXXXX_SELECT=y +CONFIG_MACH_RP2040=y +# CONFIG_MACH_RP2350 is not set +CONFIG_RP2040_HAVE_STAGE2=y +# CONFIG_RP2040_FLASH_W25Q080 is not set +CONFIG_RP2040_FLASH_GENERIC_03=y +CONFIG_RP2040_STAGE2_FILE="boot2_generic_03h.S" +CONFIG_RP2040_STAGE2_CLKDIV=4 +# CONFIG_RPXXXX_FLASH_START_0100 is not set +CONFIG_RPXXXX_FLASH_START_4000=y +# 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=0x6177 +CONFIG_USB_SERIAL_NUMBER="12345" +CONFIG_CANSERIAL=y +CONFIG_CANBUS=y +CONFIG_CANBUS_FREQUENCY=1000000 +CONFIG_CANBUS_FILTER=y +CONFIG_INITIAL_PINS="" +CONFIG_ENABLE_DOUBLE_RESET=y +# CONFIG_ENABLE_BUTTON is not set +CONFIG_ENABLE_LED=y +CONFIG_STATUS_LED_PIN="gpio26" +CONFIG_BUILD_DEPLOYER=y +CONFIG_HAVE_CHIPID=y +CONFIG_KATAPULT_VERSION="v0.0.1-96-gbc1ecea" diff --git a/firmware/boot_rp_sb2209.can.old b/firmware/boot_rp_sb2209.can.old new file mode 100644 index 0000000..c9b123f --- /dev/null +++ b/firmware/boot_rp_sb2209.can.old @@ -0,0 +1,53 @@ +CONFIG_LOW_LEVEL_OPTIONS=y +# CONFIG_MACH_LPC176X is not set +# CONFIG_MACH_STM32 is not set +CONFIG_MACH_RPXXXX=y +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=0x10000100 +CONFIG_FLASH_START=0x10000000 +CONFIG_LAUNCH_APP_ADDRESS=0x10004000 +CONFIG_BLOCK_SIZE=64 +CONFIG_RPXXXX_SELECT=y +CONFIG_MACH_RP2040=y +# CONFIG_MACH_RP2350 is not set +CONFIG_RP2040_HAVE_STAGE2=y +# CONFIG_RP2040_FLASH_W25Q080 is not set +CONFIG_RP2040_FLASH_GENERIC_03=y +CONFIG_RP2040_STAGE2_FILE="boot2_generic_03h.S" +CONFIG_RP2040_STAGE2_CLKDIV=4 +CONFIG_RPXXXX_FLASH_START_0100=y +# CONFIG_RPXXXX_FLASH_START_4000 is not set +# 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=0x6177 +CONFIG_USB_SERIAL_NUMBER="12345" +CONFIG_CANSERIAL=y +CONFIG_CANBUS=y +CONFIG_CANBUS_FREQUENCY=1000000 +CONFIG_CANBUS_FILTER=y +CONFIG_INITIAL_PINS="" +CONFIG_ENABLE_DOUBLE_RESET=y +# CONFIG_ENABLE_BUTTON is not set +CONFIG_ENABLE_LED=y +CONFIG_STATUS_LED_PIN="gpio26" +CONFIG_HAVE_CHIPID=y +CONFIG_KATAPULT_VERSION="v0.0.1-96-gbc1ecea" diff --git a/firmware/ebb_rp2240.CAN b/firmware/ebb_rp2240.CAN new file mode 100644 index 0000000..448b041 --- /dev/null +++ b/firmware/ebb_rp2240.CAN @@ -0,0 +1,86 @@ +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_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_WANT_LOAD_CELL_PROBE=y +CONFIG_NEED_SOS_FILTER=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="" +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 +CONFIG_HAVE_SOFTWARE_DIVIDE_REQUIRED=y diff --git a/firmware/ebb_rp2240.CAN.old b/firmware/ebb_rp2240.CAN.old new file mode 100644 index 0000000..8d7a267 --- /dev/null +++ b/firmware/ebb_rp2240.CAN.old @@ -0,0 +1,69 @@ +# 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_WANT_LOAD_CELL_PROBE=y +CONFIG_NEED_SOS_FILTER=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 diff --git a/firmware/update_fw.sh b/firmware/update_fw.sh index cf4e3f1..96c8437 100755 --- a/firmware/update_fw.sh +++ b/firmware/update_fw.sh @@ -11,8 +11,8 @@ #rp_sb2209=350f10596216 #sht36_v2=8ce295109ef0 -toolhead_name=rp_sb2209 -toolhead_uuid=350f10596216 +toolhead_name=ebb_rp2240 +toolhead_uuid=d7e70bd38059 mcu_uuid=afcf80281237 mcu_path=/dev/serial/by-id/usb-katapult_stm32h723xx_320006001751313431393536-if00 config_path=/home/biqu/printer_data/config/firmware/ diff --git a/macros/main.cfg b/macros/main.cfg index e598fc2..66ed458 100644 --- a/macros/main.cfg +++ b/macros/main.cfg @@ -26,7 +26,6 @@ initial_duration: 1 gcode: STATUS_READY SET_FAN_SPEED FAN=SoC SPEED=0.3 - #SET_FILAMENT_SENSOR SENSOR=SFS_T0 ENABLE=0 [delayed_gcode _INIT_TIMELAPSE_CHECK_TIME] initial_duration: 1 @@ -106,21 +105,7 @@ gcode: G28 Z G0 Z10 F3600 STATUS_READY - M117 - -[gcode_macro SFS_ENABLE] -description: Enable smart filament sensor -gcode: - M117 ENABLING the Smart Filament Sensor - G92 E0 - #SET_FILAMENT_SENSOR SENSOR=SFS_T0 ENABLE=1 - -[gcode_macro SFS_DISABLE] -description: Disable smart filament sensor -gcode: - M117 DISABLING the Smart Filament Sensor - G92 E0 - #SET_FILAMENT_SENSOR SENSOR=SFS_T0 ENABLE=0 + M117 [gcode_macro PRINT_START] gcode: @@ -129,7 +114,7 @@ gcode: {% set BED_TEMP = params.BED|default(60)|float %} {% set EXTRUDER_TEMP = params.EXTRUDER|default(210)|float %} {% set CHAMBER = params.CHAMBER|default(35)|float %} - {% set USE_PURGE = params.PURGE|default(0)|int %} + {% set use_purge = params.PURGE|default(0)|int %} {% if params.BED_TYPE %} INIT_BED_TYPE BED_TYPE="{params.BED_TYPE}" {% endif %} @@ -155,14 +140,13 @@ gcode: Smart_Park M117 Heating... #M190 S{BED_TEMP} - M109 S{EXTRUDER_TEMP} ; M109 heat and wait for it to reach temp - SFS_ENABLE + M109 S{EXTRUDER_TEMP} ; M109 heat and wait for it to reach temp {% if BED_TEMP > 100 %} _NEVERMORE_ON {% endif %} M117 STATUS_CLEANING - {% if USE_PURGE == true %} + {% if use_purge %} VORON_PURGE {% endif %} STATUS_PRINTING @@ -173,8 +157,22 @@ gcode: [gcode_macro PRINT_END] -# Use PRINT_END for the slicer ending script - please customise for your slicer of choice -variable_retract_amount: 16 # +gcode: + {% set use_park = params.PARK|default(1)|int %} + {% if use_park %} + PRINT_END_PARK + {% endif %} + TURN_OFF_HEATERS + M107 ; turn off fan + _NEVERMORE_OFF + SET_STEPPER_ENABLE STEPPER=extruder ENABLE=0 #disable stepper + STATUS_OFF + INIT_BED_TYPE BED_TYPE="None" + M400 + TIMELAPSE_TAKE_FRAME + +[gcode_macro PRINT_END_PARK] +variable_retract_amount: 18 # variable_park_speed: 6000 #3600 variable_park_xy: [350,350] variable_up_z: 4 #12 @@ -184,24 +182,13 @@ gcode: SET_SKEW CLEAR=1 M400 ; wait for buffer to clear G92 E0 ; zero the extruder - G1 E-{retract_amount} F3600 ; retract filament {max_velocity} + G1 E-{retract_amount} F{max_velocity} ;3600 ; retract filament {max_velocity} G91 ; relative positioning G0 Z1.00 X20.0 Y20.0 F20000 ; move nozzle to remove stringing - TURN_OFF_HEATERS - M107 ; turn off fan G1 Z{up_z} F3000 ; move nozzle up 2mm G90 ; absolute positioning G0 X{park_xy[0]} Y{park_xy[1]} F{park_speed} ; park nozzle at rear - #BED_MESH_CLEAR - SFS_DISABLE - _NEVERMORE_OFF - #M141 S35 - SET_STEPPER_ENABLE STEPPER=extruder ENABLE=0 #disable stepper - STATUS_OFF SET_VELOCITY_DEFAULT - INIT_BED_TYPE BED_TYPE="None" - M400 - TIMELAPSE_TAKE_FRAME @@ -256,9 +243,7 @@ gcode: {% if printer['pause_resume'].is_paused|int == 0 %} SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=zhop VALUE={z} ; set z hop variable for reference in resume macro - SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=etemp VALUE={printer['extruder'].target} ; set hotend temp variable for reference in resume macro - - SFS_DISABLE ; disable filament sensor + SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=etemp VALUE={printer['extruder'].target} ; set hotend temp variable for reference in resume macro SAVE_GCODE_STATE NAME=PAUSE ; save current print position for resume BASE_PAUSE ; pause print {% if (printer.gcode_move.position.z + z) < printer.toolhead.axis_maximum.z %} ; check that zhop doesn't exceed z max @@ -284,7 +269,6 @@ gcode: {% set e = params.E|default(2.5)|int %} {% if printer['pause_resume'].is_paused|int == 1 %} - SFS_ENABLE ; enable filament sensor #RESETRGB ; reset LCD color SET_IDLE_TIMEOUT TIMEOUT={printer.configfile.settings.idle_timeout.timeout} ; set timeout back to configured value {% if etemp > 0 %} diff --git a/mmu/base/mmu_hardware.cfg b/mmu/base/mmu_hardware.cfg index f307622..b254300 100644 --- a/mmu/base/mmu_hardware.cfg +++ b/mmu/base/mmu_hardware.cfg @@ -119,8 +119,8 @@ homing_extruder: 1 # CAUTION: Normally this should be 1. 0 will disable the ho uart_pin: mmu:MMU_GEAR_UART run_current: 1 # hold_current: 0.4 # Recommend to be small if not using "touch" or move (TMC stallguard) -interpolate: True -#sense_resistor: 0.110 # Usually 0.11, 0.15 for BTT TMC2226 +interpolate: False +sense_resistor: 0.110 # Usually 0.11, 0.15 for BTT TMC2226 stealthchop_threshold: 0 # Spreadcycle has more torque and better at speed # # Uncomment two lines below if you have TMC and want the ability to use filament "touch" homing with gear stepper @@ -128,16 +128,16 @@ stealthchop_threshold: 0 # Spreadcycle has more torque and better at speed #driver_SGTHRS: 60 # 255 is most sensitive value, 0 is least sensitive -#[motor_constants 17he12-1204s] -#resistance: 2.5 -#inductance: 0.0033 -#holding_torque: 0.26 -#max_current: 1.20 -#steps_per_revolution: 200 +[motor_constants 17he12-1204s] +resistance: 2.5 +inductance: 0.0033 +holding_torque: 0.26 +max_current: 1.20 +steps_per_revolution: 200 -#[autotune_tmc stepper_mmu_gear] -#motor: 17he12-1204s -#tuning_goal: performance +[autotune_tmc stepper_mmu_gear] +motor: 17he12-1204s +tuning_goal: performance @@ -281,8 +281,8 @@ sync_feedback_tension_pin: sync_feedback_compression_pin: # These sensors are on the toolhead and often controlled by the main printer mcu -extruder_switch_pin: ^!EBBCan:gpio22 -toolhead_switch_pin: +extruder_switch_pin: ^EBBCan:gpio24 +toolhead_switch_pin: ^EBBCan:gpio22 # ENCODER ------------------------------------------------------------------------------------------------------------- @@ -406,8 +406,8 @@ color_order: GRB # Set based on your particular neopixel specification (can be # # (comment out this whole section if you don't have/want leds; uncomment/edit LEDs fitted on your MMU) [mmu_leds] -exit_leds: neopixel:mmu_leds (8-1) -entry_leds: neopixel:mmu_leds (9-16) +exit_leds: neopixel:mmu_leds (9-16) +entry_leds: neopixel:mmu_leds (8-1) #status_leds: neopixel:mmu_leds (17) #logo_leds: neopixel:mmu_leds (18) frame_rate: 24 diff --git a/mmu/base/mmu_macro_vars.cfg b/mmu/base/mmu_macro_vars.cfg index ba02182..26cd830 100644 --- a/mmu/base/mmu_macro_vars.cfg +++ b/mmu/base/mmu_macro_vars.cfg @@ -86,7 +86,7 @@ variable_load_initial_tool : True ; True/False, Whether to auto variable_automap_strategy : "none" ; none|filament_name|material|color|closest_color|spool_id # These variables control the behavior of the MMU_END macro -variable_user_print_end_extension : '' ; Executed at start of MMU_END. Good place to move off print +variable_user_print_end_extension : 'PRINT_END_PARK' ; Executed at start of MMU_END. Good place to move off print variable_unload_tool : True ; True/False, Whether to unload the tool at the end of the print variable_reset_ttg : False ; True/False, Whether reset TTG map at end of print variable_dump_stats : True ; True/False, Whether to display print stats at end of print diff --git a/mmu/base/mmu_parameters.cfg b/mmu/base/mmu_parameters.cfg index c50332f..a65bd13 100644 --- a/mmu/base/mmu_parameters.cfg +++ b/mmu/base/mmu_parameters.cfg @@ -30,7 +30,7 @@ happy_hare_version: 3.2 # Don't mess, used for upgrade detection # # Define the physical limits of your MMU. These settings will be respected regardless of individual speed settings. # -gear_max_velocity: 300 # Never to be exceeded gear velocity regardless of specific parameters +gear_max_velocity: 125 #300 # Never to be exceeded gear velocity regardless of specific parameters gear_max_accel: 1500 # Never to be exceeded gear acceleration regardless of specific parameters selector_max_velocity: 250 # Never to be exceeded selector velocity regardless of specific parameters selector_max_accel: 1200 # Never to be exceeded selector acceleration regardless of specific parameters @@ -184,7 +184,7 @@ gate_final_eject_distance: 0 # Distance to eject filament on MMU_EJECT (Ignored # reading and make correction moves to bring the filament to within the 'bowden_allowable_load_delta' of the end of # bowden position (this does require a reliable encoder and is not recommended for very high speed loading >350mm/s) # -bowden_apply_correction: 0 # 1 to enable, 0 disabled. Requires Encoder +bowden_apply_correction: 1 # 1 to enable, 0 disabled. Requires Encoder bowden_allowable_load_delta: 20.0 # How close in mm the correction moves will attempt to get to target. Requires Encoder # This test verifies the filament is free of extruder before the fast bowden movement to reduce possibility of grinding filament @@ -269,15 +269,19 @@ toolhead_homing_max: 40 # Maximum distance to advance in order to attempt to h # NOTE: If you have a toolhead sensor you can automate the calculation of these parameters! Read about the # `MMU_CALIBRATE_TOOLHEAD` command (https://github.com/moggieuk/Happy-Hare/wiki/Blobbing-and-Stringing#---calibrating-toolhead) # -toolhead_extruder_to_nozzle: 99.38 # Distance from extruder gears (entrance) to nozzle -toolhead_sensor_to_nozzle: 79.78 # Distance from toolhead sensor to nozzle (ignored if not fitted) -toolhead_entry_to_extruder: 13.29 # Distance from extruder "entry" sensor to extruder gears (ignored if not fitted) +#toolhead_extruder_to_nozzle: 99.38 # Distance from extruder gears (entrance) to nozzle +#toolhead_sensor_to_nozzle: 79.78 # Distance from toolhead sensor to nozzle (ignored if not fitted) +#toolhead_entry_to_extruder: 13.29 # Distance from extruder "entry" sensor to extruder gears (ignored if not fitted) + +toolhead_extruder_to_nozzle: 101.3 # (currently: 100.9) +toolhead_sensor_to_nozzle: 88.2 #(currently: 87.4) +toolhead_entry_to_extruder: 19.1 #(currently: 18.7) # This setting represents how much residual filament is left behind in the nozzle when filament is removed, it is thus # used to reduce the extruder loading length and prevent excessive blobbing but also in the calculation of purge volume. # Note that this value can also be measured with the `MMU_CALIBRATE_TOOLHEAD` procedure # -toolhead_residual_filament: 20 # Reduction in extruder loading length because of residual filament left behind +toolhead_residual_filament: 0 # Reduction in extruder loading length because of residual filament left behind # TUNING: Finally, this is the last resort tuning value to fix blobbing. It is expected that this value is NEAR ZERO as # it represents a further reduction in extruder load length to fix blobbing. If using a wipetower and you experience blobs @@ -552,7 +556,7 @@ extruder_temp_variance: 2 # When waiting for extruder temperature this is the +/ # rotation_distance (MMU_CALIBRATE_GATE) is tuned for other gates. # autotune_bowden_length: 0 # Automated bowden length calibration/tuning. 1=automatic, 0=manual/off -autotune_rotation_distance: 0 # Automated gate calibration/tuning (requires encoder). 1=automatic, 0=manual/off +autotune_rotation_distance: 1 # Automated gate calibration/tuning (requires encoder). 1=automatic, 0=manual/off # # Other workflow options # diff --git a/mmu/mmu_vars.cfg b/mmu/mmu_vars.cfg index 37d07aa..e5c6f2e 100644 --- a/mmu/mmu_vars.cfg +++ b/mmu/mmu_vars.cfg @@ -1,36 +1,36 @@ [Variables] -mmu__revision = 943 +mmu__revision = 2859 mmu_calibration_bowden_home = 'encoder' -mmu_calibration_bowden_lengths = [1785.0, 1785.0, 1785.0, 1785.0, 1785.0, 1785.0, 1785.0, 1785.0] -mmu_calibration_clog_length = 23.7 -mmu_encoder_resolution = 0.960769 -mmu_gear_rotation_distances = [22.845345, -1, 23.000827, -1, 23.065147, -1, -1, 22.924328] +mmu_calibration_bowden_lengths = [951.6, 951.6, 951.6, 951.6, 951.6, 951.6, 951.6, 951.6] +mmu_calibration_clog_length = 19.0 +mmu_encoder_resolution = 0.948992 +mmu_gear_rotation_distances = [22.845345, -1, 23.000827, -1, 23.065147, 22.682752, -1, 22.754847] mmu_selector_bypass = 179.2 mmu_selector_offsets = [4.0, 27.0, 49.9, 72.9, 95.9, 118.9, 141.8, 164.8] mmu_servo_angles = {'down': 145, 'up': 30, 'move': 50} mmu_state_enable_endless_spool = 0 -mmu_state_filament_pos = 10 +mmu_state_filament_pos = 0 mmu_state_filament_remaining = 0 mmu_state_filament_remaining_color = '' mmu_state_gate_color = ['green', 'grey', 'black', '', 'cyan', '', '', '3d3846'] mmu_state_gate_filament_name = ['', '', '', '', '', '', '', ''] mmu_state_gate_material = ['ABS', 'ABS', 'ABS', '', 'ABS', '', '', 'PETG'] -mmu_state_gate_selected = 7 +mmu_state_gate_selected = -1 mmu_state_gate_speed_override = [100, 100, 100, 100, 100, 100, 100, 100] mmu_state_gate_spool_id = [-1, -1, -1, -1, -1, -1, -1, -1] -mmu_state_gate_status = [1, 1, 1, 0, 1, 0, 0, 1] +mmu_state_gate_status = [0, 0, 0, 0, 0, 0, 2, 1] mmu_state_gate_temperature = [200, 200, 200, 200, 200, 200, 200, 200] -mmu_state_last_tool = 2 -mmu_state_tool_selected = 7 +mmu_state_last_tool = 5 +mmu_state_tool_selected = -1 mmu_state_tool_to_gate_map = [0, 1, 2, 3, 4, 5, 6, 7] -mmu_statistics_counters = {'servo_down': {'count': 228, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 37, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 0, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}} -mmu_statistics_gate_0 = {'pauses': 0, 'loads': 6, 'load_distance': 8546.739, 'load_delta': 2816.713, 'unloads': 8, 'unload_distance': 3470.0, 'unload_delta': -31.043, 'load_failures': 3, 'unload_failures': 2, 'quality': 0.8889759309441141} -mmu_statistics_gate_1 = {'pauses': 1, 'loads': 2, 'load_distance': 3363.716, 'load_delta': -30.681, 'unloads': 1, 'unload_distance': 1720.0, 'unload_delta': -15.149, 'load_failures': 1, 'unload_failures': 0, 'quality': 1.0071207044795385} -mmu_statistics_gate_2 = {'pauses': 0, 'loads': 4, 'load_distance': 6793.725, 'load_delta': 1828.471, 'unloads': 5, 'unload_distance': 1735.0, 'unload_delta': 2.733, 'load_failures': 2, 'unload_failures': 0, 'quality': 0.9016086335436964} +mmu_statistics_counters = {'servo_down': {'count': 599, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 93, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 0, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}} +mmu_statistics_gate_0 = {'pauses': 0, 'loads': 8, 'load_distance': 11954.651, 'load_delta': 4653.767, 'unloads': 11, 'unload_distance': 5205.0, 'unload_delta': 92.747, 'load_failures': 4, 'unload_failures': 2, 'quality': 0.8198260180834479} +mmu_statistics_gate_1 = {'pauses': 2, 'loads': 10, 'load_distance': 15191.968, 'load_delta': 770.824, 'unloads': 11, 'unload_distance': 1720.0, 'unload_delta': -15.149, 'load_failures': 2, 'unload_failures': 0, 'quality': 0.9676574716286735} +mmu_statistics_gate_2 = {'pauses': 2, 'loads': 12, 'load_distance': 20421.388, 'load_delta': 8152.369, 'unloads': 17, 'unload_distance': 12115.0, 'unload_delta': 3336.452, 'load_failures': 9, 'unload_failures': 0, 'quality': 0.9635278810027199} mmu_statistics_gate_3 = {'pauses': 0, 'loads': 0, 'load_distance': 0.0, 'load_delta': 0.0, 'unloads': 0, 'unload_distance': 0.0, 'unload_delta': 0.0, 'load_failures': 0, 'unload_failures': 0, 'quality': -1.0} -mmu_statistics_gate_4 = {'pauses': 0, 'loads': 1, 'load_distance': 1729.275, 'load_delta': 1.813, 'unloads': 2, 'unload_distance': 0.0, 'unload_delta': 0.0, 'load_failures': 0, 'unload_failures': 1, 'quality': 0.9989517366625948} -mmu_statistics_gate_5 = {'pauses': 0, 'loads': 0, 'load_distance': 0.0, 'load_delta': 0.0, 'unloads': 0, 'unload_distance': 0.0, 'unload_delta': 0.0, 'load_failures': 0, 'unload_failures': 0, 'quality': -1.0} -mmu_statistics_gate_6 = {'pauses': 0, 'loads': 0, 'load_distance': 0.0, 'load_delta': 0.0, 'unloads': 0, 'unload_distance': 0.0, 'unload_delta': 0.0, 'load_failures': 0, 'unload_failures': 0, 'quality': -1.0} -mmu_statistics_gate_7 = {'pauses': 2, 'loads': 1, 'load_distance': 1697.711, 'load_delta': 132.618, 'unloads': 0, 'unload_distance': 0.0, 'unload_delta': 0.0, 'load_failures': 0, 'unload_failures': 0, 'quality': 0.921884173980515} -mmu_statistics_swaps = {'pre_load': 4.24, 'purge': 6.41, 'post_load': 8.48, 'load': 500.05, 'pre_unload': 4.85, 'form_tip': 134.27, 'unload': 665.18, 'post_unload': 3.93, 'total': 520.23, 'total_swaps': 7, 'swaps_since_pause': 1, 'swaps_since_pause_record': 3, 'total_pauses': 3, 'pause': 57.49} +mmu_statistics_gate_4 = {'pauses': 1, 'loads': 8, 'load_distance': 13584.429, 'load_delta': 9464.65, 'unloads': 11, 'unload_distance': 3440.0, 'unload_delta': 3139.28, 'load_failures': 7, 'unload_failures': 2, 'quality': 0.7126287603755388} +mmu_statistics_gate_5 = {'pauses': 0, 'loads': 2, 'load_distance': 2852.423, 'load_delta': 423.003, 'unloads': 4, 'unload_distance': 2704.8, 'unload_delta': 149.164, 'load_failures': 1, 'unload_failures': 1, 'quality': 0.8392536837473988} +mmu_statistics_gate_6 = {'pauses': 4, 'loads': 3, 'load_distance': 3363.452, 'load_delta': 1694.174, 'unloads': 3, 'unload_distance': 901.6, 'unload_delta': 40.864, 'load_failures': 1, 'unload_failures': 1, 'quality': 0.2490142359175044} +mmu_statistics_gate_7 = {'pauses': 6, 'loads': 11, 'load_distance': 14499.488, 'load_delta': 6469.17, 'unloads': 26, 'unload_distance': 22111.2, 'unload_delta': 6092.289, 'load_failures': 7, 'unload_failures': 5, 'quality': 0.5589421641409617} +mmu_statistics_swaps = {'pre_load': 16.29, 'purge': 17.61, 'post_load': 27.17, 'load': 1499.55, 'pre_unload': 25.33, 'form_tip': 393.62, 'unload': 2817.46, 'post_unload': 22.04, 'total': 1578.64, 'total_swaps': 20, 'swaps_since_pause': 3, 'swaps_since_pause_record': 4, 'total_pauses': 16, 'pause': 1582.58} diff --git a/octopus_pro_1.1.cfg b/octopus_pro_1.1.cfg index c07ad00..dd1eab5 100644 --- a/octopus_pro_1.1.cfg +++ b/octopus_pro_1.1.cfg @@ -34,7 +34,7 @@ spi_software_sclk_pin: PA5 spi_software_mosi_pin: PA7 spi_software_miso_pin: PA6 diag1_pin: ^!PG6 -driver_SGT: 0 #1-3 # -64 is most sensitive value, 63 is least sensitive +driver_SGT: 1 #1-3 # -64 is most sensitive value, 63 is least sensitive run_current: 1.25 #1.25 stealthchop_threshold: 0 #stealthchop_threshold: 999999 @@ -84,7 +84,7 @@ endstop_pin: probe:z_virtual_endstop [tmc2209 stepper_z] uart_pin: PF2 interpolate: True -run_current: 0.8 +run_current: 1 #sense_resistor: 0.110 #stealthchop_threshold: 999999 @@ -98,7 +98,7 @@ microsteps: 128 [tmc2209 stepper_z1] uart_pin: PE4 interpolate: True -run_current: 0.8 +run_current: 1 #sense_resistor: 0.110 #stealthchop_threshold: 999999 @@ -112,7 +112,7 @@ microsteps: 128 [tmc2209 stepper_z2] uart_pin: PE1 interpolate: True -run_current: 0.8 +run_current: 1 #sense_resistor: 0.110 #stealthchop_threshold: 999999 @@ -126,7 +126,7 @@ microsteps: 128 [tmc2209 stepper_z3] uart_pin: PD3 interpolate: True -run_current: 0.8 +run_current: 1 #sense_resistor: 0.110 #stealthchop_threshold: 999999 diff --git a/printer.cfg b/printer.cfg index daa2f03..abd797b 100644 --- a/printer.cfg +++ b/printer.cfg @@ -4,8 +4,8 @@ [include hbb.cfg] # Happy Hare -[include mmu/base/*.cfg] -[include mmu/optional/client_macros.cfg] +#[include mmu/base/*.cfg] +#[include mmu/optional/client_macros.cfg] #[include mmu/addons/blobifier.cfg] #[include mmu/addons/mmu_erec_cutter.cfg] @@ -208,26 +208,26 @@ algorithm: bicubic #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated. #*# #*# [skew_correction default] -#*# xy_skew = -0.0028242858197175757 +#*# xy_skew = -0.002542020467517966 #*# xz_skew = 0.0 #*# yz_skew = 0.0 #*# #*# [bed_mesh default] #*# version = 1 #*# points = -#*# 0.045312, 0.016250, 0.030937 -#*# 0.045312, 0.009375, 0.050312 -#*# 0.040937, 0.015312, 0.052187 +#*# 0.005312, 0.005625, 0.016875 +#*# -0.001250, -0.008125, 0.015312 +#*# 0.016250, 0.004687, 0.022812 #*# x_count = 3 #*# y_count = 3 #*# mesh_x_pps = 2 #*# mesh_y_pps = 2 #*# algo = lagrange #*# tension = 0.2 -#*# min_x = 106.493 -#*# max_x = 243.853 -#*# min_y = 119.121 -#*# max_y = 230.50099999999998 +#*# min_x = 132.6 +#*# max_x = 217.0 +#*# min_y = 133.25 +#*# max_y = 217.07 #*# #*# [probe] -#*# z_offset = -0.870 +#*# z_offset = -0.850 diff --git a/toolhead_sb.cfg b/toolhead_sb.cfg index 077294d..aa887b0 100644 --- a/toolhead_sb.cfg +++ b/toolhead_sb.cfg @@ -3,7 +3,7 @@ [include rapido_v2.cfg] [mcu EBBCan] -canbus_uuid: 350f10596216 +canbus_uuid: d7e70bd38059 [firmware_retraction] retract_length: 0.3 @@ -34,15 +34,12 @@ accel_per_hz: 125 hz_per_sec: 1 [input_shaper] -#max 4000 -#shaper_type_x: 2hump_ei -#shaper_freq_x: 74.800 -#shaper_type_y: mzv -#shaper_freq_y: 40.200 +#max 4000 shaper_type_x:mzv -shaper_freq_x:51.000 +shaper_freq_x:53.800 shaper_type_y:mzv -shaper_freq_y:40.200 +shaper_freq_y:42.400 + [temperature_sensor SB2209] sensor_type: temperature_mcu @@ -112,13 +109,13 @@ motor: ldo-36sth20-1004ahg-9T -#[filament_switch_sensor G2E] -#pause_on_runout: True -#runout_gcode: - #UNLOAD_FILAMENT -#insert_gcode: - #LOAD_FILAMENT -#switch_pin: ^!EBBCan:gpio22 +[filament_switch_sensor G2E] +pause_on_runout: True +runout_gcode: + UNLOAD_FILAMENT +insert_gcode: + LOAD_FILAMENT +switch_pin: ^EBBCan:gpio24 ##################################################################### @@ -126,7 +123,7 @@ motor: ldo-36sth20-1004ahg-9T ##################################################################### [probe] -pin: ^!EBBCan:gpio24 +pin: ^!EBBCan:gpio21 ##################################################################### # Fan Control