diff options
| author | Chris Radek <chris@timeguy.com> | 2014-06-11 15:48:08 -0500 |
|---|---|---|
| committer | Chris Radek <chris@timeguy.com> | 2014-06-11 15:48:08 -0500 |
| commit | d699a06b22216343ba03a69ea4bd89aa2a8008ff (patch) | |
| tree | ae6e376a3ec41c86bd85195c15afa130dc373aeb | |
| parent | 309aa9785c7d996762e76a28099e9780afe84b21 (diff) | |
| download | linuxcnc-d699a06b22216343ba03a69ea4bd89aa2a8008ff.tar.gz linuxcnc-d699a06b22216343ba03a69ea4bd89aa2a8008ff.zip | |
Make the new planner honor the separate feed and rapid overrides
| -rw-r--r-- | src/emc/tp/tp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/emc/tp/tp.c b/src/emc/tp/tp.c index 5b6c1387d..0bba14ca6 100644 --- a/src/emc/tp/tp.c +++ b/src/emc/tp/tp.c @@ -33,7 +33,10 @@ #include "tp_debug.h" -#define TP_SHOW_BLENDS +// FIXME: turn off this feature, which causes blends between rapids to +// use the feed override instead of the rapid override +#undef TP_SHOW_BLENDS + #define TP_OPTIMIZATION_LAZY #define TP_PEDANTIC @@ -186,7 +189,7 @@ STATIC double tpGetFeedScale(TP_STRUCT const * const tp, if (tp->pausing || tp->aborting) { tc_debug_print("pausing or aborting\n"); return 0.0; - } else if (tc->canon_motion_type == EMC_MOTION_TYPE_TRAVERSE || tc->synchronized == TC_SYNC_POSITION ) { + } else if ( tc->synchronized == TC_SYNC_POSITION ) { return 1.0; } else { return emcmotStatus->net_feed_scale; |