Changeset 143

Timestamp:

01/18/10 07:51:43 (15 years ago)

Author:

ogrimm

Message:

Updates to DIM paths

Location:

tools/SkyQualityMonitor

Files:

• Makefile (modified) (1 diff)
• sqm.cpp (modified) (8 diffs)

tools/SkyQualityMonitor/Makefile

@@ -2 +2 @@
 
 PROG=sqm
-CPPFLAGS += -I../../Evidence/DIM/
-LDLIBS += -lpthread
+CPPFLAGS += -I../../Evidence -I$(DIMDIR)/dim
+LDLIBS += -lpthread $(DIMDIR)/linux/libdim.a
 
-$(PROG): $(PROG).o ../../Evidence/Evidence.o ../../Evidence/DIM/libdim.a
+$(PROG): $(PROG).o ../../Evidence/Evidence.o
 
 clean:

tools/SkyQualityMonitor/sqm.cpp

@@ -17 +17 @@
 
 #define SERVER_NAME "SQM"       // Name to use in DIM
-#include "../Evidence.h"
+#include "Evidence.h"
 
 #define READ_CMD "rx"           // Command to read from device
@@ -30 +30 @@
   fd_set ReadFileDescriptor;
   time_t Time;
+  unsigned int Period;
   
   // Start server and request configuration data
@@ -35 +36 @@
   char *Address = Srv.GetConfig(SERVER_NAME " address");
   unsigned int Port = atoi(Srv.GetConfig(SERVER_NAME " port"));
-  unsigned int Period = atoi(Srv.GetConfig(SERVER_NAME " period"));
     
   // Open socket descriptor
   if ((SocketDescriptor = socket(PF_INET, SOCK_STREAM, 0)) == -1) {
-    Srv.Msg(Srv.FATAL, "Could not open socket (%s)", strerror(errno));
+    Srv.State(Srv.FATAL, "Could not open socket (%s)", strerror(errno));
   }
     
@@ -45 +45 @@
   struct hostent *hostent = gethostbyname(Address);
   if (hostent==0) {
-    Srv.Msg(Srv.FATAL, "Could not resolve host name '%s' (%s)", Address, hstrerror(h_errno));
+    Srv.State(Srv.FATAL, "Could not resolve host name '%s' (%s)", Address, hstrerror(h_errno));
   }
 
@@ -54 +54 @@
   
   if (connect(SocketDescriptor, (struct sockaddr *) &SocketAddress, sizeof(SocketAddress))==-1) {
-    Srv.Msg(Srv.FATAL, "Could not connect to server '%s' on port %d (%s)", Address, Port, strerror(errno));
+    Srv.State(Srv.FATAL, "Could not connect to server '%s' on port %d (%s)", Address, Port, strerror(errno));
   }
 
-  Srv.Msg(Srv.INFO, "Connected to server '%s' on port %d", Address, Port);
+  Srv.State(Srv.INFO, "Connected to server '%s' on port %d", Address, Port);
   signal(SIGPIPE,SIG_IGN);  // Do not kill process if writing to closed socket
 
@@ -63 +63 @@
   double sqm_reading=0.0;
   char Buffer[BUF_SIZE];
+  
   DimService SQM_Brightness(SERVER_NAME"/NSB", sqm_reading);
-  DimService SQM_Response(SERVER_NAME"/Response", Buffer);
+  DimService SQM_Response(SERVER_NAME"/Response", NO_LINK);
 
   while(!EvidenceServer::ExitRequest) {
+        // Request measurement period  
+    Period = atoi(Srv.GetConfig(SERVER_NAME " period"));
+
     // Write read command to socket
     if ((write(SocketDescriptor, READ_CMD, strlen(READ_CMD)))<1) { 
-      Srv.Msg(Srv.ERROR, "Could not write read command '%s' to socket.", READ_CMD);
+      Srv.State(Srv.ERROR, "Could not write read command '%s' to socket.", READ_CMD);
     }
     
-    // Wait for data from socket with time-out
-    sleep(Period/2);  // Wait half period to allow for response
-
-    FD_ZERO(&ReadFileDescriptor);   
+        // Wait for response (minimum 100 ms)
+        usleep(100000);
+        FD_ZERO(&ReadFileDescriptor);   
     FD_SET(SocketDescriptor, &ReadFileDescriptor);
     struct timeval WaitTime = {Period, 0};
     if (select(((int) SocketDescriptor)+1, &ReadFileDescriptor, NULL, NULL, &WaitTime)==-1) {
-      Srv.Msg(Srv.FATAL, "Error with select() (%s)", strerror(errno));
+      Srv.State(Srv.FATAL, "Error with select() (%s)", strerror(errno));
     }
 
     if (!FD_ISSET(SocketDescriptor, &ReadFileDescriptor)) { 
-      Srv.Msg(Srv.WARN, "Time-out of %d seconds expired before receiving response from socket", Period);
+      Srv.State(Srv.WARN, "Time-out of %d seconds expired before receiving response from socket", Period);
       continue;
     }
@@ -89 +92 @@
     memset(Buffer, 0, BUF_SIZE);
     if(read(SocketDescriptor, Buffer, BUF_SIZE) == 0) {
-      Srv.Msg(Srv.FATAL, "Server not existing anymore, exiting...\n");
+      Srv.State(Srv.FATAL, "Server not existing anymore, exiting...\n");
     }
 
@@ -95 +98 @@
     for (int i=0; i<strlen(Buffer); i++) if (Buffer[i] == '\n') Buffer[i] = '\0';
     sqm_reading = strtod(Buffer+2 ,NULL);
-    SQM_Brightness.updateService();
-    SQM_Response.updateService();    
-    
+
+    SQM_Brightness.updateService(sqm_reading);
+    SQM_Response.updateService(Buffer);    
+
     Time = time(NULL);
     printf("%s\n %s CTRL-c to exit.\r", Buffer, asctime(localtime(&Time)));
     fflush(stdout);
-    sleep(Period/2); // Wait second half period here
- 
+        
+    sleep(Period);
   } // while()