Diff: main.cpp

Revision:

12:3f1df385d781

Parent:

11:8e6c8e654004

Child:

13:0ec8fa0a0429

--- a/main.cpp	Fri Jun 28 08:45:27 2019 +0000
+++ b/main.cpp	Fri Jun 28 08:51:48 2019 +0000
@@ -7,8 +7,8 @@
 #define MEAS_DELAY     1000 // measurement delay after turning on FET (us) (themocycling control programme uses 50 us)
 #define LOG_INTERVAL   5000  // log file interval (ms)
 
-#define N_STEPS = 250
-#define CAM_TRIG            20     // camera trigger pulse width (us)
+#define N_STEPS         250
+#define CAM_TRIG        20     // camera trigger pulse width (us)
 
 Serial pc(USBTX, USBRX); // tx, rx
 
@@ -65,7 +65,6 @@
 
 int main() {
     int eTime;
-    int iCycle;
     double r1;
     double r2;
     double r1_max = 0;
@@ -109,15 +108,13 @@
     yLED = 0;
     gLED = 1;
     
-    sprintf(outString, "iCycle, eTime, R1, R2 \n");
+    sprintf(outString, "iSteps, eTime, R1, R2 \n");
     //sprintf(outString, "I1SIG,  IREF, V1POS, V1NEG,      R1,    I2SIG,  IREF, V2POS, V2NEG,         R2\r\n");
     //pc.printf("%s", outString);
     fprintf(fp, outString);
     
-    while ( x < N_STEPS );
-        
+    for (int iStep=0; iStep<N_STEPS; iStep++) {
         eTime = timer.read_ms();
-        iCycle = x;
         
         // trigger measurement
         drive = 1;
@@ -143,12 +140,12 @@
         r2_sum = r2_sum + r2;
         r2_sum2 = r2_sum2 + (r2*r2);
 
-        sprintf(outString, "%10d,%10d,%10f,%10f\n", iCycle, eTime, r1, r2); // log data
+        sprintf(outString, "%10d,%10d,%10f,%10f\n", iStep, eTime, r1, r2); // log data
         //sprintf(outString, "%5d\t %5d\t %5d\t %5d\t %f  %5d\t %5d\t %5d\t %5d\t %f\r\n", val_array[0], val_array[1], val_array[4], val_array[5], r1, val_array[2], val_array[1], val_array[6], val_array[7], r2);
         //pc.printf("%s", outString); 
         fprintf(fp, outString);
         wait_ms(LOG_INTERVAL);
-        x++;
+        iStep++;
         }
 
     //r1_mean = r1_sum/n_samples;