Changeset 9905 for fact/tools/FAD/simple_daq/cmd_send.cpp

Timestamp:

08/30/10 11:27:07 (14 years ago)

Author:

neise

Message:

new commands supported by 'simple_daq':
	variable phase shift commands: ps, psup, psdn, psreset
	SRCLK enable/disable: srclkon, srclkoff

File:

• fact/tools/FAD/simple_daq/cmd_send.cpp (modified) (9 diffs)

fact/tools/FAD/simple_daq/cmd_send.cpp

@@ -2 +2 @@
 
 // Send commands to socket
-void cmd_send (char* Buffer, int Socket)
+void cmd_send (const char* Buffer, int Socket)
 {
         int i;
@@ -38 +38 @@
         }
         
-    else if (strncmp (Buffer, "de\n", 2) == 0)
+    else if (strncmp (Buffer, "de\n", 3) == 0)
         {
                 CMD_Buffer[0] = htons (CMD_DENABLE);
@@ -45 +45 @@
         }
         
-    else if (strncmp (Buffer, "dd\n", 2) == 0)
+    else if (strncmp (Buffer, "psup\n", 5) == 0)
+        {
+                CMD_Buffer[0] = htons (CMD_PS_DIRINC);
+                printf ("# increasing phase shift ->\n");
+                printf ("# 0x%.4X\n", ntohs (CMD_Buffer[0]));
+        }
+        
+    else if (strncmp (Buffer, "psdn\n", 5) == 0)
+        {
+                CMD_Buffer[0] = htons (CMD_PS_DIRDEC);
+                printf ("# decreasing phase shift ->\n");
+                printf ("# 0x%.4X\n", ntohs (CMD_Buffer[0]));
+        }
+        
+    else if (strncmp (Buffer, "psreset\n", 8) == 0)
+        {
+                CMD_Buffer[0] = htons (CMD_PS_RESET);
+                printf ("# resetting phase shift ->\n");
+                printf ("# 0x%.4X\n", ntohs (CMD_Buffer[0]));
+        }
+
+    else if (strncmp (Buffer, "ps\n", 3) == 0)
+        {
+                CMD_Buffer[0] = htons (CMD_PS_DO);
+                printf ("# phase shifting once! ->\n");
+                printf ("# 0x%.4X\n", ntohs (CMD_Buffer[0]));
+        }
+
+
+        
+    else if (strncmp (Buffer, "dd\n", 3) == 0)
         {
                 CMD_Buffer[0] = htons (CMD_DDISABLE);
@@ -52 +82 @@
         }
         
-    else if (strncmp (Buffer, "dr\n", 2) == 0)
+    else if (strncmp (Buffer, "dr\n", 3) == 0)
         {
                 CMD_Buffer[0] = htons (CMD_DWRITE_RUN);
@@ -59 +89 @@
         }
         
-    else if (strncmp (Buffer, "ds\n", 2) == 0)
+    else if (strncmp (Buffer, "ds\n", 3) == 0)
         {
                 CMD_Buffer[0] = htons (CMD_DWRITE_STOP);
@@ -65 +95 @@
                 printf ("# 0x%.4X\n", ntohs (CMD_Buffer[0]));
         }
-        
-        else if (strncmp (Buffer, "sclkon\n", 6) == 0)
+
+        else if (strncmp (Buffer, "srclkon\n", 8) == 0)
+        {
+                CMD_Buffer[0] = htons (CMD_SRCLK_ON);
+                printf ("# DRS readoutclock SRCLK ENABLED ->\n");
+                printf ("# 0x%.4X\n", ntohs (CMD_Buffer[0]));
+        }
+        else if (strncmp (Buffer, "srclkoff\n", 9) == 0)
+        {
+                CMD_Buffer[0] = htons (CMD_SRCLK_OFF);
+                printf ("# DRS readoutclock SRCLK DISABLED ->\n");
+                printf ("# 0x%.4X\n", ntohs (CMD_Buffer[0]));
+        }       
+        else if (strncmp (Buffer, "sclkon\n", 7) == 0)
         {
                 CMD_Buffer[0] = htons (CMD_SCLK_ON);
@@ -72 +114 @@
                 printf ("# 0x%.4X\n", ntohs (CMD_Buffer[0]));
         }
-        else if (strncmp (Buffer, "sclkoff\n", 7) == 0)
+        else if (strncmp (Buffer, "sclkoff\n", 8) == 0)
         {
                 CMD_Buffer[0] = htons (CMD_SCLK_OFF);
@@ -243 +285 @@
         {
                 printf ("Commands:\n");
-                printf ("    r:          Start Run -- TODO\n");
-                printf ("    s:          Stop Run  -- TODO\n");
                 printf ("    t:          Single Trigger\n\n");
+                printf ("    tc:         Continuous Trigger\n");
+                printf ("    ts:         Stop Trigger\n");
+
+                printf ("\n");
+                printf ("    sclkon:     Switch SPI SLCK on\n");
+                printf ("    sclkoff:    Switch SPI SLCK off\n");
+
+                printf ("\n");
+                printf ("    srclkon:     Switch DRS SRLCK on\n");
+                printf ("    srclkoff:    Switch DRS SRLCK off\n");
+
+                printf ("\n");
+                printf ("    ps:         Phase shift ADCCLK against SRCLK - one step\n");
+                printf ("    psup:       'increse' phase shift - default\n");
+                printf ("    psdn:       'decrease' phase shift\n");
+                printf ("    psres:      reset phase shift\n");
+
+
+                printf ("\n");
                 printf ("    de:         DENABLE HIGH\n");
                 printf ("    dd:         DENABLE LOW\n");
                 printf ("    dr:         DWRITE HIGH\n");
                 printf ("    ds:         DWRITE LOW\n");
-                printf ("    sclkon:     Switch SPI SLCK on\n");
-                printf ("    sclkoff:    Switch SPI SLCK off\n");
-                printf ("    tc:         Continuous Trigger\n");
-                printf ("    ts:         Stop Trigger\n");
+
+                printf ("\n");
                 printf ("    sr NUM VAL: Set ROI NUM (0-35) to VAL (0-1024)\n");
                 printf ("    sra VAL:    Set all ROIs to VAL (0-1024)\n");
@@ -264 +321 @@
                 printf ("        sz:         Send 0x0000\n");
                 printf ("\n");
+                printf ("    r:          Start Run -- TODO\n");
+                printf ("    s:          Stop Run  -- TODO\n");
 
                 CMD_Num = 0;