Merge pull request #2677 from petterreinholdtsen/2.9-g71-fix-707

Corrected G72 behaviour with no axis movement.

Author: andypugh

src/emc/rs274ngc/interp_g7x.cc

@@ -1191,8 +1191,24 @@ int Interp::convert_g7x(int mode,
     try {
 	switch(cycle) {
 	case 70: path.do_g70(&motion,x,z,d,e,p); break;
-	case 71: path.do_g71(&motion,subcycle,x,z,u,w,d,i,r); break;
-	case 72: path.do_g72(&motion,subcycle,x,z,u,w,d,i,r); break;
+	case 71:
+	    if(x!=imag(start)) {
+		std::complex<double> end{real(start),x};
+		path.emplace_back(std::make_unique<straight_segment>(
+		    start, end
+		));
+	    }
+	    path.do_g71(&motion,subcycle,x,z,u,w,d,i,r);
+	    break;
+	case 72:
+	    if(z!=real(start)) {
+		std::complex<double> end{z,imag(start)};
+		path.emplace_back(std::make_unique<straight_segment>(
+		    start, end
+		));
+	    }
+	    path.do_g72(&motion,subcycle,x,z,u,w,d,i,r);
+	    break;
 	}
     } catch(std::string &s) {
 	ERS("G7X error: %s", s.c_str());

tests/interp/g72-missing-iteration/expected

@@ -89,7 +89,7 @@
  N..... STRAIGHT_TRAVERSE(50.1000, 0.0000, -38.9000, 0.0000, 0.0000, 0.0000)
  N..... STRAIGHT_TRAVERSE(50.0000, 0.0000, -39.0000, 0.0000, 0.0000, 0.0000)
  N..... STRAIGHT_TRAVERSE(50.0000, 0.0000, -40.0000, 0.0000, 0.0000, 0.0000)
- N..... STRAIGHT_FEED(100.0000, 0.0000, -39.9990, 0.0000, 0.0000, 0.0000)
+ N..... STRAIGHT_FEED(100.0000, 0.0000, -40.0000, 0.0000, 0.0000, 0.0000)
  N..... STRAIGHT_FEED(100.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
  N..... STRAIGHT_TRAVERSE(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
  N..... SET_G5X_OFFSET(1, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)