Changeset 10813 for fact/FADctrl

Timestamp:

05/25/11 12:14:42 (14 years ago)

Author:

ogrimm

Message:

Corrected dcm_ready and dcm_lock bit evaluation

Location:

fact/FADctrl

Files:

• FAD.cc (modified) (2 diffs)
• FADBoard.cc (modified) (1 diff)
• FADBoard.h (modified) (1 diff)
• FADctrl.cc (modified) (1 diff)
• History.txt (modified) (1 diff)

fact/FADctrl/FAD.cc

@@ -656 +656 @@
 
         // Other data
-        PrintMessage("Frequency %.2f GHz    Phase shift %d    PLL lock %d %d %d %d\n", S.Frequency, S.PhaseShift, S.Lock[0], S.Lock[1], S.Lock[2], S.Lock[3]);
+        PrintMessage("Frequency %.2f GHz (%s)    Phase shift %d    PLL lock %d %d %d %d\n", S.Frequency, S.RefClk_low ? "too low":"OK",  S.PhaseShift, S.Lock[0], S.Lock[1], S.Lock[2], S.Lock[3]);
         PrintMessage("DENABLE %d   DWRITE %d   SPI_clk %d   DCM_lock %d   DCM_ready %d\n", S.denable, S.dwrite, S.spi_clk, S.DCM_lock, S.DCM_ready);    
         PrintMessage("DAC %d %d %d %d   %d %d %d %d\n", S.DAC[0], S.DAC[1], S.DAC[2], S.DAC[3], S.DAC[4], S.DAC[5], S.DAC[6], S.DAC[7] );
@@ -1121 +1121 @@
   
   // Print to console
-  if (Text[strlen(Text)-1] == '\n') printf("\r");               // Overwrite prompt
+  //if (Text[strlen(Text)-1] == '\n') printf("\r");             // Overwrite prompt
   printf("%s", Text);
   fflush(stdout);
-  if (Text[strlen(Text)-1]=='\n') rl_on_new_line();             // New prompt
+  if (Text[strlen(Text)-1] == '\n') rl_on_new_line();
 
   // Send to DIM text service

fact/FADctrl/FADBoard.cc

@@ -508 +508 @@
           Status.denable = (bool) ( ntohs(Header->PLLLCK) & (1<<11) );
           Status.dwrite = (bool) ( ntohs(Header->PLLLCK) & (1<<10) );
-          Status.DCM_lock = (bool) ( ntohs(Header->PLLLCK) & (1<<9) );
-          Status.DCM_ready = (bool) ( ntohs(Header->PLLLCK) & (1<<8) );
-          Status.spi_clk = (bool) ( ntohs(Header->PLLLCK) & (1<<7) );
+          Status.DCM_lock = (bool) ( ntohs(Header->PLLLCK) & (1<<7) );
+          Status.DCM_ready = (bool) ( ntohs(Header->PLLLCK) & (1<<6) );
+          Status.spi_clk = (bool) ( ntohs(Header->PLLLCK) & (1<<5) );
+          Status.RefClk_low = (bool) ( ntohs(Header->PLLLCK) & (1<<8) );
 
           // Extract temperatures (MSB indicates if temperature is positive or negative)

fact/FADctrl/FADBoard.h

@@ -67 +67 @@
           bool DCM_ready;
           bool spi_clk;
-
+          bool RefClk_low;
+          
           uint16_t ROI[NChips][NChannels];
           uint16_t DAC[NDAC];

fact/FADctrl/FADctrl.cc

@@ -42 +42 @@
 
   while (!M.ExitRequest) {
-    Command = readline("\rFADctrl> ");
-
+    Command = readline("FADctrl> ");
+        
         // Check for interruption by signal
     if (Command == NULL) continue;

fact/FADctrl/History.txt

@@ -29 +29 @@
                         Added cleanup handler to thread in FADBoard class to ensure mutex is unlocked when thread
                         cancelled
+25/5/2011       dcm_lock and dcm_ready bits were incorrectly evaluated.