Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STEAPP-553: edited and checking config with use two mcu. #140

Merged
merged 1 commit into from
Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
]
}
47 changes: 47 additions & 0 deletions HTE600-0-0-23.cfg
Original file line number Diff line number Diff line change
@@ -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]
66 changes: 37 additions & 29 deletions stereotech_config/HTE600-0-0-23.cfg
Original file line number Diff line number Diff line change
@@ -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]
10 changes: 8 additions & 2 deletions stereotech_config/mcu/stm32f446.config
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -85,15 +87,19 @@ 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
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
Expand Down
36 changes: 33 additions & 3 deletions stereotech_config/mcu/stm32g0b1.config
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
45 changes: 0 additions & 45 deletions stereotech_config/v6/board_stm.cfg

This file was deleted.

24 changes: 24 additions & 0 deletions stereotech_config/v6/board_stm32f4.cfg
Original file line number Diff line number Diff line change
@@ -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,
16 changes: 16 additions & 0 deletions stereotech_config/v6/board_stm32g1b0.cfg
Original file line number Diff line number Diff line change
@@ -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,
Loading