Changeset 261 for tools/FAD/simple_daq

Timestamp:

07/22/10 12:02:25 (14 years ago)

Author:

dneise

Message:

FAD SPI SLCK can be controled via sclkon & sclkoff see help

Location:

tools/FAD/simple_daq

Files:

• cmd_send.cpp (modified) (2 diffs)
• simple_daq.cpp (modified) (1 diff)
• simple_daq.h (modified) (2 diffs)

tools/FAD/simple_daq/cmd_send.cpp

@@ -63 +63 @@
                 CMD_Buffer[0] = htons (CMD_DWRITE_STOP);
                 printf ("# DWRITE LOW ->\n");
+                printf ("# 0x%.4X\n", ntohs (CMD_Buffer[0]));
+        }
+        
+        else if (strncmp (Buffer, "sclkon\n", 6) == 0)
+        {
+                CMD_Buffer[0] = htons (CMD_SCLK_ON);
+                printf ("# SCLK ENABLED ->\n");
+                printf ("# 0x%.4X\n", ntohs (CMD_Buffer[0]));
+        }
+        else if (strncmp (Buffer, "sclkoff\n", 7) == 0)
+        {
+                CMD_Buffer[0] = htons (CMD_SCLK_OFF);
+                printf ("# SCLK DISABLED ->\n");
                 printf ("# 0x%.4X\n", ntohs (CMD_Buffer[0]));
         }
@@ -236 +249 @@
                 printf ("    dd:         DENABLE LOW\n");
                 printf ("    dr:         DWRITE HIGH\n");
-                printf ("    ds:         DWRITE LOW\n\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");

tools/FAD/simple_daq/simple_daq.cpp

@@ -158 +158 @@
 
 // note: verbose is not used, but anyway defined.
-SimpleDaqConfiguration *getConfig (char *path, int verbose) {
+SimpleDaqConfiguration *getConfig (const char *path, int verbose) {
 FILE* ConfigFile;
 // try to open config file

tools/FAD/simple_daq/simple_daq.h

@@ -25 +25 @@
 #define CMD_DWRITE_RUN 0x0800   // DWRITE possibly HIGH
 #define CMD_DWRITE_STOP 0x0900  // DWRITE always LOW
+
+#define CMD_SCLK_ON 0x1000  
+#define CMD_SCLK_OFF 0x1100
+
 #define CMD_Trigger_C 0xB000    // continous trigger
 #define CMD_Trigger_S 0x2000    // stop continous trigger
@@ -55 +59 @@
 void int_handler (int sig); // Handle signal SIGINT (CTRL-C)
 void exit_program (int exit_status); // Cleanup and exit
-SimpleDaqConfiguration *getConfig (char *path, int verbose = 0);
+SimpleDaqConfiguration *getConfig (const char *path, int verbose = 0);
 
 #endif /*SOCKETCLIENT_H_*/