Diff: main.cpp

Revision:

7:0d3484dc13a9

Parent:

6:060cb9725ce3

Child:

8:bab92fb7ef97

--- a/main.cpp	Wed Jan 12 14:16:20 2011 +0000
+++ b/main.cpp	Thu Jan 13 12:35:51 2011 +0000
@@ -8,7 +8,7 @@
  * @brief mbed Weather Platform
  */
 
-#define VERSION "mbed Weather Platform 0.1.2 (C) 2011 Suga koubou Co.,Ltd."
+#define VERSION "mbed Weather Platform 0.1.3 (C) 2011 Suga koubou Co.,Ltd."
 #define USE_I2CLEDDISP // I2C LED Display
 //#define NONBLOCKING // ethernet function non-bloking
  
@@ -16,13 +16,13 @@
 #include "BMP085.h"
 #include "SHT.h"
 #include "WeatherMeters.h"
-#include "ConfigFile.h"
 #include "SDFileSystem.h"
 #include "MSCFileSystem.h"
 #include "EthernetNetIf.h"
 #include "NTPClient.h"
 #include "HTTPClient.h"
 #include "Agentbed.h"
+#include "conf.h"
 
 #ifdef USE_I2CLEDDISP
 #include "I2CLEDDisp.h"
@@ -31,7 +31,7 @@
 Serial pc(USBTX, USBRX);
 int seq = 0;
 char filename[20];
-ConfigFile conf;
+Config conf;
 DigitalOut led1(LED1), led2(LED2), led3(LED3), led4(LED4);
 SDFileSystem sd(p5, p6, p7, p8, "sd"); 
 MSCFileSystem *usb;
@@ -142,7 +142,7 @@
 void init () {
     FILE *fp;
 
-    conf.load("/sd/weather.cfg");
+    config(CONFIG_FILE);
 
     pc.printf("Interval: %d sec\r\n", conf.interval);