Revision 19:70c911d35e67, committed 2015-01-13

Comitter:

jakehodges

Date:

Tue Jan 13 23:40:29 2015 +0000

Parent:

18:e68c8551d12c

Child:

20:fb2a9f4d2de7

Commit message:

Change SD card directory structure to use type codes rather than hard-coded strings

Changed in this revision

--- a/sdcard.cpp	Tue Jan 13 23:38:55 2015 +0000
+++ b/sdcard.cpp	Tue Jan 13 23:40:29 2015 +0000
@@ -3,11 +3,7 @@
 #include <map>
 
 sdcard::sdcard(): sd(p5, p6, p7, p8, "sd")
-{
-    typeLookup[0x00] = "soil_con";
-    typeLookup[0x01] = "soil_temp";
-    typeLookup[0x02] = "amb_temp";
-    
+{   
     //first write sometimes fails, let's ensure the first write isn't real data
     FILE *fp = fopen("/sd/boot", "w");
     fprintf(fp, "boot");
@@ -21,9 +17,7 @@
     string sd_location ="";
     char time_s[64];
  
-    string l_type = typeLookup[data.type];
- 
-    sd_location = sd_name + l_type;
+    sd_location = sd_name + data.type;
     mkdir(sd_location.c_str(), 0777);
     
     sprintf(time_s, "%d", time);

--- a/sdcard.h	Tue Jan 13 23:38:55 2015 +0000
+++ b/sdcard.h	Tue Jan 13 23:40:29 2015 +0000
@@ -7,6 +7,5 @@
         sdcard(); // MOSI, MISO, CKL, CS -> PINS 2, 7, 5, 1, ON SD CARD WITH 4=VCC, 6=GND, 8,9=NC
         int write(long int time_holder, d_reply data);
     private:
-        map<char,string> typeLookup;
         SDFileSystem sd;
 };
\ No newline at end of file