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: SDFileSystem dspmodified mbed
Diff: merged_code.cpp
- Revision:
- 17:824537d9204b
- Parent:
- 16:622629b0cf3c
- Child:
- 18:4e3aa33674c8
- Child:
- 19:0f009e5e5646
--- a/merged_code.cpp Thu Apr 30 08:48:20 2015 +0000
+++ b/merged_code.cpp Tue Jun 23 11:24:06 2015 +0000
@@ -9,7 +9,7 @@
#define freq 1
#define fft_points 16384
#define dur_sec 16.384
-#define module_name "TFT1" //enter module name here
+#define module_name "TFT2" //enter module name here
Serial pc(USBTX, USBRX);
Serial gsm(D1, D0);
@@ -32,7 +32,7 @@
char hour_dir[100] ="";
char pathAC[100] ="";
char pathDC[100] ="";
-char pathDCdetect[100] ="";
+//char pathDCdetect[100] ="";
char pathfft[100]="";
//char putpathname[100]="";
char filenameAC[100] ="";
@@ -465,7 +465,8 @@
fprintf(fp, "EOF");
fclose(fp);
}
-// DC Detect storage
+//Rushabh: DCD storage deemed unnecessary as avg values stored twice
+/* DC Detect storage
sprintf(pathDCdetect,"%sData.txt",hour_dir);
//pc.printf("\r\nFilename-DCD\t%s", pathDCdetect);
fp = fopen(pathDCdetect, "w");
@@ -483,7 +484,7 @@
}
fclose(fp);
}
-
+*/
int avg_dc_detect=0, avg_temp=0;
for(int i=0; i<10; i++)
{