trigNr consists of software trigNr (24bit) and Hardware trigTag (8bit)

diff --git a/hadaq/hwsoft.c b/hadaq/hwsoft.c
index b6cf60a8193e10fd76b00ab2a3d642eed2b383c4..e317522d405b96f4f0bd8f8a6a7c25dfa2c8cfa0 100644 (file)
--- a/hadaq/hwsoft.c
+++ b/hadaq/hwsoft.c
@@ -49,19 +49,22 @@ void Hardware_waitForTrigger(const Hardware *my, void *subEvt)
 {
        static int nextId = SubEvtId_trigCode;
        struct timespec tS, *t = &tS;
-       static UInt4 trigNr = 0;
+       static unsigned long trigNr = 0;
+       static UInt1 trigTag = 0;
 
 
        switch (nextId) {
        case SubEvtId_trigCode:
+#if 1
                t->tv_sec = 0;
                t->tv_nsec = 100000000;
                nanosleep(t, NULL);
+#endif
 
                SubEvt_setSize(subEvt, SubEvt_hdrSize());
                SubEvt_setDecoding(subEvt, SubEvtDecoding_32bitData);
                SubEvt_setId(subEvt, SubEvtId_trigCode);
-               SubEvt_setTrigNr(subEvt, trigNr);
+               SubEvt_setTrigNr(subEvt, trigNr << 8 | trigTag);
                nextId = SubEvtId_test1;
 
                break;
@@ -69,7 +72,9 @@ void Hardware_waitForTrigger(const Hardware *my, void *subEvt)
                SubEvt_setSize(subEvt, SubEvt_hdrSize());
                SubEvt_setDecoding(subEvt, SubEvtDecoding_32bitData);
                SubEvt_setId(subEvt, SubEvtId_test1);
-               SubEvt_setTrigNr(subEvt, trigNr++);
+               SubEvt_setTrigNr(subEvt, trigNr << 8 | trigTag);
+               trigNr++;
+               trigTag++;
                nextId = SubEvtId_trigCode;
 
                break;