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

Implement G60 / G61 to meet spec #27281

Merged
merged 16 commits into from
Jul 26, 2024

Conversation

karcaw
Copy link
Contributor

@karcaw karcaw commented Jul 16, 2024

This Fixes the case where no Integers were specified on the G61 command:

G60
G0 X100 Y100 Z20
G61 X Y  

does not return to the last location as :

G60
G0 X100 Y100 Z20
G61 X0 Y0

does. this matches what the spec says:
https://marlinfw.org/docs/gcode/G061.html
which does not even document you can put an integer after the axis letters.

Description

Fix for #26222

Requirements

No

Benefits

G61 will work according to the spec.

Configurations

Related Issues

(#26222)

This Fixes the case where no Integers were specified on the G61 command:
```
G60
G0 X100 Y100 Z20
G61 X Y  
```
does not return to the last location as :
```
G60
G0 X100 Y100 Z20
G61 X0 Y0
```
does.  this matches what the spec says:
https://marlinfw.org/docs/gcode/G061.html
which does not even document you can put an integer after the axis letters.
@thinkyhead
Copy link
Member

It may be that the implementation of G61 itself has been wrong from the start. Also, we don't have a clear specification for applying G61 E<num>. Also, it is notable that the RepRap wiki has no entry for this G-code. So we'll need to look at the specification and implementation in some other firmwares, and also see how our G60 compares to some others.

@thinkyhead
Copy link
Member

At first glance, it appears our G61 is intended to work just like G60 Q in other firmwares.

@thinkyhead
Copy link
Member

thinkyhead commented Jul 19, 2024

I went ahead and modified G60 to match the description from the RepRap wiki, and added a note to the wiki about the offsets. I also added G61 to the wiki. I'll be sure to update our own G60 / G61 documentation once this is merged.

@thinkyhead thinkyhead force-pushed the karcaw-fix-g61 branch 2 times, most recently from 9568ce5 to 85a84cc Compare July 22, 2024 02:43
@thinkyhead thinkyhead changed the title Fix No Integer restore in G61 Implement G60 / G61 to meet spec Jul 26, 2024
@thinkyhead thinkyhead merged commit 78e111a into MarlinFirmware:bugfix-2.1.x Jul 26, 2024
63 checks passed
thinkyhead added a commit to MarlinFirmware/MarlinDocumentation that referenced this pull request Jul 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] G61 does not return to saved position when Axis specified without an offset
2 participants