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.

Sign up for GitHub

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-590: adapted the calibrate commands for Ender. #150

Merged
merged 6 commits into from
Jul 25, 2023
Merged

STEAPP-590: adapted the calibrate commands for Ender. #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff39dc3
STEAPP-460: added main configs file.
SokolovJek Jul 21, 2023
07d9dcd
STEAPP-460: added main configs for moving axes.
SokolovJek Jul 24, 2023
d92281d
STEAPP-460: added config for printing.
SokolovJek Jul 24, 2023
b3367f0
STEAPP-460: adapted the command G28 and actions for vars.cfg.
SokolovJek Jul 24, 2023
d87d2fe
STEAPP-590: adapted calibrate command.
SokolovJek Jul 24, 2023
11f74e3
Merge branch 'develop' into STEAPP-590
frylock34 Jul 25, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,26 @@
// "-l",
// "/tmp/dev_klipper_log.log"
]
},
{
"name": "Run klipper ender",
"type": "python",
"request": "launch",
"env": {
"PYTHONPATH": "${workspaceRoot}"
},
"stopOnEntry": false,
"console": "integratedTerminal",
"cwd": "${workspaceRoot}",
"program": "${workspaceFolder}/klippy/klippy.py",
"args": [
"${workspaceFolder}/ENDER-23.cfg",
"-v",
"-a",
"/tmp/klipper_uds",
// "-l",
// "/tmp/dev_klipper_log.log"
]
}
]
}
2 changes: 2 additions & 0 deletions ENDER-23.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ path: /home/ste/uploads
[include stereotech_config/ender/print_macros.cfg]
[include stereotech_config/ender/extruder_macros.cfg]
[include stereotech_config/ender/variables.cfg]

[include stereotech_config/ender/probe.cfg]
4 changes: 2 additions & 2 deletions stereotech_config/ender/kinematics.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
kinematics: cartesian_6axis
max_velocity: 300
max_accel: 3000
max_z_velocity: 40
max_z_accel: 500
max_z_velocity: 20
max_z_accel: 100
square_corner_velocity: 2.50

[stepper_x]
Expand Down
45 changes: 22 additions & 23 deletions stereotech_config/ender/module_5d.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,20 @@ press_gcode: QUERY_BUTTON BUTTON=five_axis_module

[gcode_macro MOVE_WCS_ZERO]
gcode:
{% set z_max = printer.toolhead.axis_maximum %}
G54
{% if printer.toolhead.axis_maximum[0] > 250 %}
G0 Z150 F6000
{% else %}
G0 Z100 F6000
{% endif %}
G0 Z{z_max[2]} F6000
{% 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 %}
G0 X125 Y50 F6000
{% 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 %}
G0 Y87 A90 F6000
{% endif %}

[gcode_macro SET_WCS_OFFSET]
Expand Down Expand Up @@ -63,24 +52,34 @@ gcode:
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 %}
{% set x = 108 %}
{% set y = 80 %}

{% if point == 3 or point == 4 %}
{% set y = 192 if printer.toolhead.axis_maximum[0] > 250 else 87 %}
{% set y = 87 %}
{% endif %}

{% if point == 1 %}
{% set x = 112 if printer.toolhead.axis_maximum[0] > 250 else 58 %}
{% set x = 58 %}
{% endif %}

{% if point == 2 %}
{% set x = 212 if printer.toolhead.axis_maximum[0] > 250 else 158 %}
{% set x = 158 %}
{% endif %}
G0 A0
G0 X{x} Y{y} Z110 F3600
# G0 X{x} Y{y} Z110 F3600
# point0
# G0 X108 Y80 Z130 F600
# point1
# G0 X58 Y80 Z130 F600
# point2
# G0 X158 Y80 Z130 F600
# point4
# G0 X158 Y87 Z130 F600
{% if point > 3 %}
G0 Z70 A90 F3600
G0 Z150 A90 F600
{% endif %}


[gcode_macro SET_A_AXIS_OFFSET_POINT]
gcode:
{% set point = params.POINT|default(0)|int %}
Expand Down
Loading