Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: mbed MODSERIAL FastPWM ADS8568_ADC
Revision 13:0ec8fa0a0429, committed 2019-06-28
- Comitter:
- sophiemeredith
- Date:
- Fri Jun 28 09:57:13 2019 +0000
- Parent:
- 12:3f1df385d781
- Child:
- 14:d764e256ac6d
- Commit message:
- AD logging with camera trigger;
Changed in this revision
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Fri Jun 28 08:51:48 2019 +0000
+++ b/main.cpp Fri Jun 28 09:57:13 2019 +0000
@@ -7,7 +7,7 @@
#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 N_STEPS 1000
#define CAM_TRIG 20 // camera trigger pulse width (us)
Serial pc(USBTX, USBRX); // tx, rx
@@ -108,9 +108,9 @@
yLED = 0;
gLED = 1;
- 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);
+ //sprintf(outString, "iSteps, eTime, R1, R2 \n");
+ sprintf(outString, "iSteps, eTime, I1SIG, IREF, V1POS, V1NEG, R1,I2SIG,IREF, V2POS, V2NEG, R2\n");
+ pc.printf("%s", outString);
fprintf(fp, outString);
for (int iStep=0; iStep<N_STEPS; iStep++) {
@@ -140,9 +140,9 @@
r2_sum = r2_sum + r2;
r2_sum2 = r2_sum2 + (r2*r2);
- 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);
+ //printf(outString, "%10d,%10d,%10f,%10f\n", iStep, eTime, r1, r2); // log data
+ sprintf(outString, "%5d, %10d, %5d, %5d, %5d, %5d, %f %5d, %5d, %5d, %5d, %f\n", iStep, eTime, 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);
iStep++;