Two small changes for AIN data acquisition

ADbasic_program_buffered.BAK

@@ -9,7 +9,7 @@
 ' Optimize                       = Yes
 ' Optimize_Level                 = 4
 ' Stacksize                      = 1000
-' Info_Last_Save                 = LEONARD-LAB1  LEONARD-LAB1\mholt
+' Info_Last_Save                 = ATI098-60  ATI098-60\labuser
 '<Header End>
 #include adwinpro_all.inc
 
@@ -310,14 +310,7 @@ EVENT:
   'Set all voltages synchronously
   P2_Sync_All(110000b)
   
-  
-  
-  inc processIdx
-  
-  '### Programmterminierung
-  IF (processIdx  >= par_2) THEN 
-    END 'end loop when last last timing event completed
-  ENDIF
+ 
   
   ' Write ADC Values
   IF (aInIdx < A_IN_BUFFER) THEN
@@ -331,6 +324,13 @@ EVENT:
     NEXT i
   ENDIF 'aInIdx < A_IN_BUFFER
   
+  inc processIdx
+  
+  '### Programmterminierung
+  IF (processIdx  >= par_2) THEN 
+    END 'end loop when last last timing event completed
+  ENDIF
+  
   ' Update target values
   IF(DATA_1[eventIdx+1] <= processIdx) THEN
     DO

ADbasic_program_buffered.bas

@@ -9,7 +9,7 @@
 ' Optimize                       = Yes
 ' Optimize_Level                 = 4
 ' Stacksize                      = 1000
-' Info_Last_Save                 = LEONARD-LAB1  LEONARD-LAB1\mholt
+' Info_Last_Save                 = ATI098-60  ATI098-60\labuser
 '<Header End>
 #include adwinpro_all.inc
 
@@ -310,15 +310,8 @@ EVENT:
   'Set all voltages synchronously
   P2_Sync_All(110000b)
   
-  
-  
   inc processIdx
   
-  '### Programmterminierung
-  IF (processIdx  >= par_2) THEN 
-    END 'end loop when last last timing event completed
-  ENDIF
-  
   ' Write ADC Values
   IF (aInIdx < A_IN_BUFFER) THEN
     FOR i=1 to AINNO
@@ -331,6 +324,12 @@ EVENT:
     NEXT i
   ENDIF 'aInIdx < A_IN_BUFFER
   
+  
+  '### Programmterminierung
+  IF (processIdx  >= par_2) THEN 
+    END 'end loop when last last timing event completed
+  ENDIF
+  
   ' Update target values
   IF(DATA_1[eventIdx+1] <= processIdx) THEN
     DO

ADbasic_program_manual.BAK

@@ -23,6 +23,9 @@
 
 DIM DATA_95[8] AS Long ' AOUT1 values
 DIM DATA_96[8] AS Long ' AOUT2 values
+DIM DATA_93[8] AS Long ' AIN1 values in FiFo array
+DIM DATA_94[8] AS Long ' AIN2 values in FiFo array
+
 
 INIT:
   PROCESSDELAY = 1000000 ' in manual mode 1 ms cycle time is enough
@@ -31,6 +34,8 @@ INIT:
   P2_Set_Led(DIO2, 1)
   P2_Set_Led(AOUT1, 1)
   P2_Set_Led(AOUT2, 1)
+  P2_Start_ConvF(AIN1,0FFh)
+  P2_Start_ConvF(AIN2,0FFh)
   
 EVENT:
   IF (Par_11=1) THEN
@@ -38,6 +43,13 @@ EVENT:
     P2_DAC8(AOUT2,DATA_96,1)
     P2_DIGOUT_LONG(DIO1,Par_91)
     P2_DIGOUT_LONG(DIO2,Par_92)
+    
+    P2_Wait_EOCF(AIN1,0FFh)
+    P2_Wait_EOCF(AIN2,0FFh)
+    P2_READ_ADCF8(AIN1, DATA_93, 1)
+    P2_READ_ADCF8(AIN2, DATA_94, 1) 
+    P2_Start_ConvF(AIN1,0FFh)
+    P2_Start_ConvF(AIN2,0FFh)  
   ENDIF
   
 FINISH:

ADbasic_program_manual.bas

@@ -23,10 +23,9 @@
 
 DIM DATA_95[8] AS Long ' AOUT1 values
 DIM DATA_96[8] AS Long ' AOUT2 values
-DIM DATA_93[10000] AS Long AS FIFO ' AIN1 values in FiFo array
-DIM DATA_94[10000] AS Long AS FIFO ' AIN2 values in FiFo array
-DIM ain1_data[8] AS LONG
-DIM ain2_data[8] AS LONG
+DIM DATA_93[8] AS Long ' AIN1 values in FiFo array
+DIM DATA_94[8] AS Long ' AIN2 values in FiFo array
+
 
 INIT:
   PROCESSDELAY = 1000000 ' in manual mode 1 ms cycle time is enough
@@ -43,14 +42,12 @@ EVENT:
     P2_DAC8(AOUT1,DATA_95,1)
     P2_DAC8(AOUT2,DATA_96,1)
     P2_DIGOUT_LONG(DIO1,Par_91)
-    P2_DIGOUT_LONG(DIO2,Par_92)#
+    P2_DIGOUT_LONG(DIO2,Par_92)
     
     P2_Wait_EOCF(AIN1,0FFh)
     P2_Wait_EOCF(AIN2,0FFh)
-    P2_READ_ADCF8(AIN1, ain1_data, 1)
-    P2_READ_ADCF8(AIN2, ain2_data, 1)
-    DATA_93 = ain1_data
-    DATA_94 = ain2_data  
+    P2_READ_ADCF8(AIN1, DATA_93, 1)
+    P2_READ_ADCF8(AIN2, DATA_94, 1) 
     P2_Start_ConvF(AIN1,0FFh)
     P2_Start_ConvF(AIN2,0FFh)  
   ENDIF