Bug Fix: RCG controller.c sending GPS second update 1 cycle late to user code....

Bug Fix: RCG controller.c sending GPS second update 1 cycle late to user code. This affected both phase locked oscillator and GPS parts.


git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/trunk@4195 6dcd42c9-f523-4c6d-aada-af552506706e

NEWS

 ==================================================================================================
-Changes for 3.x
+Changes for 3.0.1
 ==================================================================================================
+- Bug Fix: Phase locked oscillator 
+- Bug Fix: GPS part: GPS second being sent to user code 1 cycle late.
 - Bug Fix (832): Dataviewer -r <restorefile> command line option fixed.
 - Bug Fix (999): start script does not error out if real-time model killed 
 - Bug Fix (1000): ccodeio.h now uses environment variables in file paths

src/fe/controller.c

@@ -954,7 +954,8 @@ udelay(1000);
 	  /// - ---- If IOP, Increment GPS second
           timeSec ++;
           pLocalEpics->epicsOutput.timeDiag = timeSec;
-	  // printf("cycle = %d  time = %d\n",cycleNum,timeSec);
+	  if (cycle_gps_time == 0) startGpsTime = timeSec;
+	  cycle_gps_time = timeSec;
 #endif
 	}
         for(ll=0;ll<sampleCount;ll++)
@@ -1179,6 +1180,8 @@ udelay(1000);
                                 // kk++;
                         }while((ioMemData->iodata[mm][ioMemCntr].cycle != ioClock) && (adcWait < MAX_ADC_WAIT_SLAVE));
 			timeSec = ioMemData->iodata[mm][ioMemCntr].timeSec;
+			if (cycle_gps_time == 0) startGpsTime = timeSec;
+			cycle_gps_time = timeSec;
 
 			/// - --------- If data not ready in time, set error, release DAC channel reservation and exit the code.
                         if(adcWait >= MAX_ADC_WAIT_SLAVE)
@@ -1765,8 +1768,6 @@ udelay(1000);
 #ifndef NO_DAQ
 		
 		// Call daqLib
-		if (cycle_gps_time == 0) startGpsTime = timeSec;
-		cycle_gps_time = timeSec; // Time at which ADCs triggered
 		pLocalEpics->epicsOutput.daqByteCnt = 
 			daqWrite(1,dcuId,daq,DAQ_RATE,testpoint,dspPtr[0],myGmError2,(int *)(pLocalEpics->epicsOutput.gdsMon),xExc,pEpicsDaq);
 		// Send the current DAQ block size to the awgtpman for TP number checking