Skip to content

Commit 42d21c1

Browse files
authored
Merge pull request #139 from MaslowCNC/print--ready--after-all-commands
Print ready after all commands
2 parents 2145f5a + b7c3f3b commit 42d21c1

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

cnc_ctrl_v1/CNC_Functions.h

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -611,33 +611,39 @@ void interpretCommandString(String readString){
611611
if(readString.substring(0, 3) == "G10"){
612612
G10(readString);
613613
Serial.println("gready");
614+
Serial.println("ready");
614615
readString = "";
615616
}
616617

617618
if(readString.substring(0, 3) == "G17"){ //XY plane is the default so no action is taken
618619
Serial.println("gready");
620+
Serial.println("ready");
619621
readString = "";
620622
}
621623

622624
if(readString.substring(0, 3) == "G20"){
623625
setInchesToMillimetersConversion(INCHES);
624626
Serial.println("gready");
627+
Serial.println("ready");
625628
readString = "";
626629
}
627630

628631
if(readString.substring(0, 3) == "G21"){
629632
setInchesToMillimetersConversion(MILLIMETERS);
630633
Serial.println("gready");
634+
Serial.println("ready");
631635
readString = "";
632636
}
633637

634638
if(readString.substring(0, 3) == "G90"){ //G90 is the default so no action is taken
635639
Serial.println("gready");
640+
Serial.println("ready");
636641
readString = "";
637642
}
638643

639644
if(readString.substring(0, 3) == "M06"){ //Tool change are default so no action is taken
640645
Serial.println("gready");
646+
Serial.println("ready");
641647
readString = "";
642648
}
643649

@@ -646,28 +652,23 @@ void interpretCommandString(String readString){
646652
leftAxis.computeMotorResponse();
647653
rightAxis.computeMotorResponse();
648654

649-
//Serial.println("Begin motion testing: ");
650-
651-
/*for(int i = 0; i > -256; i = i - 10){
652-
Serial.print(i);
653-
Serial.print("->");
654-
Serial.println(leftAxis.measureMotorSpeed(i));
655-
}*/
656-
657655
readString = "";
658656
Serial.println("gready");
657+
Serial.println("ready");
659658
}
660659

661660
if(readString.substring(0, 3) == "B02"){
662661
calibrateChainLengths();
663662
readString = "";
664663
Serial.println("gready");
664+
Serial.println("ready");
665665
}
666666

667667
if(readString.substring(0, 3) == "B03"){
668668
updateSettings(readString);
669669
readString = "";
670670
Serial.println("gready");
671+
Serial.println("ready");
671672
}
672673

673674
if(readString.substring(0, 3) == "B04"){
@@ -681,25 +682,29 @@ void interpretCommandString(String readString){
681682
Serial.println("Tests complete.");
682683
readString = "";
683684
Serial.println("gready");
685+
Serial.println("ready");
684686
}
685687

686688
if(readString.substring(0, 3) == "B05"){
687689
Serial.print("Firmware Version ");
688690
Serial.println(VERSIONNUMBER);
689691
readString = "";
690692
Serial.println("gready");
693+
Serial.println("ready");
691694
}
692695

693696
if((readString[0] == 'T' || readString[0] == 't') && readString[1] != 'e'){
694697
Serial.print("Please insert tool ");
695698
Serial.println(readString);
696699
Serial.println("gready");
700+
Serial.println("ready");
697701
readString = "";
698702
}
699703

700704
if (readString.length() > 0){
701705
Serial.println(readString);
702706
readString = "";
703707
Serial.println("gready");
708+
Serial.println("ready");
704709
}
705710
}

0 commit comments

Comments
 (0)