Changeset 10279

Timestamp:

04/01/11 09:27:43 (14 years ago)

Author:

ogrimm

Message:

Frequency available as DIM service

Location:

fact/FADctrl

Files:

• FADBoard.cc (modified) (5 diffs)
• FADBoard.h (modified) (1 diff)
• History.txt (modified) (1 diff)

fact/FADctrl/FADBoard.cc

@@ -23 +23 @@
   Status.Update.tv_sec = -1;
   Port = ServerPort;
-
+  Status.Frequency = 0;
+  Status.BoardID = 0;
+  
   Name = new char [Server.size()+1]; // Name in permanent memory for DIM service
   strcpy(Name, Server.c_str());
@@ -49 +51 @@
   DIM_Status = new DimService((ID.str()+"Status").c_str(), (char *) "");
   DIM_ID = new DimService((ID.str()+"BoardID").c_str(), (char *) "S", NULL, 0);
+  DIM_Frequency = new DimService((ID.str()+"Frequency").c_str(), Status.Frequency);
   DIM_Temp = new DimService((ID.str()+"Temperature").c_str(), (char *) "F", NULL, 0);
   DIM_DAC = new DimService((ID.str()+"DAC").c_str(), (char *) "S", NULL, 0);
@@ -54 +57 @@
 
   // Create thread that connects and receives data
-  SetStatus("Trying to connect");
+  SetStatus("Trying to connect...");
 
   if ((Ret = pthread_create(&Thread, NULL, (void * (*)(void *)) LaunchThread,(void *) this)) != 0) {
@@ -82 +85 @@
   delete DIM_Status;
   delete DIM_ID;
+  delete DIM_Frequency;
   delete DIM_Temp;
   delete DIM_DAC;
@@ -510 +514 @@
                 LastUpdate = time(NULL);
 
+                if (PrevStatus.Frequency != Status.Frequency) DIM_Frequency->updateService();
+
                 if (memcmp(PrevStatus.Temp, Status.Temp, sizeof(Status.Temp)) != 0) {
                   DIM_Temp->updateService(Status.Temp, sizeof(Status.Temp));

fact/FADctrl/FADBoard.h

@@ -28 +28 @@
         int Socket;
         pthread_mutex_t Mutex;
-        DimService *DIM_Name, *DIM_Status, *DIM_ID, *DIM_Temp, *DIM_ROI, *DIM_DAC;
+        DimService *DIM_Name, *DIM_Status, *DIM_ID, *DIM_Frequency, *DIM_Temp, *DIM_ROI, *DIM_DAC;
 
         void ReadLoop();

fact/FADctrl/History.txt

@@ -20 +20 @@
 29/3/2011       Added Status message service for each board (removed several console messages in turn)
                         Limited update rate of slow control data to 1 second or interval set by 'update'
+1/4/2011        Added DIM frequency service