FOURNET Olivier / Mbed 2 deprecated WIZwiki-W7500_ADC

WIZwiki-W7500_ADC + Flot Exemple interactivity + THING SPEAK

Dependencies:   SDFileSystem STATIC_COLORS WIZnetInterface mbed

/media/uploads/Fo170/wizwiki-w7500_adc.png

/media/uploads/Fo170/wizwiki_thing_speak.png

test durée de fonctionnement :

/media/uploads/Fo170/test_duree.png

172 458 secondes ===> environs 48h

Files at this revision

API Documentation at this revision

Revision 3:a2f1d3c11372, committed 2016-07-09

Comitter:
Fo170
Date:
Sat Jul 09 23:28:38 2016 +0000
Parent:
1:4853006cf179
Commit message:
nettoyage du code en commentaire

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Sat Jul 09 20:03:39 2016 +0000
+++ b/main.cpp	Sat Jul 09 23:28:38 2016 +0000
@@ -110,7 +110,6 @@
 
 Ticker ledTick;
 
-//char str[] = "This is a sample string";
 char *pch;
 char ext[5];
 char ext_gif[] = "gif";
@@ -135,8 +134,6 @@
 void variables(void)
 {
  printf_send_client("<SCRIPT script language=\"javascript\" type=\"text/javascript\">\r\n");
- /*sprintf(httpHeader,"<SCRIPT script language=\"javascript\" type=\"text/javascript\">\r\n");
- client.send(httpHeader,strlen(httpHeader));*/
  
  a0_f = ain0.read()*3.3;
  sprintf(httpHeader,"A0 = %3.3f;\r\n", a0_f);
@@ -154,9 +151,7 @@
  sprintf(httpHeader,"A3 = %3.3f;\r\n", a3_f);
  client.send(httpHeader,strlen(httpHeader));
  
- printf_send_client("</SCRIPT>\r\n");
- /*sprintf(httpHeader,"</SCRIPT>\r\n");
- client.send(httpHeader,strlen(httpHeader));  */  
+ printf_send_client("</SCRIPT>\r\n"); 
 }
 
 void ETAT(void)
@@ -165,45 +160,29 @@
   
   // httpHeader
   printf_send_client("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: Close\r\n\r\n");
-  /*sprintf(httpHeader,"HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: Close\r\n\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
             
   // Début page Web
   printf_send_client("<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\r\n");
-  /*sprintf(httpHeader,"<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
+
   // meta_refresh
-  //sprintf(httpHeader,"%s",str_meta_refresh);
   sprintf(httpHeader,"<meta http-equiv=\"refresh\" content=\"" __Time_between_page_refresh__ ";url=http://%s/\">\r\n", eth.getIPAddress() );
   //sprintf(httpHeader,"<meta http-equiv=\"refresh\" content=\"1;url=http://%s/\">\r\n", eth.getIPAddress() );
   //sprintf(httpHeader,"<meta http-equiv=\"refresh\" content=\"%u;url=http://%s/\">\r\n", refresh, eth.getIPAddress() );
   client.send(httpHeader,strlen(httpHeader));
   
   printf_send_client("<html><head>\r\n");
-  /*sprintf(httpHeader,"<html><head>\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
   // title
   printf_send_client("<title>WIZwiki-W7500 - Flot Examples: Interactivity</title>\r\n");
-  /*sprintf(httpHeader,"<title>WIZwiki-W7500 - Flot Examples: Interactivity</title>\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
   // JavaScript Interactivity  
   sprintf(httpHeader,"<script language=\"javascript\" type=\"text/javascript\" src=\"" __hebergement__ "electronique/e/WIZwiki-W7500/js/WIZwiki-W7500_Interactivity_init.js\"></script>\r\n");
   client.send(httpHeader,strlen(httpHeader));
   
   printf_send_client("<script language=\"javascript\" type=\"text/javascript\">init_WIZwiki_W7500_Interactivity();</script>\r\n");
-  /*sprintf(httpHeader,"<script language=\"javascript\" type=\"text/javascript\">init_WIZwiki_W7500_Interactivity();</script>\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
   
   // Variables JavaScript
   printf_send_client("<script language=\"javascript\" type=\"text/javascript\">\r\n");
-  /*sprintf(httpHeader,"<script language=\"javascript\" type=\"text/javascript\">\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
   printf_send_client("var color_Y = \"#FF0000\";\r\n");
-  /*sprintf(httpHeader,"var color_Y = \"#FF0000\";\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
   printf_send_client("var label_Y = \"Adc(mV)\";\r\n");
-  /*sprintf(httpHeader,"var label_Y = \"Adc(mV)\";\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
   // sprintf(httpHeader, "var x_min = -0.5, x_max =  14.5, y_min = -0.5, y_max =  1.5;\r\n"); // TEST
   sprintf(httpHeader, "var x_min = %.1f, x_max = %.1f, y_min = %.1f, y_max = %.1f;\r\n", x_min, x_max, y_min, y_max);
   client.send(httpHeader,strlen(httpHeader));
@@ -214,8 +193,7 @@
   if(Sample > NB_SAMPLES)
     {
      printf_send_client("var array_value = [");
-     /*sprintf(httpHeader,"var array_value = [");
-     client.send(httpHeader,strlen(httpHeader));*/
+
      for(i = 0 ; i < NB_SAMPLES ; i++)
      {
       if(i < NB_SAMPLES) sprintf(httpHeader, "[%.1f,%.1f],", time_samples[i], adc_samples[i]);
@@ -223,34 +201,23 @@
       client.send(httpHeader,strlen(httpHeader));
      }
      printf_send_client("];\r\n");
-     /*sprintf(httpHeader,"];\r\n");
-     client.send(httpHeader,strlen(httpHeader));*/
     }
     
     Sample++;
     printf_send_client("</script>\r\n");
-    /*sprintf(httpHeader,"</script>\r\n");
-    client.send(httpHeader,strlen(httpHeader));*/
     
     // <SCRIPT>
     variables();
     // <FIN SCRIPT>
     // Fin Variable JavaScript
     printf_send_client("</head><body><center>\r\n");
-  /*sprintf(httpHeader,"</head><body><center>\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
             
   sprintf(httpHeader,"<h2>WIZwiki-W7500 - mBED</h2> ( Compiled at : %s and %s )<p>\r\n",  __DATE__ , __TIME__);
-  //sprintf(httpHeader,"<h2>WIZwiki-W7500 - mBED</h2><p>\r\n");
   client.send(httpHeader,strlen(httpHeader));
   
   printf_send_client("<p>(<a href=\"http://www.flotcharts.org/flot/examples/interacting/index.html\">Flot Examples: Interactivity</a>)<p>\r\n");
-  /*sprintf(httpHeader,"<p>(<a href=\"http://www.flotcharts.org/flot/examples/interacting/index.html\">Flot Examples: Interactivity</a>)<p>\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
   
   printf_send_client("ETAT :<p>\r\n");
-  /*sprintf(httpHeader,"ETAT :<p>\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
   
   sprintf(httpHeader,"IP: %s, MASK: %s, GW: %s<p>\r\n",
                       eth.getIPAddress(), eth.getNetworkMask(), eth.getGateway());
@@ -276,16 +243,10 @@
   client.send(httpHeader,strlen(httpHeader));
   
   printf_send_client("<p><script language=\"javascript\" type=\"text/javascript\">WIZwiki_W7500_Interactivity();</script><p>\r\n");
-  /*sprintf(httpHeader,"<p><script language=\"javascript\" type=\"text/javascript\">WIZwiki_W7500_Interactivity();</script><p>\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
   
   printf_send_client("<p><a href=\"..\">Root</a>\r\n");
-  /*sprintf(httpHeader,"<p><a href=\"..\">Root</a>\r\n");
-  client.send(httpHeader,strlen(httpHeader));*/
   
-  printf_send_client("</center></body></html>\r\n");        
-  /*sprintf(httpHeader,"</center></body></html>\r\n");
-  client.send(httpHeader,strlen(httpHeader)); */        
+  printf_send_client("</center></body></html>\r\n");              
 }
 
 //--------------------------------------------