diff --git a/WebServer/gg.html b/WebServer/gg.html deleted file mode 100644 index 83d4b4e..0000000 --- a/WebServer/gg.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - fadeIn demo - - - - - -
-
-
-

Passerelle LoRa

-
-
-

[Température actuelle]

-
-
-

- Nombre d'échantillons envoyés = %, Echec d'envoi : % -

-
-
- -
-
- - - - - diff --git a/WebServer/index.htm b/WebServer/index.htm new file mode 100644 index 0000000..8c7e8fa --- /dev/null +++ b/WebServer/index.htm @@ -0,0 +1,112 @@ + + + + + + + Passerelle LoRa + + + + +
+
+

Passerelle LoRa

+
+
+

[Température actuelle]

+
+
+

+ Nombre d'échantillons envoyés = %, Echec d'envoi : % +

+
+
+ + + + + + + + + + +
+
+ + diff --git a/WebServer/index.html b/WebServer/index.html index 0d47d19..8b78fe5 100644 --- a/WebServer/index.html +++ b/WebServer/index.html @@ -1,121 +1,64 @@ - - - - - - - Passerelle LoRa - + + + - input - { - width:100%; - box-sizing:border-box; - -webkit-box-sizing:border-box; - -moz-box-sizing:border-box; - } +
+
+
+

Passerelle LoRa

+
+
+

[Température actuelle]

+
+
+

+ Nombre d'échantillons envoyés = %, Echec d'envoi : % +

+
+
+ +
+
- select - { - width:100%; - } + - textarea - { - resize:none; - width:98%; - height:318px; - padding:5px; - overflow:auto; - } - - body - { - text-align:center; - font-family:verdana; - background-color: #bcd5ff; - } - - td - { - padding:0px; - } - - button - { - border:0; - border-radius:0.3rem; - background-color:#1fa3ec; - color:#fff; - line-height:2.4rem; - font-size:1.2rem; - width:100%; - -webkit-transition-duration:0.4s; - transition-duration:0.4s; - } - - button:hover - { - background-color:#006cba; - } - - .p - { - float:left; - text-align:left; - } - - .q - { - float:right; - text-align:right; - } - - - - - -
-
-

Passerelle LoRa

-
-
-

[Température actuelle]

-
-
-

- Nombre d'échantillons envoyés = %, Echec d'envoi : % -

-
-
- -
- - + diff --git a/fakeStation/fakeStation.ino b/fakeStation/fakeStation.ino index 4dac6d5..f527470 100644 --- a/fakeStation/fakeStation.ino +++ b/fakeStation/fakeStation.ino @@ -12,7 +12,7 @@ void setup() { SerialUSB.begin(9600); SerialUSB.println("LoRa Sender"); thisLoRa.begin(); - protocol.codeFrame(0x0B,0x00,0x0000,0x0001,0x0000,0x0000,0x0000); + protocol.codeFrame(0x0A,0x00,0x0000,0x0001,0x0000,0x0000,0x0000); } void loop() diff --git a/gateway/gateway.ino b/gateway/gateway.ino index 972de83..65b87c0 100644 --- a/gateway/gateway.ino +++ b/gateway/gateway.ino @@ -15,6 +15,10 @@ CProtocol12Bytes protocol; // create object to File webFile; // variable for the file containing the webpage +//String postData; +//String tsarray; +//String oldpostData; + byte mac[] = {0xFA, 0xE3, 0x40, 0xEF, 0xFF, 0xFD}; // set the mac address //IPAddress ip(192, 1, 1, 150); // set the IP address for the ethernet shield, overwise the librairy use DHCP @@ -43,11 +47,11 @@ void setup(){ return; // init failed } SerialUSB.println("SUCCESS - SD card initialized."); - if (!SD.exists("index.htm")) { // check for index.htm file - SerialUSB.println("ERROR - Can't find index.htm file!"); + if (!SD.exists("index.html")) { // check for index.html file + SerialUSB.println("ERROR - Can't find index.html file!"); return; // can't find index file } - SerialUSB.println("SUCCESS - Found index.htm file."); + SerialUSB.println("SUCCESS - Found index.html file."); }// end of setup void loop() { @@ -117,7 +121,7 @@ void loop() { serverGateway.println("Connection: close"); serverGateway.println(); // send web page - webFile = SD.open("index.htm"); // open web page file + webFile = SD.open("index.html"); // open web page file if (webFile) { // if the webfile exist while(webFile.available()) { // the webfile is avaible serverGateway.write(webFile.read()); // send webfile to client