Skip to content

Fix Player.cpp to use metric, then switch back to previously set unit #20

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

Open
Ajeff22209 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Player.cpp to use metric, then switch back to previously set unit #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/modules/utils/player/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,12 +931,20 @@ void Player::resume_command(string parameters, StreamOutput *stream )
THEROBOT->absolute_mode = true;

char buf[128];
snprintf(buf, sizeof(buf), "G1 X%.3f Y%.3f Z%.3f F%.3f", saved_position[0], saved_position[1], saved_position[2], THEROBOT->from_millimeters(1000));
char buf2[128];
snprintf(buf, sizeof(buf), "G21 G1 X%.3f Y%.3f Z%.3f F%.3f", saved_position[0], saved_position[1], saved_position[2], THEROBOT->from_millimeters(1000));
snprintf(buf2, sizeof(buf), "G%i", THEROBOT->inch_mode ? 20 : 21);
stream->printf("G%i\n",THEROBOT->inch_mode ? 20 : 21);
struct SerialMessage message;
message.message = buf;
message.stream = &(StreamOutput::NullStream);
message.line = 0;
THEKERNEL->call_event(ON_CONSOLE_LINE_RECEIVED, &message );
// fixed ur bug 3863 Pantherbotics -- Rohan & Alex
message.message= buf2;
message.line = 0;
THEKERNEL->call_event(ON_CONSOLE_LINE_RECEIVED, &message);


if (current_motion_mode > 1) {
snprintf(buf, sizeof(buf), "G%d", current_motion_mode - 1);
Expand Down