Revision 7:c2097153ff5c, committed 2019-01-18

Comitter:

hogejun

Date:

Fri Jan 18 13:30:21 2019 +0000

Parent:

6:dc3fa898ae44

Child:

8:49dfc9ab1950

Commit message:

updated

Changed in this revision

--- a/main.cpp	Tue Jan 15 14:15:16 2019 +0000
+++ b/main.cpp	Fri Jan 18 13:30:21 2019 +0000
@@ -3,7 +3,7 @@
 #include "USBSerial.h"
 #include "ADT7410.h"
 
-//#define USE_ADT7410
+#define USE_ADT7410
 //-------------------------------------------------------------------------------
 //Port Settings
 DigitalOut led1(LED1);
@@ -40,7 +40,8 @@
 int dummyval[] = {0,1,2,3,4,5,6,7,8,9};
 #define DUMMYVALLEN (sizeof(dummyval)/sizeof(dummyval[0]))
 #endif
-int senseval;
+int sense_int;
+float senseval;
 
 //-------------------------------------------------------------------------------
 //Program
@@ -49,26 +50,31 @@
 uint32_t sequenceId ;
 
 void sw_int(){
+    serial.printf("sw_int\n");
     if(wlan_connected==1){
         // disconnect 
         // 1. get sequenceID
         // 2. issue disconnect command
         // 3. wait response 
+    serial.printf("disconnect\n");
         sequenceId = sd.getNextSequenceId();
         sd.wlan_disconnect(sequenceId);
         sd.waitResponse(sequenceId);
         wlan_connected =0;
-        led1 = 0;
+//        led1 = 0;
+        sDP = 0;
         wait(5.0);
     }else{
         // establish
         // 1. get sequenceID
         // 2. issue establish command
         // 3. wait resoonse        
+    serial.printf("establish\n");
         sequenceId = sd.getNextSequenceId();
         sd.wlan_establish(sequenceId, "isdiotest", "12345678", FlashAir_iSDIO::ENCMODE_WPA2PSK_AES);
         sd.waitResponse(sequenceId);
-        led1 = 1;
+//        led1 = 1;
+        sDP = 1;
         wlan_connected =1;
         wait(5.0);
     
@@ -113,11 +119,16 @@
     }
 }
 
-int out_file(int val)
+
+void out_file(float val)
 {
-    FILE *fd = fopen("/sd/temp.text", "a");
-    fprintf(fd, "%d,", val);
-    fclose(fd);    
+    FILE *fd = fopen("/sd/test.text", "a");
+    fprintf(fd, "%.02f\n\r", val);
+    fclose(fd);
+    
+    led1 = 1;
+    wait(0.5);
+    led1 = 0;    
 }
 
 int main()
@@ -145,13 +156,14 @@
     while(1)
     {
 #ifdef USE_ADT7410
-        senseval = (int)sensor.getTemp();
+        senseval = sensor.getTemp();
+        sense_int = (int)sensor.getTemp();
 #else
-        senseval = dummyval[i];
+        sense_int = dummyval[i];
 #endif        
-        seg_disp(senseval);
+        seg_disp(sense_int);
         out_file(senseval);
-        serial.printf("%d\n",senseval);
+        serial.printf("%f\n",senseval);
         i++;
 #ifndef USE_ADT7410
         if(i>=DUMMYVALLEN) i=0;