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

added support for the multi received frame

Browse Source
This commit is contained in:
Flavien Haas 2018-05-27 01:20:20 +02:00
parent 0fc0588334
commit 03984040c0
1 changed files with 94 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
gateway/gateway.ino
View File

@ -1,84 +1,72 @@
// Flavien HAAS, 2018 // Flavien HAAS, 2018
// before transfert, check that you have changed the SS port as indicated on the README or you will not be able to use the LoRa shield as the same time as the Ethernet shield // 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 communicate using spi (required for our shields) #include <SPI.h> // to communicate using spi (required for our shields)
#include <LoRa.h> // to use the LoRa shield #include <LoRa.h> // to use the LoRa shield
#include <Ethernet.h> // to use the ethernet shield #include <Ethernet.h> // to use the ethernet shield
#include <SD.h> // to use a SD card #include <SD.h> // to use a SD card
#include <CModemLoRa.h> // to use personalised LoRa class #include <CModemLoRa.h> // to use personalised LoRa class
#include <CProtocol12Bytes.h> // to use our protocol #include <CProtocol12Bytes.h> // to use our protocol
#define LENMAX 80 // maximum size for the LoRa frame #define LENMAX 80 // maximum size for the LoRa frame
#define Serial SerialUSB // serial out on the M0 use a different function #define Serial SerialUSB // serial out on the M0 use a different function
CModemLoRa thisLoRa; // create object for personnalizeed LoRa class CModemLoRa thisLoRa; // create object for personnalizeed LoRa class
CProtocol12Bytes protocol; // create object to store data using our protocol CProtocol12Bytes protocol; // create object to store data using our protocol
File webFile; // variable for the file containing the webpage File webFile; // variable for the file containing the webpage
// void setSPIFrequency(uint32_t frequency); // set the SPI at 8MHz to use logic analyser // void setSPIFrequency(uint32_t frequency); // set the SPI at 8MHz to use logic analyser
byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFF, 0xFD}; // set the mac address byte mac[] = {0xDE, 0xAD, 0xBE, 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
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)
EthernetServer server(80); // initialize the EthernetServer library, using port 80 (default fot HTTP)
void setup(){ void setup(){
Serial.begin(9600); Serial.begin(9600);
while (!Serial); // wait for serial to initialize while (!Serial); // wait for serial to initialize
Serial.println("LoRa Gateway"); // display on serial the name of the device Serial.println("LoRa Gateway"); // display on serial the name of the device
thisLoRa.begin(); // initialise LoRa thisLoRa.begin(); // initialise LoRa
//Ethernet.begin(mac, ip); // initialize Ethernet shield using the set mac adress and set IP //Ethernet.begin(mac, ip); // initialize Ethernet shield using the set mac adress and set IP and DHCP for the rest
Ethernet.begin(mac); // initialize Ethernet shield uding the set mac and DHCP for the IP Ethernet.begin(mac); // initialize Ethernet shield uding the set mac and DHCP for the rest
server.begin(); // initialize WebServer part of the librairy server.begin(); // initialize WebServer part of the librairy
Serial.print("server is at "); Serial.print("server is at ");
Serial.println(Ethernet.localIP()); // display on serial the IP you can find the webpage Serial.println(Ethernet.localIP()); // display on serial the IP you can find the webpage
Serial.println("Initializing SD card..."); // initialize SD card Serial.println("Initializing SD card..."); // initialize SD card
if (!SD.begin(4)) { if (!SD.begin(4)) {
Serial.println("ERROR - SD card initialization failed!"); Serial.println("ERROR - SD card initialization failed!");
return; // init failed return; // init failed
} }
Serial.println("SUCCESS - SD card initialized."); Serial.println("SUCCESS - SD card initialized.");
if (!SD.exists("index.htm")) { // check for index.htm file if (!SD.exists("index.htm")) { // check for index.htm file
Serial.println("ERROR - Can't find index.htm file!"); Serial.println("ERROR - Can't find index.htm file!");
return; // can't find index file return; // can't find index file
} }
Serial.println("SUCCESS - Found index.htm file."); Serial.println("SUCCESS - Found index.htm file.");
} // end of setup } // end of setup
//void SerialPrintElapsedTime( boolean espaceFinal=true ){ // to display the elapsed time
// unsigned long h,m,s = millis()/1000;
// m=s/60;
// h=m/60;
// s=s-(m*60);
// m=m-(h*60);
// Serial << ((h<10)?"0":"") << h << ":" << ((m<10)?"0":"") << m << ":" << ((s<10)?"0":"") << s << (espaceFinal?" ":"");
//}
void loop() { void loop() {
// LoRa receiver // LoRa receiver
int packetSize = thisLoRa.parsePacket(); // int packetSize = thisLoRa.parsePacket();
if (packetSize > 0) // if (packetSize > 0)
{ // {
SerialUSB.println("Nouvelle trame reçue"); // 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 recieved");
// delay(100);
// }
thisLoRa.read(&protocol); // objet thislora qui appele classe Lora.h et rempli la stucture de l'objet protocol, ser a allèger -5lignes // SerialPrintElapsedTime(); // diplay the time the frame arrived
SerialUSB.println(protocol.getStationId(),HEX); // frame treatment
SerialUSB.println(protocol.getGatewayId(),HEX); while(readFrameAndCheckTS() == true){
SerialUSB.println(protocol.getTimestampMessage(),HEX); Serial.println("trame envoyée");
SerialUSB.println(protocol.getDataType(),HEX); }
SerialUSB.println(protocol.getDataOne(),HEX);
SerialUSB.println(protocol.getDataTwo(),HEX);
SerialUSB.println(protocol.getDataThree(),HEX);
delay(100);
}
// SerialPrintElapsedTime(); // diplay the time the frame arrived
// post to server // post to server
// EthernetClient postClient; // EthernetClient postClient;
@ -96,17 +84,17 @@ void loop() {
// Serial.println("post envoye vers le serveur"); // Serial.println("post envoye vers le serveur");
// WebServer // WebServer
EthernetClient serverGateway = server.available(); // try to get client EthernetClient serverGateway = server.available(); // try to get client
if (serverGateway) { // got client? if (serverGateway) { // got client?
boolean currentLineIsBlank = true; boolean currentLineIsBlank = true;
while (serverGateway.connected()) { while (serverGateway.connected()) {
if (serverGateway.available()) { // client data available to read if (serverGateway.available()) { // client data available to read
char c = serverGateway.read(); // read 1 byte (character) from client char c = serverGateway.read(); // read 1 byte (character) from client
// last line of client request is blank and ends with \n // last line of client request is blank and ends with \n
// respond to client only after last line received // respond to client only after last line received
if (c == '\n' && currentLineIsBlank) { if (c == '\n' && currentLineIsBlank) {
// send a standard http response header // send a standard http response header
serverGateway.println("HTTP/1.1 200 OK"); serverGateway.println("HTTP/1.1 200 OK");
serverGateway.println("Content-Type: text/html"); serverGateway.println("Content-Type: text/html");
serverGateway.println("Connection: close"); serverGateway.println("Connection: close");
@ -137,3 +125,48 @@ void loop() {
serverGateway.stop(); // close the connection serverGateway.stop(); // close the connection
} // end if (serverGateway) } // end if (serverGateway)
} //end void loop } //end void loop
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)
{
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 recieved");
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 recieved");
delay(100);
}
ts2 = protocol.getTimestampMessage();
if(ts1==ts2){
return false;
}
else{
SerialUSB.println("New Frame :");
SerialUSB.println(protocol.getStationId(),HEX);
SerialUSB.println(protocol.getGatewayId(),HEX);
SerialUSB.println(protocol.getTimestampMessage(),HEX);
SerialUSB.println(protocol.getDataType(),HEX);
SerialUSB.println(protocol.getDataOne(),HEX);
SerialUSB.println(protocol.getDataTwo(),HEX);
SerialUSB.println(protocol.getDataThree(),HEX);
return true;
}
}
//void PrintElapsedTime( boolean espaceFinal=true ){ // to display the elapsed time
// unsigned long h,m,s = millis()/1000;
// m=s/60;
// h=m/60;
// s=s-(m*60);
// m=m-(h*60);
// Serial << ((h<10)?"0":"") << h << ":" << ((m<10)?"0":"") << m << ":" << ((s<10)?"0":"") << s << (espaceFinal?" ":"");
//}