All pastes #317286 Raw Edit

Miscellany

public text v1 · immutable
#317286 ·published 2007-01-15 13:40 UTC
rendered paste body
Index: kinematics/tp.c
===================================================================
RCS file: /cvs/emc2/src/emc/kinematics/tp.c,v
retrieving revision 1.64
diff -u -p -u -r1.64 tp.c
--- kinematics/tp.c	5 Nov 2006 04:57:02 -0000	1.64
+++ kinematics/tp.c	15 Jan 2007 13:39:59 -0000
@@ -23,6 +23,8 @@
 #include "tp.h"
 #include "rtapi_math.h"
 #include "../motion/motion.h"
+#include "hal.h"
+#include "../motion/mot_priv.h"
 
 /* how close to accel limit we should go */
 #define ACCEL_USAGE 0.95
@@ -499,6 +501,9 @@ int tpRunCycle(TP_STRUCT * tp, long peri
     double save_vel;
 
     tc = tcqItem(&tp->queue, 0, period);
+
+    emcmot_hal_data->debug_float_1 = tcqLen(&tp->queue);
+
     if(!tc) {
         // this means the motion queue is empty.  This can represent
         // the end of the program OR QUEUE STARVATION.  In either case,
Index: motion/control.c
===================================================================
RCS file: /cvs/emc2/src/emc/motion/control.c,v
retrieving revision 1.85
diff -u -p -u -r1.85 control.c
--- motion/control.c	3 Jan 2007 03:14:07 -0000	1.85
+++ motion/control.c	15 Jan 2007 13:39:59 -0000
@@ -2376,7 +2376,7 @@ static void output_to_hal(void)
     emcmot_hal_data->debug_bit_0 = joints[1].free_tp_active;
     emcmot_hal_data->debug_bit_1 = emcmotStatus->enables_new & AF_ENABLED;
     emcmot_hal_data->debug_float_0 = emcmotStatus->net_feed_scale;
-    emcmot_hal_data->debug_float_1 = 0.0;
+    // emcmot_hal_data->debug_float_1 = 0.0;
     *emcmot_hal_data->spindle_sync = emcmotStatus->spindleSync;
 
     /* output axis info to HAL for scoping, etc */