FOURNET Olivier
test ADC avec page Web reduite
Dependencies: UIPEthernet mbed FCT_WEB hebergement
Fork of
Nucleo_Web_ENC28J60
by 
FOURNET Olivier
P.S : 1ère mise en fonctionnement de la carte NUCLEO STM32F411RET6
Instruction pour la mise en fonctionnement : https://developer.mbed.org/users/Fo170/notebook/the-stm32-nucleo-64-board/
Diff: main.cpp
- Revision:
- 8:305b64d7dd23
- Parent:
- 7:acad90a34466
- Child:
- 9:2f7ad2b13ec8
--- a/main.cpp Sun Jul 26 22:14:02 2015 +0000
+++ b/main.cpp Mon Jul 27 21:20:49 2015 +0000
@@ -58,16 +58,18 @@
// IP address must be also unique and compatible with your network. Change as appropriate.
const IPAddress MY_IP(192,168,0,170);
-#define __IP_LOCAL__ "192.168.0.170"
-#define __hebergement__ "http://olivier.fournet.free.fr/electronique/Display_temperature_on_mini_web_server_v2/js/"
-#define __Temp_between_measurements__ "1"
-#define __Temp_between_measurements_in_Second__ 1
+const string __IP_LOCAL__ = "192.168.0.170";
+const string __hebergement__ = "http://olivier.fournet.free.fr/electronique/e/WebServerNucleo/js/";
+const string __Temp_between_measurements__ = "1";
+#define __Temp_between_measurements_in_Second__ 1
+
// Logo Test d'image en base64 :
// http://webcodertools.com/imagetobase64converter/Create
-#define __Logo_image__ "<img alt='' src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwwAADsMBx2+oZAAAABp0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAAUklEQVQ4T2NggIEGMIBzCTDgSh0cHAjrIcFgiGFoGoCWELYQrgLIgGsg4CtkaTibWNfu378fq2tpHx6EbcAMQ8J6iPU3cpIhbCqaisFpCTwVAwB5lit+0ltbrgAAAABJRU5ErkJggg=='>";
-#define __image_Password_Folder__ "<img alt='' src='http://olivier.fournet.free.fr/jpg/password_folder.jpg'>"
-#define __image_301_Moved_Permanently__ "<img alt='' src='http://olivier.fournet.free.fr/jpg/301_moved_permanently.jpg'>"
-#define __image_401_Unauthorized__ "<img alt='' src='http://olivier.fournet.free.fr/png/401_Unauthorized.png'>"
+const string __Logo_image__ = "<img alt='' src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwwAADsMBx2+oZAAAABp0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAAUklEQVQ4T2NggIEGMIBzCTDgSh0cHAjrIcFgiGFoGoCWELYQrgLIgGsg4CtkaTibWNfu378fq2tpHx6EbcAMQ8J6iPU3cpIhbCqaisFpCTwVAwB5lit+0ltbrgAAAABJRU5ErkJggg=='>";
+
+const string __image_Password_Folder__ = "<img alt='' src='http://olivier.fournet.free.fr/jpg/password_folder.jpg'>";
+const string __image_301_Moved_Permanently__ = "<img alt='' src='http://olivier.fournet.free.fr/jpg/301_moved_permanently.jpg'>";
+const string __image_401_Unauthorized__ = "<img alt='' src='http://olivier.fournet.free.fr/png/401_Unauthorized.png'>";
#define NB_SAMPLES 10
float adc_samples[NB_SAMPLES];// = { 0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0,1.01,1.02,1.03,1.04 };
@@ -139,40 +141,41 @@
httpContent = "";
httpContent += "<h1>301 Moved Permanently ";
- httpContent += __image_301_Moved_Permanently__ "</h1>\r\n";
+ httpContent += __image_301_Moved_Permanently__ + "</h1>\r\n";
return (httpContent);
}
string& page(uint8_t status)
{
char buffer[32];
- char time_stamp[32];
+ //char time_stamp[32];
float meas;
meas = a_in.read(); // Converts and read the analog input value (value from 0.0 to 1.0)
- meas = meas * 3300; // Change the value to be in the 0 to 3300 range
-
+ meas = meas * 3300.0; // Change the value to be in the 0 to 3300 range
+ //Seconds = Seconds + 1;
//-------------
httpContent = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\r\n";
- httpContent += "<meta http-equiv=\"refresh\" content=\"" __Temp_between_measurements__ ";url=http://" __IP_LOCAL__ "/\">\r\n";
+ httpContent += "<meta http-equiv=\"refresh\" content=\"" + __Temp_between_measurements__ + ";url=http://" + __IP_LOCAL__ + "/\">\r\n";
httpContent += "<HTML><HEAD>\r\n";
httpContent += "<title>WEB Server Nucleo F411RE - ENC28J60 - Flot Examples: Interactivity</title>\r\n";
- httpContent += "<script language=\"javascript\" type=\"text/javascript\" src=\"" __hebergement__ "Interactivity_init.js\"></script>\r\n";
- httpContent += "<script language=\"javascript\" type=\"text/javascript\">init_Interactivity();</script>\r\n";
+ httpContent += "<script language=\"javascript\" type=\"text/javascript\" src=\"" + __hebergement__ + "WebServerNucleo_Interactivity_init.js\"></script>\r\n";
+ httpContent += "<script language=\"javascript\" type=\"text/javascript\">init_WebServerNucleo_Interactivity();</script>\r\n";
// Variables JavaScript
httpContent += "<script language=\"javascript\" type=\"text/javascript\">\r\n";
- httpContent += "var color_T = \"#FF0000\";\r\n";
- httpContent += "var label_t = \"Adc(x)\";\r\n";
+ httpContent += "var color_Y = \"#FF0000\";\r\n";
+ httpContent += "var label_Y = \"Adc(x)\";\r\n";
httpContent += "var x_min = -0.5, x_max = 14.5, y_min = -0.5, y_max = 1.5;\r\n";
- httpContent += "var temperature = [[-0.1,0.1],[2,0.2],[3,0.3],[4,0.4],[5,0.5],[6,0.6],[7,0.7],[8,0.8],[9,0.9],[10,1],[11,1.01],[12,1.02],[13,1.03],[14,1.04]];\r\n";
+ httpContent += "var array_value = [[-0.1,0.1],[2,0.2],[3,0.3],[4,0.4],[5,0.5],[6,0.6],[7,0.7],[8,0.8],[9,0.9],[10,1],[11,1.01],[12,1.02],[13,1.03],[14,1.04]];\r\n";
httpContent += "</script>\r\n";
// Fin Variable JavaScript
httpContent += "</HEAD><BODY>\r\n";
httpContent += "<center><h2>WEB Server Nucleo F411RE</h2>\r\n";
httpContent += "<p>Designed for STM32F411RE & ENC28J60 (RTC, ADC - <a href=\"http://www.flotcharts.org/flot/examples/interacting/index.html\">Flot Examples: Interactivity</a>),\r\n";
- httpContent += "<p>Compilation avec mBED à " __TIME__ " le " __DATE__" \r\n";
+ //httpContent += "<p>Compilation avec mBED à " __TIME__ " le " __DATE__" \r\n";
- httpContent += __Logo_image__ "<p></center>\r\n";
- httpContent += "<hr><p>\r\n";
+ // httpContent += __Logo_image__ ;
+
+ httpContent += "<p></center>\r\n<hr><p>\r\n";
if(status == 1)
{
@@ -193,7 +196,7 @@
// this converts the value in seconds obtained above to human readable format and assigns it to the timestamp
sprintf(buffer, "%s", time_stamp);// diplays the human readable time
*/
- sprintf(buffer, "%f ", Seconds);// diplays the human readable Seconds
+ sprintf(buffer, "%.1f ", Seconds);// diplays the human readable Seconds
httpContent += buffer;
httpContent += "Seconds\r\n<hr>\r\n";
//----------------
@@ -201,7 +204,7 @@
sprintf(buffer, "%.0f mV\r\n", meas);
httpContent += buffer;
httpContent += "<hr>\r\n<p>Usage Password Page :<p>http://host_or_ip/password<p><hr>\r\n";
- httpContent += "<script language=\"javascript\" type=\"text/javascript\">Interactivity();</script>\r\n";
+ httpContent += "<script language=\"javascript\" type=\"text/javascript\">WebServerNucleo_Interactivity();</script>\r\n";
httpContent += "</BODY></HTML>";
//-----------
//wait(1);
@@ -216,7 +219,8 @@
httpContent += "<title>WEB Server Nucleo F411RE - ENC28J60 - Password Page</title>\r\n";
httpContent += "</HEAD><BODY>\r\n";
httpContent += "<center><h2>WEB Server Nucleo F411RE - ENC28J60 - Password Page</h2></center>\r\n";
- httpContent += "<p>" __image_Password_Folder__ "<p>\r\n";
+ httpContent += "<p>" + __image_Password_Folder__ + "<p>\r\n";
+
if(status == 1)
{
httpContent += "<hr><pre>\r\n <font color=#00FF00>ON</font>";
@@ -256,12 +260,12 @@
int main()
{
// RTC
- set_time(1387188323); // Set RTC time to 16 December 2013 10:05:23 UTC
+ //set_time(1387188323); // Set RTC time to 16 December 2013 10:05:23 UTC
// Date and time are set.
// Init the ticker with the address of the function (add_one_second) to be attached and the interval (100 ms)
- second_ticker.attach(&add_one_second, 0.1);
+ second_ticker.attach(&add_one_second, 0.1);
//-----------------
UIPEthernet.begin(MY_MAC,MY_IP);
myServer.begin();
@@ -312,8 +316,7 @@
if(cmd == -1)
{
httpHeader = UNAUTHORIZED;
- httpContent = "<h1>401 Unauthorized";
- httpContent += __image_401_Unauthorized__ "</h1>\r\n";
+ httpContent = "<h1>401 Unauthorized " + __image_401_Unauthorized__ + "</h1>\r\n";
http_send(client, httpHeader, httpContent);
continue;
}