I just enter git diff and got as I see teh estop latch should be working now
sla...@emc2:~/emc2-git$ git diff
diff --git a/src/hal/components/estop_latch.comp b/src/hal/c
index 2a1e0dd..390a639 100644
--- a/src/hal/components/estop_latch.comp
+++ b/src/hal/components/estop_latch.comp
@@ -22,7 +22,7 @@ FUNCTION(_) {
fault_out = 0;
}
/* toggle watchdog */
- watchdog = !watchdog;
+ if ( ok_in ) {watchdog = !watchdog;}
} else {
/* fault condition exists, trip */
ok_out = 0;
diff --git a/src/hal/components/stepgen.c b/src/hal/componen
index b0fa061..44cdff7 100644
--- a/src/hal/components/stepgen.c
+++ b/src/hal/components/stepgen.c
@@ -305,6 +305,8 @@
#include "rtapi_math.h"
#define MAX_CHAN 8
+#define MAX_CYCLE 10
+#define USER_STEP_TYPE 13
:
diff --git a/src/hal/components/estop_latch.comp
b/src/hal/components/estop_latch.comp
diff --git a/src/hal/components/estop_latch.comp
b/src/hal/components/estop_latch.comp
index 2a1e0dd..390a639 100644
--- a/src/hal/components/estop_latch.comp
+++ b/src/hal/components/estop_latch.comp
@@ -22,7 +22,7 @@ FUNCTION(_) {
fault_out = 0;
}
/* toggle watchdog */
- watchdog = !watchdog;
+ if ( ok_in ) {watchdog = !watchdog;}
} else {
/* fault condition exists, trip */
ok_out = 0;
diff --git a/src/hal/components/stepgen.c b/src/hal/components/stepgen.c
index b0fa061..44cdff7 100644
--- a/src/hal/components/stepgen.c
+++ b/src/hal/components/stepgen.c
@@ -305,6 +305,8 @@
#include "rtapi_math.h"
#define MAX_CHAN 8
+#define MAX_CYCLE 10
+#define USER_STEP_TYPE 13
/* module information */
MODULE_AUTHOR("John Kasunich");
@@ -314,6 +316,9 @@ int step_type[MAX_CHAN] = { -1, -1, -1, -1, -1, -1, -1,
-1 };
RTAPI_MP_ARRAY_INT(step_type,MAX_CHAN,"stepping types for up to 8
channels");
const char *ctrl_type[MAX_CHAN] = { "p", "p", "p", "p", "p", "p", "p", "p"
};
RTAPI_MP_ARRAY_STRING(ctrl_type,MAX_CHAN,"control type (pos or vel) for up
to 8 channels");
+int user_step_type[MAX_CYCLE] = {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
+RTAPI_MP_ARRAY_INT(user_step_type, MAX_CYCLE,
+ "lookup table for user-defined step type");
/***********************************************************************
* STRUCTURES AND GLOBAL VARIABLES *
@@ -373,7 +378,7 @@ static stepgen_t *stepgen_array;
/* lookup tables for stepping types 2 and higher - phase A is the LSB */
:
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Emc-users mailing list
Emc-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-users
