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

Indent Comments to Match Surrounding Code #313

Merged
merged 1 commit into from
Sep 26, 2017
Merged

Indent Comments to Match Surrounding Code #313

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
16 changes: 8 additions & 8 deletions cnc_ctrl_v1/CNC_Functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,10 +400,10 @@ float computeStepSize(const float& MMPerMin){

int cordinatedMove(const float& xEnd, const float& yEnd, const float& MMPerMin){

/*The move() function moves the tool in a straight line to the position (xEnd, yEnd) at
the speed moveSpeed. Movements are correlated so that regardless of the distances moved in each
direction, the tool moves to the target in a straight line. This function is used by the G00
and G01 commands. The units at this point should all be in mm or mm per minute*/
/*The move() function moves the tool in a straight line to the position (xEnd, yEnd) at
the speed moveSpeed. Movements are correlated so that regardless of the distances moved in each
direction, the tool moves to the target in a straight line. This function is used by the G00
and G01 commands. The units at this point should all be in mm or mm per minute*/

float xStartingLocation = xTarget;
float yStartingLocation = yTarget;
Expand Down Expand Up @@ -557,8 +557,8 @@ int findEndOfNumber(const String& textString, const int& index){

float extractGcodeValue(const String& readString, char target, const float& defaultReturn){

/*Reads a string and returns the value of number following the target character.
If no number is found, defaultReturn is returned*/
/*Reads a string and returns the value of number following the target character.
If no number is found, defaultReturn is returned*/

int begin;
int end;
Expand All @@ -580,8 +580,8 @@ If no number is found, defaultReturn is returned*/

int G1(const String& readString, int G0orG1){

/*G1() is the function which is called to process the string if it begins with
'G01' or 'G00'*/
/*G1() is the function which is called to process the string if it begins with
'G01' or 'G00'*/

float xgoto;
float ygoto;
Expand Down