Revision 12:974f7a96d6ab, committed 2015-08-13

Comitter:

uasonice

Date:

Thu Aug 13 18:35:55 2015 +0000

Parent:

11:7db34a66a751

Child:

13:cefc034543a5

Commit message:

update LED control

Changed in this revision

--- a/main.cpp	Wed Aug 12 11:16:46 2015 +0000
+++ b/main.cpp	Thu Aug 13 18:35:55 2015 +0000
@@ -20,9 +20,9 @@
 
 #define HTTPD_SERVER_PORT   80
 
+
 Serial uart(USBTX, USBRX); // tx, rx
 
-
 #if defined(USE_SDCARD)
 SDFileSystem sd(PB_3, PB_2, PB_1, PB_0, "sd"); // WIZwiki-W7500 
 #endif // defined(USE_SDCARD)
@@ -44,29 +44,14 @@
 #define  CHECK_DISTANCE 50
 #endif // defined(USE_MEASURE_DISTANCE)
 
+
 DigitalOut led1(LED1); //server listning status
 DigitalOut led2(LED2); //socket connecting status
 
-
 DigitalOut myled_R(D7);
 DigitalOut myled_G(D6);
 DigitalOut myled_B(D5);
 
-void LED_ON()
-{
-    DM_fLN("In LED_ON");
-    myled_R = 1;
-    myled_G = 1;
-    myled_B = 1;
-}
-
-void LED_OFF()
-{
-    DM_fLN("In LED_OFF");
-    myled_R = 0;
-    myled_G = 0;
-    myled_B = 0;
-}
 //////////////////////////////////////////////////////////////////////////
 Ticker ledTick;
 
@@ -76,6 +61,13 @@
     led1 = !led1;
 }
 
+void LedSet(int nSet)
+{
+    myled_R = nSet;
+    myled_G = nSet;
+    myled_B = nSet;
+}
+
 //////////////////////////////////////////////////////////////////////////
 int main()
 {
@@ -87,11 +79,8 @@
 
     uart.baud(115200);
     
-    LED_OFF();
-    
-    
-
     DM_fLN("INIT DEVICE");
+    LedSet(0);
 #if defined(USE_SDCARD)
     // Check File System
     DM_fLN("Checking File System");
@@ -138,32 +127,28 @@
     g_pHcsr = new HCSR04(D12, D11);
 #endif // defined(USE_MEASURE_DISTANCE)
 
+
     DM_fLN("start main loop");
     while(1) {
         int dist_cm = 0;
-        tm1.reset();
-        tm1.start();
 #if defined(USE_MEASURE_DISTANCE)
         if( (dist_cm = get_distance(g_pHcsr)) < CHECK_DISTANCE ) 
 #endif // defined(USE_MEASURE_DISTANCE)
         {
-            //Led On
-            LED_ON();
             DM_fLN("capture image: %d", dist_cm);
 #if defined(USE_CAMERA)
             memset(strFile, 0, 32);
             sprintf(strFile, "/sd/file_%03d.jpg", cntImage++);
+            LedSet(1);
             revJpeg_snapshot(g_pCam, strFile, CameraC328::JpegResolution640x480);
-            //Led Off
-            LED_OFF();
+            LedSet(0);
 #endif // defined(USE_CAMERA)
-
         }
-        fileServer();
-        
-        //wait_ms(1000);
-        tm1.stop();
-        //DM_fLN("time: %d", tm1.read_ms());
+#if 1
+        fileServer(NULL);
+#else   
+        wait_ms(1000);
+#endif
     }
     //return 0;
 }

--- a/mbed-src.lib	Wed Aug 12 11:16:46 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/mbed_official/code/mbed-src/#421d040916fe

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed.bld	Thu Aug 13 18:35:55 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/mbed/builds/b9ad9a133dc7
\ No newline at end of file

--- a/rev_httpFile.cpp	Wed Aug 12 11:16:46 2015 +0000
+++ b/rev_httpFile.cpp	Thu Aug 13 18:35:55 2015 +0000
@@ -58,10 +58,11 @@
                 DM_FLN("%s", dirName);
                 DIR *subDir = opendir(dirName);
                 if (subDir != NULL) {
-                    /* sprintf(httpHeader,"<li><a href=\"./%s/\">%s/</a></li>", p->d_name, p->d_name);  */
-                    sprintf(httpHeader,"<li><img width=50 height=50 src=\"./%s/\">%s/</li>", p->d_name, p->d_name); 
+                    sprintf(httpHeader,"<li><a href=\"./%s/\">%s/</a></li>", p->d_name, p->d_name);
                 } else {
+                    //strlen(p->d_name);
                     sprintf(httpHeader,"<li><a href=\"./%s\">%s</a></li>", p->d_name, p->d_name);
+                    //sprintf(httpHeader,"<li><img width=50 height=50 src=\"./%s\">%s</li>", p->d_name, p->d_name); 
                 }
                 client.send(httpHeader,strlen(httpHeader));
             }
@@ -94,10 +95,10 @@
     }
 }
 
-void fileServer(void)
+void fileServer(void const *data)
 {
     int ret;
-    
+
     //DM_FLN("Wait for new connection...");
     ret = server.accept(client);
     if(ret < 0) return;

--- a/rev_httpFile.h	Wed Aug 12 11:16:46 2015 +0000
+++ b/rev_httpFile.h	Thu Aug 13 18:35:55 2015 +0000
@@ -27,7 +27,7 @@
 extern DigitalOut led2; //socket connecting status
 
 void get_file(char* uri);
-void fileServer(void);
+void fileServer(void const *data);
 
 #endif // __REV_HTTPFILE_H__