flavien/LoRaGateway_BTS2A
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add treament program

Browse Source
This commit is contained in:
Flavien Haas 2018-06-08 23:18:11 +02:00
parent 6f36fc2f11
commit 355bfe40d9
6 changed files with 142 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored Normal file
View File

Binary file not shown.

5
WebServer/WebServer/WebServer.ino
View File

@ -1,3 +1,8 @@
// Flavien HAAS, 2018
// before transfert, check these things:
// have all the librairies needed installed on your machine
// changed the SS port for ethernet as indicated on the README or you will not be able to use the LoRa shield as the same time as the Ethernet shield
#include <SPI.h>
#include <Ethernet.h>
#include <SD.h>

118
frameTreatment/frameTreatment.ino Normal file
View File

@ -0,0 +1,118 @@
// Flavien HAAS, 2018
// before transfert, check these things:
// have all the librairies needed installed on your machine
#include <SPI.h> // to communicate using spi (required for our shields)
#include <LoRa.h> // to use the LoRa shield
#include <CModemLoRa.h> // to use personalised LoRa class
#include <CProtocol12Bytes.h> // to use our protocol
CModemLoRa thisLoRa; // create object for personnalizeed LoRa class
CProtocol12Bytes goodOne; // create object to store data using our protocol
int ts1=0; // for comparing later the LoRa frames using timestamp data
int ts2=0; // for comparing later the LoRa frames using timestamp data
int id1=0; // for comparing later the LoRa frames using ID data
int id2=0; // for comparing later the LoRa frames using ID data
bool readFrameAndCheckID(); // function that compares station's ID
bool readFrameAndCheckTS(); // function that compares frame's TimeStamp
void setup(){
Serial.begin(9600);
while (!Serial); // wait for serial to initialize
Serial.println("LoRa frame treatment"); // display on serial the name of the device
thisLoRa.begin(); // initialise LoRa
} // end of setup
void loop() {
// frame treatment
while(readFrameAndCheckID() == true){
// post to server
EthernetClient postClient;
String postData = "ID="+String(goodOne.getStationId())+"&IDp="+String(goodOne.getGatewayId())+"&TS="+String(goodOne.getTimestampMessage())+"&DT="+String(goodOne.getDataType())+"&D1="+String(goodOne.getDataOne())+"&D2="+String(goodOne.getDataTwo())+"&D3="+String(goodOne.getDataThree());
if (postClient.connect("btslimayrac.ovh", 80)){
postClient.print("POST /weather/formulaire/formulaireCollecteLORA.php HTTP/1.1\n");
postClient.print("Host: btslimayrac.ovh\n");
postClient.print("Connection: close\n");
postClient.print("Content-Type: application/x-www-form-urlencoded\n");
postClient.print("Content-Length: ");
postClient.print(postData.length());
postClient.print("\n\n");
postClient.print(postData);
Serial.println("Post to server sent");
}
else{
Serial.println("Post failed");
}
}
}// end void loop
bool readFrameAndCheckID(){
int packetSize = thisLoRa.parsePacket();
if (packetSize > 0)
{
thisLoRa.read(&checkID); // objet thislora qui appele classe Lora.h et rempli la stucture de l'objet protocol, ser a allèger -5lignes
SerialUSB.println("Frame received");
delay(100);
}
id1 = checkID.getStationId();
packetSize = thisLoRa.parsePacket();
if (packetSize > 0)
{
thisLoRa.read(&checkID); // objet thislora qui appele classe Lora.h et rempli la stucture de l'objet protocol, ser a allèger -5lignes
SerialUSB.println("Frame received");
delay(100);
}
id2 = checkID.getStationId();
if(id1==id2){
readFrameAndCheckID();
}
else{
readFrameAndCheckTS();
return true;
}
} //end readframeandcheckid
bool readFrameAndCheckTS(){
int packetSize = thisLoRa.parsePacket();
if (packetSize > 0)
{
thisLoRa.read(&protocol); // objet thislora qui appele classe Lora.h et rempli la stucture de l'objet protocol, ser a allèger -5lignes
SerialUSB.println("Frame received");
delay(100);
}
ts1 = protocol.getTimestampMessage();
packetSize = thisLoRa.parsePacket();
if (packetSize > 0)
{
thisLoRa.read(&protocol); // objet thislora qui appele classe Lora.h et rempli la stucture de l'objet protocol, ser a allèger -5lignes
SerialUSB.println("Frame received");
delay(100);
}
ts2 = protocol.getTimestampMessage();
if(ts1==ts2){
return false;
}
else{
SerialUSB.println("New Frame :");
SerialUSB.print("ID = ");
SerialUSB.print(protocol.getStationId(),HEX);
SerialUSB.println(protocol.getGatewayId(),HEX);
SerialUSB.print("TS = ");
SerialUSB.println(protocol.getTimestampMessage(),HEX);
SerialUSB.print("DT = ");
SerialUSB.println(protocol.getDataType(),HEX);
SerialUSB.print("D1 = ");
SerialUSB.println(protocol.getDataOne(),HEX);
SerialUSB.print("D2 = ");
SerialUSB.println(protocol.getDataTwo(),HEX);
SerialUSB.print("D3 = ");
SerialUSB.println(protocol.getDataThree(),HEX);
return true;
}
} //end readframeandcheckts

34
gateway/gateway.ino
View File

@ -18,13 +18,21 @@ CProtocol12Bytes protocol; // create object to
File webFile; // variable for the file containing the webpage
// void setSPIFrequency(uint32_t frequency); // set the SPI at 8MHz to use logic analyser
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
EthernetServer server(80); // initialize the EthernetServer library, using port 80 (default fot HTTP)
int ts1=0; // for comparing later the LoRa frames using timestamp data
int ts2=0; // for comparing later the LoRa frames using timestamp data
int id1=0; // for comparing later the LoRa frames using ID data
int id2=0; // for comparing later the LoRa frames using ID data
bool readFrameAndCheckID(); //function that compares station's ID
bool readFrameAndCheckTS(); //function that compares frame's TimeStamp
// void setSPIFrequency(uint32_t frequency); // set the SPI at 8MHz to use logic analyser
void setup(){
Serial.begin(9600);
while (!Serial); // wait for serial to initialize
@ -78,7 +86,6 @@ while(readFrameAndCheckID() == true){
// WebServer
EthernetClient serverGateway = server.available(); // try to get client
if (serverGateway) { // got client?
boolean currentLineIsBlank = true;
while (serverGateway.connected()) {
@ -120,8 +127,6 @@ while(readFrameAndCheckID() == true){
} //end void loop
bool readFrameAndCheckID(){
int id1=0; // for comparing later the LoRa frames using ID data
int id2=0; // for comparing later the LoRa frames using ID data
int packetSize = thisLoRa.parsePacket();
if (packetSize > 0)
{
@ -148,10 +153,7 @@ bool readFrameAndCheckID(){
}
} //end readframeandcheckid
bool readFrameAndCheckTS(){
int ts1=0; // for comparing later the LoRa frames using timestamp data
int ts2=0; // for comparing later the LoRa frames using timestamp data
int packetSize = thisLoRa.parsePacket();
if (packetSize > 0)
{
@ -190,22 +192,6 @@ bool readFrameAndCheckTS(){
}
} //end readframeandcheckts
//void PrintElapsedTime( boolean espaceFinal=true ){ // to display the elapsed time
// unsigned long h,m,s = millis()/1000;
// m=s/60;

4
numero_passerelle/numero_passerelle.ino
View File

@ -1,3 +1,7 @@
// Flavien HAAS, 2018
// before transfert, check these things:
// have all the librairies needed installed on your machine
void setup() {
Serial.begin(9600);
}

5
postToServer/postToServer.ino
View File

@ -1,3 +1,8 @@
// Flavien HAAS, 2018
// before transfert, check these things:
// have all the librairies needed installed on your machine
// changed the SS port for ethernet as indicated on the README or you will not be able to use the LoRa shield as the same time as the Ethernet shield
#include <SPI.h> // to use SPI
#include <Ethernet.h> // to use ethernet
#include <CProtocol12Bytes.h> // to use our frame protocol