diff --git a/.vscode/launch.json b/.vscode/launch.json index 2ce7f2d8a36a..65d60a1bb7f1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -32,6 +32,26 @@ // "-l", // "/tmp/dev_klipper_log.log" ] + }, + { + "name": "Run V6 klipper", + "type": "python", + "request": "launch", + "env": { + "PYTHONPATH": "${workspaceRoot}" + }, + "stopOnEntry": false, + "console": "integratedTerminal", + "cwd": "${workspaceRoot}", + "program": "${workspaceFolder}/klippy/klippy.py", + "args": [ + "${workspaceFolder}/HTE600-0-0-23.cfg", + "-v", + "-a", + "/tmp/klipper_uds", + // "-l", + // "/tmp/dev_klipper_log.log" + ] } ] } \ No newline at end of file diff --git a/HTE600-0-0-23.cfg b/HTE600-0-0-23.cfg new file mode 100644 index 000000000000..264db2b4d64c --- /dev/null +++ b/HTE600-0-0-23.cfg @@ -0,0 +1,47 @@ +[mcu] +serial: /dev/ttyACM1 +# serial: /dev/serial/by-id/usb-Klipper_stm32f446xx_410046000451303431333234-if00 + +[mcu second_mcu] +serial: /dev/ttyACM0 + +[virtual_sdcard] +path: /home/ste/uploads + +[display_status] + +[include stereotech_config/v6/kinematics_none.cfg] + +# [include stereotech_config/v6/board_stm32f4.cfg] +# [include stereotech_config/v6/board_stm32g1b0.cfg] + +# [include stereotech_config/v6/kinematics.cfg] +# [include stereotech_config/v6/kinematics_tmc.cfg] + +# [include stereotech_config/v6/chamber.cfg] + +# [include stereotech_config/v6/printhead.cfg] + +# [include stereotech_config/v6/main_extruder.cfg] +# [include stereotech_config/v6/second_extruder.cfg] +# [include stereotech_config/v6/fiber_extruder.cfg] +# [include stereotech_config/v6/filament_control_2.cfg] +# [include stereotech_config/v6/filament_control_second_2.cfg] +# [include stereotech_config/v6/module_3d.cfg] +# [include stereotech_config/v6/module_5d.cfg] + +# not defined +# [include stereotech_config/v6/homing.cfg] + +# [include stereotech_config/v6/probe.cfg] +# [include stereotech_config/v6/probe_hybrid_printer.cfg] + +# [include stereotech_config/v6/nozzle_offset.cfg] +# [include stereotech_config/v6/extruder_macros.cfg] +# [include stereotech_config/v6/power_control.cfg] + +# [include stereotech_config/v6/module_3d_macros.cfg] + +# [include stereotech_config/v6/print_macros.cfg] +# [include stereotech_config/v6/variables.cfg] +# [include stereotech_config/v6/diagnostics.cfg] diff --git a/stereotech_config/HTE600-0-0-23.cfg b/stereotech_config/HTE600-0-0-23.cfg index 18d376b5c4d8..797618318ad0 100644 --- a/stereotech_config/HTE600-0-0-23.cfg +++ b/stereotech_config/HTE600-0-0-23.cfg @@ -1,38 +1,46 @@ [mcu] -serial: /dev/ttyACM0 +serial: /dev/ttyACM1 [mcu second_mcu] -serial: /dev/ttyACM1 # ls /dev/serial/by-id/* +serial: /dev/ttyACM0 [virtual_sdcard] path: /home/ste/uploads [display_status] -[include config/v6/board_stm.cfg] -[include config/v6/kinematics.cfg] -[include config/v6/kinematics_tmc.cfg] -# [include config/v6/homing.cfg] - -[include config/v6/chamber.cfg] - -[include config/v6/printhead.cfg] -# [include config/v6/probe.cfg] -# [include config/v6/probe_hybrid_printer.cfg] - -[include config/v6/main_extruder.cfg] -[include config/v6/second_extruder.cfg] -[include config/v6/fiber_extruder.cfg] -# [include config/v6/nozzle_offset.cfg] -# [include config/v6/extruder_macros.cfg] -[include config/v6/filament_control_2.cfg] -[include config/v6/filament_control_second_2.cfg] -# [include config/v6/power_control.cfg] - -[include config/v6/module_3d.cfg] -# [include config/v6/module_3d_macros.cfg] -# [include config/v6/module_5d.cfg] - -# [include config/v6/print_macros.cfg] -# [include config/v6/variables.cfg] -# [include config/v6/diagnostics.cfg] +# [include stereotech_config/v6/kinematics_none.cfg] + +[include stereotech_config/v6/board_stm32f4.cfg] +[include stereotech_config/v6/board_stm32g1b0.cfg] + +[include stereotech_config/v6/kinematics.cfg] +[include stereotech_config/v6/kinematics_tmc.cfg] + +# [include stereotech_config/v6/chamber.cfg] + +# [include stereotech_config/v6/printhead.cfg] + +# [include stereotech_config/v6/main_extruder.cfg] +# [include stereotech_config/v6/second_extruder.cfg] +# [include stereotech_config/v6/fiber_extruder.cfg] +# [include stereotech_config/v6/filament_control_2.cfg] +# [include stereotech_config/v6/filament_control_second_2.cfg] +# [include stereotech_config/v6/module_3d.cfg] +# [include stereotech_config/v6/module_5d.cfg] + +# not defined +# [include stereotech_config/v6/homing.cfg] + +# [include stereotech_config/v6/probe.cfg] +# [include stereotech_config/v6/probe_hybrid_printer.cfg] + +# [include stereotech_config/v6/nozzle_offset.cfg] +# [include stereotech_config/v6/extruder_macros.cfg] +# [include stereotech_config/v6/power_control.cfg] + +# [include stereotech_config/v6/module_3d_macros.cfg] + +# [include stereotech_config/v6/print_macros.cfg] +# [include stereotech_config/v6/variables.cfg] +# [include stereotech_config/v6/diagnostics.cfg] diff --git a/stereotech_config/mcu/stm32f446.config b/stereotech_config/mcu/stm32f446.config index cb6d9ec58bea..eff7ca988d25 100644 --- a/stereotech_config/mcu/stm32f446.config +++ b/stereotech_config/mcu/stm32f446.config @@ -28,6 +28,7 @@ CONFIG_STM32_SELECT=y # CONFIG_MACH_STM32F407 is not set # CONFIG_MACH_STM32F429 is not set CONFIG_MACH_STM32F446=y +# CONFIG_MACH_STM32F765 is not set # CONFIG_MACH_STM32F031 is not set # CONFIG_MACH_STM32F042 is not set # CONFIG_MACH_STM32F070 is not set @@ -55,6 +56,7 @@ CONFIG_STM32_FLASH_START_8000=y CONFIG_STM32_CLOCK_REF_12M=y # 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 is not set # CONFIG_STM32_CLOCK_REF_INTERNAL is not set CONFIG_CLOCK_REF_FREQ=12000000 @@ -85,7 +87,12 @@ CONFIG_USB_SERIAL_NUMBER="12345" # # end of USB ids -CONFIG_CANBUS_FREQUENCY=500000 +CONFIG_WANT_GPIO_BITBANGING=y +CONFIG_WANT_DISPLAYS=y +CONFIG_WANT_SENSORS=y +CONFIG_WANT_SOFTWARE_I2C=y +CONFIG_WANT_SOFTWARE_SPI=y +CONFIG_CANBUS_FREQUENCY=1000000 CONFIG_INITIAL_PINS="" CONFIG_HAVE_GPIO=y CONFIG_HAVE_GPIO_ADC=y @@ -93,7 +100,6 @@ CONFIG_HAVE_GPIO_SPI=y CONFIG_HAVE_GPIO_SDIO=y CONFIG_HAVE_GPIO_I2C=y CONFIG_HAVE_GPIO_HARD_PWM=y -CONFIG_HAVE_GPIO_BITBANGING=y CONFIG_HAVE_STRICT_TIMING=y CONFIG_HAVE_CHIPID=y CONFIG_HAVE_STEPPER_BOTH_EDGE=y diff --git a/stereotech_config/mcu/stm32g0b1.config b/stereotech_config/mcu/stm32g0b1.config index 3047da0942d0..16800d568efd 100644 --- a/stereotech_config/mcu/stm32g0b1.config +++ b/stereotech_config/mcu/stm32g0b1.config @@ -1,4 +1,4 @@ -# CONFIG_LOW_LEVEL_OPTIONS is not set +CONFIG_LOW_LEVEL_OPTIONS=y # CONFIG_MACH_AVR is not set # CONFIG_MACH_ATSAM is not set # CONFIG_MACH_ATSAMD is not set @@ -28,6 +28,7 @@ CONFIG_STM32_SELECT=y # 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 @@ -41,6 +42,8 @@ CONFIG_MACH_STM32G0B1=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_STM32G0=y CONFIG_MACH_STM32G0Bx=y CONFIG_HAVE_STM32_USBFS=y @@ -49,12 +52,28 @@ CONFIG_HAVE_STM32_USBCANBUS=y CONFIG_STM32_DFU_ROM_ADDRESS=0x1fff0000 CONFIG_STM32_FLASH_START_2000=y # CONFIG_STM32_FLASH_START_0000 is not set +CONFIG_STM32_CLOCK_REF_8M=y +# 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 is not set +# CONFIG_STM32_CLOCK_REF_INTERNAL is not set CONFIG_CLOCK_REF_FREQ=8000000 CONFIG_STM32F0_TRIM=16 CONFIG_STM32_USB_PA11_PA12=y # 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_USART5 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 @@ -64,13 +83,24 @@ CONFIG_USB_VENDOR_ID=0x1d50 CONFIG_USB_DEVICE_ID=0x614e CONFIG_USB_SERIAL_NUMBER_CHIPID=y CONFIG_USB_SERIAL_NUMBER="12345" -CONFIG_CANBUS_FREQUENCY=500000 + +# +# USB ids +# +# end of USB ids + +CONFIG_WANT_GPIO_BITBANGING=y +CONFIG_WANT_DISPLAYS=y +CONFIG_WANT_SENSORS=y +CONFIG_WANT_SOFTWARE_I2C=y +CONFIG_WANT_SOFTWARE_SPI=y +CONFIG_CANBUS_FREQUENCY=1000000 +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_GPIO_BITBANGING=y CONFIG_HAVE_STRICT_TIMING=y CONFIG_HAVE_CHIPID=y CONFIG_HAVE_STEPPER_BOTH_EDGE=y diff --git a/stereotech_config/v6/board_stm.cfg b/stereotech_config/v6/board_stm.cfg deleted file mode 100644 index 481ec8f5af48..000000000000 --- a/stereotech_config/v6/board_stm.cfg +++ /dev/null @@ -1,45 +0,0 @@ -[board_pins] -mcu: - mcu, second_mcu -aliases: - ; mcu_bigtreetech_octopus_pro - x_step_pin=PF13, x_dir_pin=PF12, x_en_pin=PF14, x_endstop_pin=PG6, - y_step_pin=PG0, y_dir_pin=PG1, y_en_pin=PF15, y_endstop_pin=PG9, - z_step_pin=PF11, z_dir_pin=PG3, z_en_pin=PG5, z_endstop_pin=PG10, - a_step_pin=PG4, a_dir_pin=PC1, a_en_pin=PA0, a_endstop_pin=PG11, - c_step_pin=PF9, c_dir_pin=PF10, c_en_pin=PG2, c_endstop_pin=PG12, - door_endswitch=PG13, filament_control_1=PG14, filament_control_2=PG15, - - led_pin=PB0, - - bed_heater=PA1, bed_sensor=PF5, - - - - main_nozzle_blower_heater=PA2, main_nozzle_blower_sensor=PF6, - second_nozzle_blower_heater=PA3, second_nozzle_blower_sensor=PF7, - - ; air_compressor=PB10, blower_air_compressor=PD15, ????? - - cooling_fan_heat=PA8, turbine_5d=PE5, fan_5d=PD12, pump=PD13, - fan_pump_cooling=PD14, - - ; mcu_bigtreetech_octopus_pro - main_extruder_step_pin=second_mcu:PE2, main_extruder_dir_pin=second_mcu:PB8, - main_extruder_enable_pin=second_mcu:PC11, main_extruder_heater_pin=second_mcu:PE3, - main_extruder_sensor_pin=second_mcu:PA2, - - second_extruder_step_pin=second_mcu:PF12, second_extruder_dir_pin=second_mcu:PF11, - second_extruder_enable_pin=second_mcu:PB3, second_extruder_heater_pin=second_mcu:PB5, - second_extruder_sensor_pin=second_mcu:PA3, - - fiber_extruder_step_pin=second_mcu:PD7, fiber_extruder_dir_pin=second_mcu:PD6, - fiber_extruder_enable_pin=second_mcu:PF10, fiber_extruder_heater_pin=second_mcu:PB6, - fiber_extruder_sensor_pin=second_mcu:PA4, - - heater_fire_bar=second_mcu:PB7, temp_chamber=second_mcu:PA1, - - fiber_cut_pin=second_mcu:PA9, switching_extruder=second_mcu:PA15, - - - diff --git a/stereotech_config/v6/board_stm32f4.cfg b/stereotech_config/v6/board_stm32f4.cfg new file mode 100644 index 000000000000..3552f16e5e79 --- /dev/null +++ b/stereotech_config/v6/board_stm32f4.cfg @@ -0,0 +1,24 @@ +[board_pins] +mcu: + mcu +aliases: + x_step_pin=PF13, x_dir_pin=PF12, x_en_pin=PF14, x_endstop_pin=PG6, + y_step_pin=PG0, y_dir_pin=PG1, y_en_pin=PF15, y_endstop_pin=PG9, + z_step_pin=PF11, z_dir_pin=PG3, z_en_pin=PG5, z_endstop_pin=PG10, + a_step_pin=PG4, a_dir_pin=PC1, a_en_pin=PA0, a_endstop_pin=PG11, + c_step_pin=PF9, c_dir_pin=PF10, c_en_pin=PG2, c_endstop_pin=PG12, + door_endswitch=PG13, filament_control_1=PG14, filament_control_2=PG15, + + led_pin=PB0, + + bed_heater=PA1, bed_sensor=PF5, + + five_axis_pin=PG12, + + main_nozzle_blower_heater=PA2, main_nozzle_blower_sensor=PF6, + second_nozzle_blower_heater=PA3, second_nozzle_blower_sensor=PF7, + + ; air_compressor=PB10, blower_air_compressor=PD15, ????? + + cooling_fan_heat=PA8, turbine_5d=PE5, fan_5d=PD12, pump=PD13, + fan_pump_cooling=PD14, diff --git a/stereotech_config/v6/board_stm32g1b0.cfg b/stereotech_config/v6/board_stm32g1b0.cfg new file mode 100644 index 000000000000..5c4b5e2104c3 --- /dev/null +++ b/stereotech_config/v6/board_stm32g1b0.cfg @@ -0,0 +1,16 @@ +[board_pins second_mcu] +mcu: + second_mcu +aliases: + main_extruder_step_pin=PE2, main_extruder_dir_pin=PB4, main_extruder_enable_pin=PC11, main_extruder_cs_pin=PC10, + main_extruder_heater_pin=PE3, main_extruder_sensor_pin=PA2, + + second_extruder_step_pin=PF12, second_extruder_dir_pin=PF11, second_extruder_enable_pin=PB3, second_extruder_cs_pin=PF13, + second_extruder_heater_pin=PB5, second_extruder_sensor_pin=PA3, + + fiber_extruder_step_pin=PD7, fiber_extruder_dir_pin=PD6, fiber_extruder_enable_pin=PF10, fiber_extruder_cs_pin=PF9, + fiber_extruder_heater_pin=PB6, fiber_extruder_sensor_pin=PA4, + + heater_fire_bar=PB7, temp_chamber=PA1, + + fiber_cut_pin=PA9, switching_extruder=PB15, diff --git a/stereotech_config/v6/chamber.cfg b/stereotech_config/v6/chamber.cfg index 10be1bf5bfaa..e32c445df143 100644 --- a/stereotech_config/v6/chamber.cfg +++ b/stereotech_config/v6/chamber.cfg @@ -1,33 +1,39 @@ -[heater_generic chamber_heater] -gcode_id: CHAM_HEATE -heater_pin: heater_fire_bar -sensor_type: ATC Semitec 104GT-2 -sensor_pin: temp_chamber -control: pid -pid_Kp: 13.509 -pid_Ki: 0.566 -pid_Kd: 80.549 -min_temp: -150 -max_temp: 320 - -[gcode_button endswitch_door] -pin: !door_endswitch -press_gcode: QUERY_BUTTON BUTTON=endswitch_door - -# cooling axis C -[heater_fan fan_axis_c] -pin: turbine_5d -heater: chamber_heater -heater_temp: 40.0 - -# cooling axis A and module 5D -[heater_fan fan_cooling_5d] -pin: fan_5d -heater: chamber_heater -heater_temp: 40.0 - -# [temperature_fan bottom_fan] -# pin: PD13 +[fan_generic chamber_fan] +pin: PE6 + +# [fan_generic chamber_fan] +# pin: second_mcu: cooling_fan_heat + +# [heater_generic chamber_heater] +# gcode_id: CHAM_HEATE +# heater_pin: heater_fire_bar +# sensor_type: ATC Semitec 104GT-2 +# sensor_pin: temp_chamber +# control: pid +# pid_Kp: 13.509 +# pid_Ki: 0.566 +# pid_Kd: 80.549 +# min_temp: -150 +# max_temp: 320 + +# [gcode_button endswitch_door] +# pin: !door_endswitch +# press_gcode: QUERY_BUTTON BUTTON=endswitch_door + +# # cooling axis C +# [heater_fan fan_axis_c] +# pin: turbine_5d +# heater: chamber_heater +# heater_temp: 40.0 + +# # cooling axis A and module 5D +# [heater_fan fan_cooling_5d] +# pin: fan_5d +# heater: chamber_heater +# heater_temp: 40.0 + +# [temperature_fan bottom_fan] # ???????? +# pin: PD13 # ???????? # sensor_type: temperature_host # control: pid # pid_Kp: 15 @@ -41,122 +47,122 @@ heater_temp: 40.0 # LED Light controls -[neopixel case_led] -pin: led_pin -chain_count: 1 -color_order: GRB -initial_RED: 0.0 -initial_GREEN: 0.0 -initial_BLUE: 0.0 - -[display_template led_white] -text: 0.0, 0.0, 0.0 - -[display_template led_red] -text: 1.0, 0.0, 0.0 - -[display_template led_green] -text: 0.0, 1.0, 0.0 - -[display_template led_blue] -text: 0.0, 0.0, 1.0 - -[display_template led_color] -param_red: 0.0 -param_green: 0.0 -param_blue: 0.0 -text: {param_red}, {param_green}, {param_blue} - -[display_template led_heatup] -text: {printer[printer.toolhead.extruder].temperature / 320}, 0.0, 1.0, 0.0 - -[gcode_macro M150] -description: Change color macro -variable_current_red_value: 0.0 -variable_current_green_value: 0.0 -variable_current_blue_value: 0.0 -gcode: - SET_GCODE_VARIABLE MACRO=M150 VARIABLE=current_red_value VALUE={printer["neopixel case_led"].color_data[0][0]} - SET_GCODE_VARIABLE MACRO=M150 VARIABLE=current_green_value VALUE={printer["neopixel case_led"].color_data[0][1]} - SET_GCODE_VARIABLE MACRO=M150 VARIABLE=current_blue_value VALUE={printer["neopixel case_led"].color_data[0][2]} - {% set duration = params.D|default(0)|float %} - {% set red_input = params.R|default(0)|float %} - {% set green_input = params.G|default(0)|float %} - {% set blue_input = params.B|default(0)|float %} - {% set red_value = red_input %} - {% set green_value = green_input%} - {% set blue_value = blue_input%} - M400 - SET_LED_TEMPLATE LED=case_led TEMPLATE=led_color param_red={red_value / 255} param_green={green_value / 255} param_blue={blue_value / 255} - ;SET_LED LED=case_led RED={red_value / 255} GREEN={green_value / 255} BLUE={blue_value / 255} - {% if duration > 0 %} - UPDATE_DELAYED_GCODE ID=return_color DURATION={duration} - {% endif %} - -[delayed_gcode return_color] -gcode: - M400 - SET_LED_TEMPLATE LED=case_led TEMPLATE=led_color param_red={printer["gcode_macro M150"].current_red_value} param_green={printer["gcode_macro M150"].current_green_value} param_blue={printer["gcode_macro M150"].current_blue_value} - ;SET_LED LED=case_led RED={printer["gcode_macro M150"].current_red_value} GREEN={printer["gcode_macro M150"].current_green_value} BLUE={printer["gcode_macro M150"].current_blue_value} - -[gcode_macro TOGGLE_LIGHT] -variable_light: 1 -gcode: - {% set red_value = printer["neopixel case_led"].color_data[0][0] %} - {% set green_value = printer["neopixel case_led"].color_data[0][1] %} - {% set blue_value = printer["neopixel case_led"].color_data[0][2] %} - {% set light_is_on = [white_value, red_value, green_value, blue_value]|max %} - {% if light_is_on > 0 %} - M150 R0 G0 B0 - SET_GCODE_VARIABLE MACRO=TOGGLE_LIGHT VARIABLE=light VALUE=0 - {% else %} - M150 R255 G255 B255 - SET_GCODE_VARIABLE MACRO=TOGGLE_LIGHT VARIABLE=light VALUE=1 - {% endif %} - -[gcode_macro STATUS_LED] -gcode: - {% set status = params.STATUS|default(printing) %} - {% if status == "started" %} - SET_LED_TEMPLATE LED=case_led TEMPLATE=led_heatup - {% elif status == "paused" %} - M150 R255 G255 B0 D5 - {% elif status == "completed" %} - M150 R0 G255 B0 D5 - {% elif status == "cancelled" %} - M150 R255 G0 B0 D3 - {% elif status == "printing" %} - {% if printer["gcode_macro TOGGLE_LIGHT"].light > 0 %} - M150 R255 G255 B255 - {% else %} - M150 R0 G0 B0 - {% endif %} - {% else %} - UPDATE_DELAYED_GCODE ID=return_color DURATION=0.1 - {% endif %} - -# [gcode_macro M106] -# rename_existing: M106.1 +# [neopixel case_led] +# pin: led_pin +# chain_count: 1 +# color_order: GRB +# initial_RED: 0.0 +# initial_GREEN: 0.0 +# initial_BLUE: 0.0 + +# [display_template led_white] +# text: 0.0, 0.0, 0.0 + +# [display_template led_red] +# text: 1.0, 0.0, 0.0 + +# [display_template led_green] +# text: 0.0, 1.0, 0.0 + +# [display_template led_blue] +# text: 0.0, 0.0, 1.0 + +# [display_template led_color] +# param_red: 0.0 +# param_green: 0.0 +# param_blue: 0.0 +# text: {param_red}, {param_green}, {param_blue} + +# [display_template led_heatup] +# text: {printer[printer.toolhead.extruder].temperature / 320}, 0.0, 1.0, 0.0 + +# [gcode_macro M150] +# description: Change color macro +# variable_current_red_value: 0.0 +# variable_current_green_value: 0.0 +# variable_current_blue_value: 0.0 # gcode: -# {% set p = params.P|default(0)|int %} -# {% set s = params.S|default(0)|int %} -# {% if p > 0 %} -# {% if p == 3 %} -# SET_FAN_SPEED FAN=chamber_fan SPEED={params.S|default(0)|int / 255} -# {% endif %} +# SET_GCODE_VARIABLE MACRO=M150 VARIABLE=current_red_value VALUE={printer["neopixel case_led"].color_data[0][0]} +# SET_GCODE_VARIABLE MACRO=M150 VARIABLE=current_green_value VALUE={printer["neopixel case_led"].color_data[0][1]} +# SET_GCODE_VARIABLE MACRO=M150 VARIABLE=current_blue_value VALUE={printer["neopixel case_led"].color_data[0][2]} +# {% set duration = params.D|default(0)|float %} +# {% set red_input = params.R|default(0)|float %} +# {% set green_input = params.G|default(0)|float %} +# {% set blue_input = params.B|default(0)|float %} +# {% set red_value = red_input %} +# {% set green_value = green_input%} +# {% set blue_value = blue_input%} +# M400 +# SET_LED_TEMPLATE LED=case_led TEMPLATE=led_color param_red={red_value / 255} param_green={green_value / 255} param_blue={blue_value / 255} +# ;SET_LED LED=case_led RED={red_value / 255} GREEN={green_value / 255} BLUE={blue_value / 255} +# {% if duration > 0 %} +# UPDATE_DELAYED_GCODE ID=return_color DURATION={duration} +# {% endif %} + +# [delayed_gcode return_color] +# gcode: +# M400 +# SET_LED_TEMPLATE LED=case_led TEMPLATE=led_color param_red={printer["gcode_macro M150"].current_red_value} param_green={printer["gcode_macro M150"].current_green_value} param_blue={printer["gcode_macro M150"].current_blue_value} +# ;SET_LED LED=case_led RED={printer["gcode_macro M150"].current_red_value} GREEN={printer["gcode_macro M150"].current_green_value} BLUE={printer["gcode_macro M150"].current_blue_value} + +# [gcode_macro TOGGLE_LIGHT] +# variable_light: 1 +# gcode: +# {% set red_value = printer["neopixel case_led"].color_data[0][0] %} +# {% set green_value = printer["neopixel case_led"].color_data[0][1] %} +# {% set blue_value = printer["neopixel case_led"].color_data[0][2] %} +# {% set light_is_on = [white_value, red_value, green_value, blue_value]|max %} +# {% if light_is_on > 0 %} +# M150 R0 G0 B0 +# SET_GCODE_VARIABLE MACRO=TOGGLE_LIGHT VARIABLE=light VALUE=0 # {% else %} -# M106.1 S{s} +# M150 R255 G255 B255 +# SET_GCODE_VARIABLE MACRO=TOGGLE_LIGHT VARIABLE=light VALUE=1 # {% endif %} -# [gcode_macro M107] -# rename_existing: M107.1 +# [gcode_macro STATUS_LED] # gcode: -# {% set p = params.P|default(0)|int %} -# {% if p > 0 %} -# {% if p == 3 %} -# SET_FAN_SPEED FAN=chamber_fan SPEED=0.0 +# {% set status = params.STATUS|default(printing) %} +# {% if status == "started" %} +# SET_LED_TEMPLATE LED=case_led TEMPLATE=led_heatup +# {% elif status == "paused" %} +# M150 R255 G255 B0 D5 +# {% elif status == "completed" %} +# M150 R0 G255 B0 D5 +# {% elif status == "cancelled" %} +# M150 R255 G0 B0 D3 +# {% elif status == "printing" %} +# {% if printer["gcode_macro TOGGLE_LIGHT"].light > 0 %} +# M150 R255 G255 B255 +# {% else %} +# M150 R0 G0 B0 # {% endif %} # {% else %} -# M107.1 +# UPDATE_DELAYED_GCODE ID=return_color DURATION=0.1 # {% endif %} +# # [gcode_macro M106] +# # rename_existing: M106.1 +# # gcode: +# # {% set p = params.P|default(0)|int %} +# # {% set s = params.S|default(0)|int %} +# # {% if p > 0 %} +# # {% if p == 3 %} +# # SET_FAN_SPEED FAN=chamber_fan SPEED={params.S|default(0)|int / 255} +# # {% endif %} +# # {% else %} +# # M106.1 S{s} +# # {% endif %} + +# # [gcode_macro M107] +# # rename_existing: M107.1 +# # gcode: +# # {% set p = params.P|default(0)|int %} +# # {% if p > 0 %} +# # {% if p == 3 %} +# # SET_FAN_SPEED FAN=chamber_fan SPEED=0.0 +# # {% endif %} +# # {% else %} +# # M107.1 +# # {% endif %} + diff --git a/stereotech_config/v6/fiber_extruder.cfg b/stereotech_config/v6/fiber_extruder.cfg index a1697e4224bf..8f498a8e7264 100644 --- a/stereotech_config/v6/fiber_extruder.cfg +++ b/stereotech_config/v6/fiber_extruder.cfg @@ -1,14 +1,14 @@ [extruder2] -step_pin: fiber_extruder_step_pin -dir_pin: fiber_extruder_dir_pin -enable_pin: !fiber_extruder_enable_pin +step_pin: second_mcu:fiber_extruder_step_pin +dir_pin: second_mcu:fiber_extruder_dir_pin +enable_pin: !second_mcu:fiber_extruder_enable_pin microsteps: 16 rotation_distance: 40 nozzle_diameter: 0.6 filament_diameter: 0.6 -heater_pin: fiber_extruder_heater_pin +heater_pin: second_mcu:fiber_extruder_heater_pin sensor_type: Trianglelab T-D500 -sensor_pin: fiber_extruder_sensor_pin +sensor_pin: second_mcu:fiber_extruder_sensor_pin control: pid pid_Kp: 13.509 pid_Ki: 0.566 @@ -18,6 +18,13 @@ max_temp: 320 max_extrude_only_distance: 300.0 min_extrude_temp: 0 +# [manual_stepper cutter_stepper] +# step_pin: P2.8 +# dir_pin: P2.13 +# enable_pin: !P4.29 +# microsteps: 16 +# rotation_distance: 1 + # [gcode_macro T1] # variable_t1_offset_enabled: 0.0 # gcode: @@ -31,12 +38,7 @@ min_extrude_temp: 0 # ACTIVATE_EXTRUDER extruder=extruder1 # SET_WCS WCS={current_wcs} -# [manual_stepper cutter_stepper] -# step_pin: P2.8 -# dir_pin: P2.13 -# enable_pin: !P4.29 -# microsteps: 16 -# rotation_distance: 1 + # [gcode_macro CUT_FIBER] diff --git a/stereotech_config/v6/filament_control.cfg b/stereotech_config/v6/filament_control.cfg index 49b32785664e..ec0c6ec08925 100644 --- a/stereotech_config/v6/filament_control.cfg +++ b/stereotech_config/v6/filament_control.cfg @@ -1,21 +1,21 @@ -[filament_motion_sensor extruder_sensor] -extruder: extruder -detection_length: 10.5 -event_delay: 60.0 -switch_pin: filament_control_1 -pause_on_runout: False -runout_gcode: - {% if printer.virtual_sdcard.is_active %} - {action_respond_warning('The filament has run out or there is a problem with its supply at the Extruder 1.')} - # PAUSE TURN_OFF_EXTRUDERS=0 E=0 - {% else %} - FILAMENT_ERROR EXTRUDER=extruder - {% endif %} +# [filament_motion_sensor extruder_sensor] +# extruder: extruder +# detection_length: 10.5 +# event_delay: 60.0 +# switch_pin: filament_control_1 +# pause_on_runout: False +# runout_gcode: +# {% if printer.virtual_sdcard.is_active %} +# {action_respond_warning('The filament has run out or there is a problem with its supply at the Extruder 1.')} +# # PAUSE TURN_OFF_EXTRUDERS=0 E=0 +# {% else %} +# FILAMENT_ERROR EXTRUDER=extruder +# {% endif %} -[gcode_macro FILAMENT_ERROR] -gcode: - {% if params.EXTRUDER == 'extruder' %} - {action_raise_error('Filament error on Extruder 1')} - {% else %} - {action_raise_error('Filament error on Extruder 2')} - {% endif %} +# [gcode_macro FILAMENT_ERROR] +# gcode: +# {% if params.EXTRUDER == 'extruder' %} +# {action_raise_error('Filament error on Extruder 1')} +# {% else %} +# {action_raise_error('Filament error on Extruder 2')} +# {% endif %} diff --git a/stereotech_config/v6/filament_control_second.cfg b/stereotech_config/v6/filament_control_second.cfg index dd00e9759c37..40fe6bfde568 100644 --- a/stereotech_config/v6/filament_control_second.cfg +++ b/stereotech_config/v6/filament_control_second.cfg @@ -1,13 +1,13 @@ -[filament_motion_sensor extruder1_sensor] -extruder: extruder1 -detection_length: 10.5 -event_delay: 60.0 -switch_pin: filament_control_2 -pause_on_runout: False -runout_gcode: - {% if printer.virtual_sdcard.is_active %} - {action_respond_warning('The filament has run out or there is a problem with its supply at the Extruder 2.')} - # PAUSE TURN_OFF_EXTRUDERS=0 E=0 - {% else %} - FILAMENT_ERROR EXTRUDER=extruder1 - {% endif %} +# [filament_motion_sensor extruder1_sensor] +# extruder: extruder1 +# detection_length: 10.5 +# event_delay: 60.0 +# switch_pin: filament_control_2 +# pause_on_runout: False +# runout_gcode: +# {% if printer.virtual_sdcard.is_active %} +# {action_respond_warning('The filament has run out or there is a problem with its supply at the Extruder 2.')} +# # PAUSE TURN_OFF_EXTRUDERS=0 E=0 +# {% else %} +# FILAMENT_ERROR EXTRUDER=extruder1 +# {% endif %} diff --git a/stereotech_config/v6/kinematics.cfg b/stereotech_config/v6/kinematics.cfg index 5b8f9bd2acf3..b5097b5566e3 100644 --- a/stereotech_config/v6/kinematics.cfg +++ b/stereotech_config/v6/kinematics.cfg @@ -2,8 +2,8 @@ kinematics: corexy_6axis max_velocity: 200 max_accel: 1500 -max_z_velocity: 20 -max_z_accel: 200 +max_z_velocity: 40 +max_z_accel: 500 square_corner_velocity: 2.5 [stepper_x] @@ -13,9 +13,10 @@ enable_pin: !x_en_pin microsteps: 128 rotation_distance: 40 endstop_pin: x_endstop_pin -position_endstop: 310 -position_max: 310 -homing_speed: 50 +position_endstop: 309 +position_max: 309 +position_min: -1 +homing_speed: 70 [stepper_y] step_pin: y_step_pin @@ -26,7 +27,8 @@ rotation_distance: 40 endstop_pin: y_endstop_pin position_endstop: 300.3 position_max: 300.3 -homing_speed: 50 +position_min: 0 +homing_speed: 70 [stepper_z] step_pin: z_step_pin @@ -38,7 +40,7 @@ endstop_pin: z_endstop_pin position_endstop: 300 position_max: 300 position_min: -10 -homing_speed: 10 +homing_speed: 20 [stepper_a] step_pin: a_step_pin @@ -51,7 +53,7 @@ endstop_pin: a_endstop_pin position_endstop: 90 position_min: -10 position_max: 90 -homing_speed: 10 +homing_speed: 20 [stepper_c] step_pin: c_step_pin @@ -61,8 +63,5 @@ microsteps: 128 rotation_distance: 120 gear_ratio: 80:20 can_home: false -endstop_pin: a_endstop_pin -;position_endstop: 90 -;position_min: -10 -;position_max: 90 -homing_speed: 10 +homing_speed: 20 + diff --git a/stereotech_config/v6/kinematics_none.cfg b/stereotech_config/v6/kinematics_none.cfg new file mode 100644 index 000000000000..e454ce5adbbd --- /dev/null +++ b/stereotech_config/v6/kinematics_none.cfg @@ -0,0 +1,66 @@ +[printer] +kinematics: none +max_velocity: 200 +max_accel: 1500 + +# MANUAL_STEPPER STEPPER=cutter_stepper_1 ENABLE=1 SET_POSITION=0 MOVE=30 SPEED=5 + +[manual_stepper cutter_stepper_1] +step_pin: c_step_pin +dir_pin: c_dir_pin +enable_pin: !c_en_pin +microsteps: 16 +rotation_distance: 40 + +[tmc2130 manual_stepper cutter_stepper_1] +cs_pin: c_cs_pin +spi_bus: spi1 +run_current: 0.15 +interpolate: False + +# [manual_stepper cutter_stepper_2] +# step_pin: second_mcu:x_step_pin +# dir_pin: second_mcu:x_dir_pin +# enable_pin: !second_mcu:x_en_pin +# microsteps: 16 +# rotation_distance: 40 + +# [tmc2130 manual_stepper cutter_stepper_2] +# cs_pin: second_mcu:x_cs_pin +# spi_software_sclk_pin: second_mcu:PA5 +# spi_software_mosi_pin: second_mcu:PA7 +# spi_software_miso_pin: second_mcu:PA6 +# run_current: 0.15 +# interpolate: False + +[manual_stepper cutter_stepper_3] +step_pin: second_mcu:y_step_pin +dir_pin: second_mcu:y_dir_pin +enable_pin: !second_mcu:y_en_pin +microsteps: 16 +rotation_distance: 40 + +[tmc2130 manual_stepper cutter_stepper_3] +cs_pin: second_mcu:y_cs_pin +spi_software_sclk_pin: second_mcu:PA5 +spi_software_mosi_pin: second_mcu:PA7 +spi_software_miso_pin: second_mcu:PA6 +run_current: 0.15 +interpolate: False + +[board_pins] +mcu: + mcu +aliases: + x_step_pin=PF13, x_dir_pin=PF12, x_en_pin=PF14, x_endstop_pin=PG6, + y_step_pin=PG0, y_dir_pin=PG1, y_en_pin=PF15, y_endstop_pin=PG9, + z_step_pin=PF11, z_dir_pin=PG3, z_en_pin=PG5, z_endstop_pin=PG10, + a_step_pin=PG4, a_dir_pin=PC1, a_en_pin=PA0, a_endstop_pin=PG11, + c_step_pin=PF9, c_dir_pin=PF10, c_en_pin=PG2, c_cs_pin=PF2, + +[board_pins second_mcu] +mcu: + second_mcu +aliases: + x_step_pin=PE2, x_dir_pin=PB4, x_en_pin=PC11, x_cs_pin=PC10, + y_step_pin=PF12, y_dir_pin=PF11, y_en_pin=PB3, y_cs_pin=PF13, diff --git a/stereotech_config/v6/kinematics_tmc.cfg b/stereotech_config/v6/kinematics_tmc.cfg index b6617bf1f903..1a0a75d763a5 100644 --- a/stereotech_config/v6/kinematics_tmc.cfg +++ b/stereotech_config/v6/kinematics_tmc.cfg @@ -39,25 +39,34 @@ interpolate: False #stealthchop_threshold: 999999 [tmc2130 extruder] -cs_pin: second_mcu:PC10 -spi_bus: spi1 +cs_pin: second_mcu:main_extruder_cs_pin +spi_software_sclk_pin: second_mcu:PA5 +spi_software_mosi_pin: second_mcu:PA7 +spi_software_miso_pin: second_mcu:PA6 +# spi_bus: spi1 #diag1_pin: PG11 run_current: 0.700 interpolate: False #stealthchop_threshold: 999999 [tmc2130 extruder1] -cs_pin: second_mcu:PF13 -spi_bus: spi1 +cs_pin: second_mcu:second_extruder_cs_pin +spi_software_sclk_pin: second_mcu:PA5 +spi_software_mosi_pin: second_mcu:PA7 +spi_software_miso_pin: second_mcu:PA6 +# spi_bus: spi1 #diag1_pin: PG11 run_current: 0.700 interpolate: False #stealthchop_threshold: 999999 -[tmc2130 fiber_extruder] -cs_pin: second_mcu:PF9 -spi_bus: spi1 +[tmc2130 extruder2] +cs_pin: second_mcu:fiber_extruder_cs_pin +spi_software_sclk_pin: second_mcu:PA5 +spi_software_mosi_pin: second_mcu:PA7 +spi_software_miso_pin: second_mcu:PA6 +# spi_bus: spi1 #diag1_pin: PG11 run_current: 0.700 interpolate: False -#stealthchop_threshold: 999999 \ No newline at end of file +#stealthchop_threshold: 999999 diff --git a/stereotech_config/v6/main_extruder.cfg b/stereotech_config/v6/main_extruder.cfg index b94e8f62cbb0..7caad0136ac7 100644 --- a/stereotech_config/v6/main_extruder.cfg +++ b/stereotech_config/v6/main_extruder.cfg @@ -1,14 +1,14 @@ [extruder] -step_pin: main_extruder_step_pin -dir_pin: main_extruder_dir_pin -enable_pin: !main_extruder_enable_pin +step_pin: second_mcu:main_extruder_step_pin +dir_pin: second_mcu:main_extruder_dir_pin +enable_pin: !second_mcu:main_extruder_enable_pin microsteps: 16 rotation_distance: 7.777 nozzle_diameter: 0.4 filament_diameter: 1.75 -heater_pin: main_extruder_heater_pin +heater_pin: second_mcu:main_extruder_heater_pin sensor_type: Trianglelab T-D500 -sensor_pin: main_extruder_sensor_pin +sensor_pin: second_mcu:main_extruder_sensor_pin control: pid pid_Kp: 13.509 pid_Ki: 0.566 @@ -19,17 +19,17 @@ min_extrude_temp: 100 max_extrude_only_distance: 300.0 max_extrude_cross_section: 2.56 -[heater_generic main_nozzle_blower_heater] -gcode_id: E0 -heater_pin: main_nozzle_blower_heater -sensor_type: ATC Semitec 104GT-2 -sensor_pin: main_nozzle_blower_sensor -control: pid -pid_Kp: 13.509 -pid_Ki: 0.566 -pid_Kd: 80.549 -min_temp: -150 -max_temp: 320 +# [heater_generic main_nozzle_blower_heater] +# gcode_id: E0 +# heater_pin: main_nozzle_blower_heater +# sensor_type: ATC Semitec 104GT-2 +# sensor_pin: main_nozzle_blower_sensor +# control: pid +# pid_Kp: 13.509 +# pid_Ki: 0.566 +# pid_Kd: 80.549 +# min_temp: -150 +# max_temp: 320 # [gcode_macro T0] # gcode: diff --git a/stereotech_config/v6/module_3d.cfg b/stereotech_config/v6/module_3d.cfg index fae9d3b97bf9..88f29d10e074 100644 --- a/stereotech_config/v6/module_3d.cfg +++ b/stereotech_config/v6/module_3d.cfg @@ -1,13 +1,13 @@ -[heater_bed] -heater_pin: bed_heater -sensor_type: ATC Semitec 104GT-2 -sensor_pin: bed_sensor -control: pid -pid_Kp: 63.164 -pid_Ki: 2.379 -pid_Kd: 419.254 -min_temp: -100 -max_temp: 130 +# [heater_bed] +# heater_pin: bed_heater +# sensor_type: ATC Semitec 104GT-2 +# sensor_pin: bed_sensor +# control: pid +# pid_Kp: 63.164 +# pid_Ki: 2.379 +# pid_Kd: 419.254 +# min_temp: -100 +# max_temp: 130 ;[bed_screws] ;horizontal_move_z: 10.0 diff --git a/stereotech_config/v6/module_5d.cfg b/stereotech_config/v6/module_5d.cfg new file mode 100644 index 000000000000..831e91f43e0e --- /dev/null +++ b/stereotech_config/v6/module_5d.cfg @@ -0,0 +1,98 @@ +# [gcode_button five_axis_module] +# pin: !five_axis_pin +# press_gcode: QUERY_BUTTON BUTTON=five_axis_module + +# # [a_axis_offset] + +# [gcode_macro MOVE_WCS_ZERO] +# gcode: +# G54 +# {% if printer.toolhead.axis_maximum[0] > 250 %} +# G0 Z150 F6000 +# {% else %} +# G0 Z100 F6000 +# {% endif %} +# {% set current_wcs = params.WCS|default(1)|int %} +# {% set offsets = printer.gcode_move.wcs_offsets[current_wcs] %} +# {% if offsets[0] == 0 and offsets[1] == 0 %} +# {% if printer.toolhead.axis_maximum[0] > 250 %} +# G0 X162 Y242 F6000 +# {% else %} +# G0 X107 Y137 F6000 +# {% endif %} +# {% else %} +# G0 X{offsets[0]} Y{offsets[1]} F6000 +# {% endif %} +# {% if current_wcs == 1 %} +# G0 A0 +# {% elif current_wcs == 2 %} +# {% if printer.toolhead.axis_maximum[0] > 250 %} +# G0 Y192 A90 F6000 +# {% else %} +# G0 Y87 A90 F6000 +# {% endif %} +# {% endif %} + +# [gcode_macro SET_WCS_OFFSET] +# gcode: +# G54 +# G90 +# {% set current_wcs = params.WCS|default(1)|int %} +# SET_WCS WCS={current_wcs} +# G10 L20 X{params.X} Y{params.Y} Z{params.Z} +# G54 +# {% set adjust_wcs = params.ADJUST_WCS|default(0)|int %} +# {% if adjust_wcs > 0 and adjust_wcs != current_wcs %} +# ADJUST_WCS_OFFSET WCS={current_wcs} ADJUST_WCS={adjust_wcs} X={params.X} Y={params.Y} Z={params.Z} +# {% endif %} + +# [gcode_macro ADJUST_WCS_OFFSET] +# gcode: +# {% set current_wcs = params.WCS|default(1)|int %} +# {% set adjust_wcs = params.ADJUST_WCS|default(0)|int %} +# {% set source_wcs = current_wcs + 2 %} +# {% set source_wcs_2 = adjust_wcs + 2 %} +# {% set offsets = printer.gcode_move.wcs_offsets[source_wcs] %} +# {% set offsets_2 = printer.gcode_move.wcs_offsets[source_wcs_2] %} +# {% set delta_x = printer.gcode_move.wcs_offsets[current_wcs][0] - offsets[0] %} +# {% set delta_y = printer.gcode_move.wcs_offsets[current_wcs][1] - offsets[1] %} +# {% set delta_z = printer.gcode_move.wcs_offsets[current_wcs][2] - offsets[2] %} +# G10 L2 P{adjust_wcs + 1} X{offsets_2[0] + delta_x + params.X|float} Y{offsets_2[1] - delta_z + params.Z|float} Z{offsets_2[2] + delta_y + params.Y|float} + +# [gcode_macro MOVE_CALIBRATION_POINT] +# gcode: +# G54 +# {% set point = params.POINT|default(0)|int %} +# {% set x = 162 if printer.toolhead.axis_maximum[0] > 250 else 108 %} +# {% set y = 242 if printer.toolhead.axis_maximum[0] > 250 else 137 %} +# {% if point == 3 or point == 4 %} +# {% set y = 192 if printer.toolhead.axis_maximum[0] > 250 else 87 %} +# {% endif %} +# {% if point == 1 %} +# {% set x = 112 if printer.toolhead.axis_maximum[0] > 250 else 58 %} +# {% endif %} +# {% if point == 2 %} +# {% set x = 212 if printer.toolhead.axis_maximum[0] > 250 else 158 %} +# {% endif %} +# G0 A0 +# G0 X{x} Y{y} Z110 F3600 +# {% if point > 3 %} +# G0 Z70 A90 F3600 +# {% endif %} + + +# [gcode_macro SET_A_AXIS_OFFSET_POINT] +# gcode: +# {% set point = params.POINT|default(0)|int %} +# {% set coord_x = printer.gcode_move.position.x %} +# {% set coord_y = printer.gcode_move.position.y %} +# {% set coord_z = printer.gcode_move.position.z %} +# SAVE_A_AXIS_POINT POINT={point} COORDS={coord_x},{coord_y},{coord_z} + +# [gcode_macro SAVE_STATE_MODULE] +# gcode: +# {% if printer["gcode_button five_axis_module"].state == "RELEASED" %} +# SAVE_VARIABLE VARIABLE=5d_module_enabled VALUE=0 +# {% else %} +# SAVE_VARIABLE VARIABLE=5d_module_enabled VALUE=1 +# {% endif %} diff --git a/stereotech_config/v6/printhead.cfg b/stereotech_config/v6/printhead.cfg index 891d361bb7e3..609bdc72f536 100644 --- a/stereotech_config/v6/printhead.cfg +++ b/stereotech_config/v6/printhead.cfg @@ -1,9 +1,9 @@ -[heater_fan printhead_fan] -pin: cooling_fan_heat -heater: extruder, extruder1, extruder2 -heater_temp: 50.0 +# [heater_fan printhead_fan] +# pin: cooling_fan_heat +# heater: extruder, extruder1, extruder2 +# heater_temp: 50.0 -[heater_fan heatsink_fan] -pin: fan_pump_cooling, pump -heater: extruder, extruder1, extruder2 -heater_temp: 50.0 +# [heater_fan heatsink_fan] +# pin: fan_pump_cooling, pump +# heater: extruder, extruder1, extruder2 +# heater_temp: 50.0 diff --git a/stereotech_config/v6/second_extruder.cfg b/stereotech_config/v6/second_extruder.cfg index 03fa06c3b3b8..935e10bfb2b2 100644 --- a/stereotech_config/v6/second_extruder.cfg +++ b/stereotech_config/v6/second_extruder.cfg @@ -1,14 +1,14 @@ [extruder1] -step_pin: second_extruder_step_pin -dir_pin: second_extruder_dir_pin -enable_pin: !second_extruder_enable_pin +step_pin: second_mcu:second_extruder_step_pin +dir_pin: second_mcu:second_extruder_dir_pin +enable_pin: !second_mcu:second_extruder_enable_pin microsteps: 16 rotation_distance: 7.777 nozzle_diameter: 0.4 filament_diameter: 1.75 -heater_pin: second_extruder_heater_pin +heater_pin: second_mcu:second_extruder_heater_pin sensor_type: Trianglelab T-D500 -sensor_pin: second_extruder_sensor_pin +sensor_pin: second_mcu:second_extruder_sensor_pin control: pid pid_Kp: 13.509 pid_Ki: 0.566 @@ -19,17 +19,17 @@ min_extrude_temp: 100 max_extrude_only_distance: 300.0 max_extrude_cross_section: 2.56 -[heater_generic second_nozzle_blower_heater] -gcode_id: E1 -heater_pin: second_nozzle_blower_heater -sensor_type: ATC Semitec 104GT-2 -sensor_pin: second_nozzle_blower_sensor -control: pid -pid_Kp: 13.509 -pid_Ki: 0.566 -pid_Kd: 80.549 -min_temp: -150 -max_temp: 320 +# [heater_generic second_nozzle_blower_heater] +# gcode_id: E1 +# heater_pin: second_nozzle_blower_heater +# sensor_type: ATC Semitec 104GT-2 +# sensor_pin: second_nozzle_blower_sensor +# control: pid +# pid_Kp: 13.509 +# pid_Ki: 0.566 +# pid_Kd: 80.549 +# min_temp: -150 +# max_temp: 320 # [gcode_macro T1] # variable_t1_offset_enabled: 0.0