Skip to content

Commit

Permalink
Merge pull request #180 from MaslowCNC/fix-for-setting-z-axis-on-and-off
Browse files Browse the repository at this point in the history
add back in the ability to turn on and off the z-axis
  • Loading branch information
BarbourSmith authored Apr 19, 2017
2 parents 71ae73d + 31c88ec commit 2bc0bf8
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions cnc_ctrl_v1/CNC_Functions.h
Original file line number Diff line number Diff line change
Expand Up @@ -623,15 +623,16 @@ void updateSettings(String readString){
float motorOffsetY = extractGcodeValue(readString, 'E', motorOffsetY);
float sledWidth = extractGcodeValue(readString, 'F', kinematics.l);
float sledHeight = extractGcodeValue(readString, 'R', kinematics.s);
float sledCG = extractGcodeValue(readString, 'H', kinematics.h3);
float sledCG = extractGcodeValue(readString, 'H', kinematics.h3);*/
zAxisAttached = extractGcodeValue(readString, 'I', zAxisAttached);
int encoderSteps = extractGcodeValue(readString, 'J', ENCODERSTEPS);
/*int encoderSteps = extractGcodeValue(readString, 'J', ENCODERSTEPS);
float gearTeeth = extractGcodeValue(readString, 'K', 10);
float chainPitch = extractGcodeValue(readString, 'M', 6.35);
*/
float zDistPerRot = extractGcodeValue(readString, 'N', ZDISTPERROT);
int zEncoderSteps = extractGcodeValue(readString, 'P', ZENCODERSTEPS);

//Change the motor properties in cnc_funtions
/*//Change the motor properties in cnc_funtions
float distPerRot = gearTeeth*chainPitch;
leftAxis.changePitch(distPerRot);
rightAxis.changePitch(distPerRot);
Expand Down

0 comments on commit 2bc0bf8

Please sign in to comment.