summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Geszkiewicz <micges@wp.pl>2010-04-15 18:59:54 +0200
committerMichael Geszkiewicz <micges@wp.pl>2010-04-15 18:59:54 +0200
commit06b93f6f250d7c97f691cccc81efa3c754fec436 (patch)
treeae94780f66140a29a0256c90d235c9e3557612d5
parent1904aa313f17bfb6ff48058c1c00697cfdceea04 (diff)
downloadlinuxcnc-06b93f6f250d7c97f691cccc81efa3c754fec436.tar.gz
linuxcnc-06b93f6f250d7c97f691cccc81efa3c754fec436.zip
Revert "make sure that canon path control mode is equal motion path control mode"
This reverts commit 74ce25ac44d72ba18c5a229ef813cae0377bc26b. This introduced bug that after program abort task was hanging out for a while and machine moves in some direction
Diffstat
-rw-r--r--src/emc/rs274ngc/rs274ngc_pre.cc5
-rw-r--r--tests/ccomp/lathe-comp/expected1
-rw-r--r--tests/ccomp/mill-g90g91g92/expected1
-rw-r--r--tests/ccomp/mill-line-arc-entry/expected1
-rw-r--r--tests/ccomp/mill-zchanges/expected1
-rw-r--r--tests/interp/cam-nisley/expected1
-rw-r--r--tests/interp/crazy-paths/expected1
-rw-r--r--tests/interp/flowsnake/expected1
-rw-r--r--tests/interp/g6164/expected1
-rw-r--r--tests/interp/g76/expected1
-rw-r--r--tests/interp/inside-corners/expected1
-rw-r--r--tests/interp/inverse-time-with-comp/expected1
-rw-r--r--tests/oword/sub.0/expected1
13 files changed, 1 insertions, 16 deletions
diff --git a/src/emc/rs274ngc/rs274ngc_pre.cc b/src/emc/rs274ngc/rs274ngc_pre.cc
index 40ffd26c8..03cae1cd9 100644
--- a/src/emc/rs274ngc/rs274ngc_pre.cc
+++ b/src/emc/rs274ngc/rs274ngc_pre.cc
@@ -1125,13 +1125,10 @@ the controller.
int Interp::synch()
{
- double tolerance;
+
char file_name[LINELEN];
_setup.control_mode = GET_EXTERNAL_MOTION_CONTROL_MODE();
- tolerance = GET_EXTERNAL_MOTION_CONTROL_TOLERANCE();
- SET_MOTION_CONTROL_MODE(_setup.control_mode, tolerance);
-
_setup.AA_current = GET_EXTERNAL_POSITION_A();
_setup.BB_current = GET_EXTERNAL_POSITION_B();
_setup.CC_current = GET_EXTERNAL_POSITION_C();
diff --git a/tests/ccomp/lathe-comp/expected b/tests/ccomp/lathe-comp/expected
index 06fe15989..a8a7d4687 100644
--- a/tests/ccomp/lathe-comp/expected
+++ b/tests/ccomp/lathe-comp/expected
@@ -2,7 +2,6 @@
N..... SET_ORIGIN_OFFSETS(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... SET_FEED_RATE(30.0000)
N..... SELECT_PLANE(CANON_PLANE_XZ)
N..... USE_LENGTH_UNITS(CANON_UNITS_INCHES)
diff --git a/tests/ccomp/mill-g90g91g92/expected b/tests/ccomp/mill-g90g91g92/expected
index ad1e4f999..faa815811 100644
--- a/tests/ccomp/mill-g90g91g92/expected
+++ b/tests/ccomp/mill-g90g91g92/expected
@@ -2,7 +2,6 @@
N..... SET_ORIGIN_OFFSETS(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... USE_LENGTH_UNITS(CANON_UNITS_INCHES)
N..... SELECT_POCKET(3)
N..... STOP_SPINDLE_TURNING()
diff --git a/tests/ccomp/mill-line-arc-entry/expected b/tests/ccomp/mill-line-arc-entry/expected
index 49d15320d..3d8c2ff75 100644
--- a/tests/ccomp/mill-line-arc-entry/expected
+++ b/tests/ccomp/mill-line-arc-entry/expected
@@ -2,7 +2,6 @@
N..... SET_ORIGIN_OFFSETS(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... COMMENT("this is the program describing entry moves for")
N..... COMMENT("radius compensation in Figure 3 of the Handbook")
N..... COMMENT("http://www.linuxcnc.org/handbook/RS274NGC_3/RS274NGC_38a.html#999268")
diff --git a/tests/ccomp/mill-zchanges/expected b/tests/ccomp/mill-zchanges/expected
index 9848ae8df..80d3a8232 100644
--- a/tests/ccomp/mill-zchanges/expected
+++ b/tests/ccomp/mill-zchanges/expected
@@ -2,7 +2,6 @@
N..... SET_ORIGIN_OFFSETS(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... SET_FEED_RATE(60.0000)
N..... USE_LENGTH_UNITS(CANON_UNITS_INCHES)
N..... COMMENT("arc entry")
diff --git a/tests/interp/cam-nisley/expected b/tests/interp/cam-nisley/expected
index 00560861e..586d245bc 100644
--- a/tests/interp/cam-nisley/expected
+++ b/tests/interp/cam-nisley/expected
@@ -2,7 +2,6 @@
N..... SET_ORIGIN_OFFSETS(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... COMMENT("Storm door latch cam ")
N..... COMMENT("Outside milling, clamped on center axis")
N..... COMMENT("Ed Nisley - Nov 2006 - Mar 2007")
diff --git a/tests/interp/crazy-paths/expected b/tests/interp/crazy-paths/expected
index ea84bbc23..482576304 100644
--- a/tests/interp/crazy-paths/expected
+++ b/tests/interp/crazy-paths/expected
@@ -2,7 +2,6 @@
N..... SET_ORIGIN_OFFSETS(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... SET_FEED_RATE(100.0000)
N..... USE_LENGTH_UNITS(CANON_UNITS_MM)
N..... SET_FEED_RATE(100.0000)
diff --git a/tests/interp/flowsnake/expected b/tests/interp/flowsnake/expected
index e656f0950..134d575f3 100644
--- a/tests/interp/flowsnake/expected
+++ b/tests/interp/flowsnake/expected
@@ -2,7 +2,6 @@
N..... SET_ORIGIN_OFFSETS(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... COMMENT("Program to mill a flowsnake")
N..... COMMENT("K. Lerman")
N..... SET_SPINDLE_SPEED(1.0000)
diff --git a/tests/interp/g6164/expected b/tests/interp/g6164/expected
index 40fbcf9bf..580a6f0da 100644
--- a/tests/interp/g6164/expected
+++ b/tests/interp/g6164/expected
@@ -3,7 +3,6 @@
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... SET_NAIVECAM_TOLERANCE(0.0000)
N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 1.000000)
N..... SET_NAIVECAM_TOLERANCE(1.0000)
diff --git a/tests/interp/g76/expected b/tests/interp/g76/expected
index 791be193e..1e9c7ebbc 100644
--- a/tests/interp/g76/expected
+++ b/tests/interp/g76/expected
@@ -2,7 +2,6 @@
N..... SET_ORIGIN_OFFSETS(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... COMMENT("cut a small 1/4-20 thread and part it")
N..... SELECT_PLANE(CANON_PLANE_XZ)
N..... USE_LENGTH_UNITS(CANON_UNITS_INCHES)
diff --git a/tests/interp/inside-corners/expected b/tests/interp/inside-corners/expected
index c1b7868b1..27ca8d118 100644
--- a/tests/interp/inside-corners/expected
+++ b/tests/interp/inside-corners/expected
@@ -3,7 +3,6 @@
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... SET_NAIVECAM_TOLERANCE(0.0000)
N..... SELECT_PLANE(CANON_PLANE_XY)
N..... USE_LENGTH_UNITS(CANON_UNITS_INCHES)
diff --git a/tests/interp/inverse-time-with-comp/expected b/tests/interp/inverse-time-with-comp/expected
index cf115546d..f11b64133 100644
--- a/tests/interp/inverse-time-with-comp/expected
+++ b/tests/interp/inverse-time-with-comp/expected
@@ -2,7 +2,6 @@
N..... SET_ORIGIN_OFFSETS(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... USE_LENGTH_UNITS(CANON_UNITS_INCHES)
N..... STRAIGHT_TRAVERSE(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
N..... COMMENT("interpreter: cutter radius compensation on right")
diff --git a/tests/oword/sub.0/expected b/tests/oword/sub.0/expected
index a5d8a61fb..1d02c50f8 100644
--- a/tests/oword/sub.0/expected
+++ b/tests/oword/sub.0/expected
@@ -2,7 +2,6 @@
N..... SET_ORIGIN_OFFSETS(0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000)
N..... SET_XY_ROTATION(0.0000)
N..... SET_FEED_REFERENCE(CANON_XYZ)
- N..... SET_MOTION_CONTROL_MODE(CANON_CONTINUOUS, 0.000000)
N..... COMMENT("DUMMY SUBROUTINE")
N..... COMMENT("MAIN SUBROUTINE")
N..... COMMENT("MAIN")
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-03 17:42:06 +0000