Skip to content

Commit

Permalink
Merge pull request #170 from MaslowCNC/make-firmware-print-only-one-m…
Browse files Browse the repository at this point in the history
…otor-error

Make error term display for both motors
  • Loading branch information
BarbourSmith authored Apr 12, 2017
2 parents d7745c4 + dd74604 commit 7907ee4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cnc_ctrl_v1/CNC_Functions.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ void returnPoz(float x, float y, float z){
int timeout = 200;

if (millis() - lastRan > timeout){
float errorTerm = (leftAxis.error() + rightAxis.error() )/2;


Serial.print("<Idle,MPos:");
Serial.print(x/_inchesToMMConversion);
Expand All @@ -104,7 +102,9 @@ void returnPoz(float x, float y, float z){
Serial.println(",WPos:0.000,0.000,0.000>");

Serial.print("[PosError:");
Serial.print(errorTerm);
Serial.print(leftAxis.error());
Serial.print(',');
Serial.print(rightAxis.error());
Serial.println("]");

lastRan = millis();
Expand Down

0 comments on commit 7907ee4

Please sign in to comment.