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

Fix selected tool param #1381

Merged
merged 6 commits into from
Nov 17, 2024
Merged

Fix selected tool param #1381

merged 6 commits into from
Nov 17, 2024

Conversation

bdring
Copy link
Owner

@bdring bdring commented Nov 15, 2024

Current and selected tools now report separately and accurately.

@bdring
Copy link
Owner Author

bdring commented Nov 15, 2024

Test data from the gcode in the fixtures folder

-> $X
<~ [MSG:INFO: Caution: Unlocked]
<- ok
-> $G
<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T0 F0 S0]
<- ok
-> (print, Cur tool=%d#<_current_tool>, Sel tool=%d#<_selected_tool>)
<- [MSG:INFO: PRINT, Cur tool=-1 Sel tool=0]
<- ok
-> T1
<- ok
-> $G
<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T1 F0 S0]
<- ok
-> (print, Cur tool=%d#<_current_tool>, Sel tool=%d#<_selected_tool>)
<- [MSG:INFO: PRINT, Cur tool=-1 Sel tool=1]
<- ok
-> M6
<- ok
-> $G
<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T1 F0 S0]
<- ok
-> (print, Cur tool=%d#<_current_tool>, Sel tool=%d#<_selected_tool>)
<- [MSG:INFO: PRINT, Cur tool=1 Sel tool=1]
<- ok
-> M6T2
<- ok
-> $G
<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T2 F0 S0]
<- ok
-> (print, Cur tool=%d#<_current_tool>, Sel tool=%d#<_selected_tool>)
<- [MSG:INFO: PRINT, Cur tool=2 Sel tool=2]
<- ok
-> (print, Cur tool=%d#<_current_tool>)
<- [MSG:INFO: PRINT, Cur tool=2]
<- ok
-> (print, Sel tool=%d#<_selected_tool>)
<- [MSG:INFO: PRINT, Sel tool=2]
<- ok
-> M61Q3
<- ok
-> $G
<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T3 F0 S0]
<- ok
-> (print, Cur tool=%d#<_current_tool>, Sel tool=%d#<_selected_tool>)
<- [MSG:INFO: PRINT, Cur tool=3 Sel tool=3]
<- ok
-> M6T0
<- ok
-> $G
<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T0 F0 S0]
<- ok
-> (print, Cur tool=%d#<_current_tool>, Sel tool=%d#<_selected_tool>)
<- [MSG:INFO: PRINT, Cur tool=0 Sel tool=0]
<- ok
--- Fixture ./fixtures/current_tool_test.nc passed ---

Removed commented-out line
@MitchBradley MitchBradley merged commit 119a8b4 into main Nov 17, 2024
24 checks passed
@bdring bdring deleted the Fix_selected_tool_param branch November 17, 2024 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants