ua1zbe
/
LoRa_APRS_iGate111
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

repack1

This commit is contained in:
richonguzman 2023-06-04 10:10:39 -04:00
parent ede0541be3
commit 30b75493dc
6 changed files with 138 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/igate_conf.json
View File

@ -1,7 +1,6 @@
{
"callsign": "NOCALL-10",
"comment": "LoRa_APRS_iGate https://github.com/richonguzman/LoRa_APRS_iGate",
"beacon_interval": 15,
"wifi": {
"AP": [
{ "SSID": "WiFi_AP_1",
@ -20,19 +19,24 @@
"passcode": "VWXYZ",
"server": "soam.aprs2.net",
"port": 14580,
"software_name" : "ESP32_LoRa_iGate",
"software_version" : "0.1.1",
"reporting_distance" : 30
"softwareName" : "ESP32_LoRa_iGate",
"softwareVersion" : "0.1.1",
"reportingDistance" : 30
},
"lora": {
"frequency": 433775000,
"spreading_factor": 12,
"signal_bandwidth": 125000,
"coding_rate4": 5,
"spreadingFactor": 12,
"signalBandwidth": 125000,
"codingRate4": 5,
"power": 20
},
"display": {
"always_on": true,
"alwaysOn": true,
"timeout": 2
},
"other": {
"beaconInterval": 15,
"defaultStatusAfterBoot": true,
"defaultStatus": "https://github.com/richonguzman/LoRa_APRS_iGate"
}
}
}

61
src/LoRa_APRS_iGate.cpp
View File

@ -1,31 +1,28 @@
#include <Arduino.h>
#include <SPI.h>
#include <LoRa.h>
#include <WiFi.h>
#include <Adafruit_GFX.h>
#include <Adafruit_SSD1306.h>
#include <Wire.h>
#include <SPIFFS.h>
#include <vector>
#include "pins_config.h"
#include "igate_config.h"
#include "display.h"
#include "lora_utils.h"
#define VERSION "2023.05.26"
#define VERSION "2023.06.04"
WiFiClient espClient;
String ConfigurationFilePath = "/igate_conf.json";
Configuration Config(ConfigurationFilePath);
uint32_t lastTxTime = 0;
static bool beacon_update = true;
unsigned long previousWiFiMillis = 0;
static uint32_t lastRxTxTime = millis();
uint32_t lastTxTime = 0;
static bool beacon_update = true;
unsigned long previousWiFiMillis = 0;
static uint32_t lastRxTxTime = millis();
static int myWiFiAPIndex = 0;
int myWiFiAPSize = Config.wifiAPs.size();
WiFi_AP *currentWiFi = &Config.wifiAPs[myWiFiAPIndex];
static int myWiFiAPIndex = 0;
int myWiFiAPSize = Config.wifiAPs.size();
WiFi_AP *currentWiFi = &Config.wifiAPs[myWiFiAPIndex];
bool defaultStatusAfterBoot = Config.defaultStatusAfterBoot;
std::vector<String> lastHeardStation;
std::vector<String> lastHeardStation_temp;
@ -61,7 +58,7 @@ void setup_wifi() {
Serial.println(WiFi.localIP());
}
void setup_lora() {
/*void setup_lora() {
SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
LoRa.setPins(LORA_CS, LORA_RST, LORA_IRQ);
if (!LoRa.begin(Config.loramodule.frequency)) {
@ -74,8 +71,7 @@ void setup_lora() {
LoRa.setCodingRate4(Config.loramodule.coding_rate4);
LoRa.enableCrc();
LoRa.setTxPower(Config.loramodule.power);
Serial.println("LoRa init done!\n");
}
}*/
void APRS_IS_connect(){
int count = 0;
@ -95,7 +91,7 @@ void APRS_IS_connect(){
Serial.println("Tried: " + String(count) + " FAILED!");
} else {
Serial.println("Connected with Server: '" + String(Config.aprs_is.server) + "' (port: " + String(Config.aprs_is.port)+ ")");
aprsauth = "user " + Config.callsign + " pass " + Config.aprs_is.passcode + " vers " + Config.aprs_is.software_name + " " + Config.aprs_is.software_version + " filter t/m/" + Config.callsign + "/" + (String)Config.aprs_is.reporting_distance + "\n\r";
aprsauth = "user " + Config.callsign + " pass " + Config.aprs_is.passcode + " vers " + Config.aprs_is.softwareName + " " + Config.aprs_is.softwareVersion + " filter t/m/" + Config.callsign + "/" + (String)Config.aprs_is.reportingDistance + "\n\r";
espClient.write(aprsauth.c_str());
delay(200);
}
@ -160,7 +156,7 @@ void updateLastHeardStation(String station) {
Serial.println("");
}
void sendNewLoraPacket(String typeOfMessage, String newPacket) {
/*void sendNewLoraPacket(String typeOfMessage, String newPacket) {
LoRa.beginPacket();
LoRa.write('<');
if (typeOfMessage == "APRS") {
@ -173,14 +169,14 @@ void sendNewLoraPacket(String typeOfMessage, String newPacket) {
LoRa.endPacket();
Serial.print("\n---> LoRa Packet Tx : ");
Serial.println(newPacket);
}
}*/
String processQueryAnswer(String query, String station, String queryOrigin) {
String processedQuery, queryAnswer;
if (query=="?APRS?" || query=="?aprs?" || query=="?Aprs?" || query=="H" || query=="h" || query=="Help" || query=="help" || query=="?") {
processedQuery = "?APRSV ?APRSP ?APRSL ?APRSH ?WHERE callsign";
} else if (query=="?APRSV" || query=="?aprsv" || query=="?Aprsv") {
processedQuery = Config.aprs_is.software_name + " " + Config.aprs_is.software_version;
processedQuery = Config.aprs_is.softwareName + " " + Config.aprs_is.softwareVersion;
} else if (query=="?APRSP" || query=="?aprsp" || query=="?Aprsp") {
processedQuery = "iGate QTH: " + String(currentWiFi->latitude) + " " + String(currentWiFi->longitude);
} else if (query=="?APRSL" || query=="?aprsl" || query=="?Aprsl") {
@ -229,7 +225,7 @@ void checkReceivedPacket(String packet) {
for(int i = Sender.length(); i < 9; i++) {
Sender += ' ';
}
sendNewLoraPacket("APRS", Config.callsign + ">APLR10,RFONLY::" + Sender + ":" + ackMessage);
LoRaUtils::sendNewPacket("APRS", Config.callsign + ">APLR10,RFONLY::" + Sender + ":" + ackMessage);
receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1, AddresseeAndMessage.indexOf("{"));
} else {
receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1);
@ -238,18 +234,18 @@ void checkReceivedPacket(String packet) {
queryMessage = true;
String queryAnswer = processQueryAnswer(receivedMessage, Sender, "LoRa");
delay(2000);
if (!Config.display.always_on) {
if (!Config.display.alwaysOn) {
display_toggle(true);
}
lastRxTxTime = millis();
sendNewLoraPacket("APRS", queryAnswer);
LoRaUtils::sendNewPacket("APRS", queryAnswer);
show_display(firstLine, secondLine, "Callsign = " + Sender, "Type --> QUERY", 1000);
}
}
}
if (!queryMessage) {
aprsPacket = createAPRSPacket(packet);
if (!Config.display.always_on) {
if (!Config.display.alwaysOn) {
display_toggle(true);
}
lastRxTxTime = millis();
@ -355,7 +351,8 @@ void setup() {
setup_display();
setup_wifi();
btStop();
setup_lora();
LoRaUtils::setup();
//setup_lora();
iGateLatitude = create_lat_aprs(currentWiFi->latitude);
iGateLongitude = create_lng_aprs(currentWiFi->longitude);
}
@ -384,7 +381,7 @@ void loop() {
wifiState = "OK";
} else {
wifiState = "--";
if (!Config.display.always_on) {
if (!Config.display.alwaysOn) {
display_toggle(true);
}
lastRxTxTime = millis();
@ -393,7 +390,7 @@ void loop() {
aprsisState = "OK";
} else {
aprsisState = "--";
if (!Config.display.always_on) {
if (!Config.display.alwaysOn) {
display_toggle(true);
}
lastRxTxTime = millis();
@ -404,7 +401,7 @@ void loop() {
while (espClient.connected()) {
uint32_t lastRxTx = millis() - lastRxTxTime;
if (!Config.display.always_on) {
if (!Config.display.alwaysOn) {
if (lastRxTx >= Config.display.timeout*1000) {
display_toggle(false);
}
@ -414,7 +411,7 @@ void loop() {
show_display(firstLine, secondLine, thirdLine, fourthLine, 0);
uint32_t lastTx = millis() - lastTxTime;
if (lastTx >= Config.beacon_interval*60*1000) {
if (lastTx >= Config.beaconInterval*60*1000) {
beacon_update = true;
}
if (beacon_update) {
@ -469,7 +466,7 @@ void loop() {
Serial.println("Received Query APRS-IS : " + aprsisPacket);
String queryAnswer = processQueryAnswer(receivedMessage, Sender, "APRSIS");
Serial.println("---> QUERY Answer : " + queryAnswer.substring(0,queryAnswer.indexOf("\n")));
if (!Config.display.always_on) {
if (!Config.display.alwaysOn) {
display_toggle(true);
}
lastRxTxTime = millis();
@ -482,7 +479,7 @@ void loop() {
deleteNotHeardStation();
validHeardStation = checkValidHeardStation(Addressee);
if (validHeardStation) {
sendNewLoraPacket("APRS", newLoraPacket);
LoRaUtils::sendNewPacket("APRS", newLoraPacket);
display_toggle(true);
lastRxTxTime = millis();
show_display(firstLine, secondLine, Sender + " -> " + Addressee, receivedMessage, 2000);
@ -493,7 +490,7 @@ void loop() {
}
if (defaultStatusAfterBoot) {
delay(1000);
String startupStatus = Config.callsign + ">APLR10,qAC:>" + defaultStatus + "\n";
String startupStatus = Config.callsign + ">APLR10,qAC:>" + Config.defaultStatus + "\n";
espClient.write(startupStatus.c_str());
defaultStatusAfterBoot = false;
}

2
src/display.cpp
View File

@ -14,7 +14,7 @@ void setup_display() {
if(!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
Serial.println(F("SSD1306 allocation failed"));
for(;;); // Don't proceed, loop forever
}
}
display.clearDisplay();
display.setTextColor(WHITE);

45
src/igate_config.h
View File

@ -20,23 +20,23 @@ public:
int passcode;
String server;
int port;
String software_name;
String software_version;
int reporting_distance;
String softwareName;
String softwareVersion;
int reportingDistance;
};
class LoraModule {
public:
long frequency;
int spreading_factor;
long signal_bandwidth;
int coding_rate4;
int spreadingFactor;
long signalBandwidth;
int codingRate4;
int power;
};
class Display {
public:
bool always_on;
bool alwaysOn;
int timeout;
};
@ -45,11 +45,13 @@ public:
String callsign;
String comment;
int beacon_interval;
std::vector<WiFi_AP> wifiAPs;
APRS_IS aprs_is;
LoraModule loramodule;
Display display;
int beaconInterval;
bool defaultStatusAfterBoot;
String defaultStatus;
Configuration(String &filePath) {
_filePath = filePath;
@ -84,27 +86,32 @@ private:
callsign = data["callsign"].as<String>();
comment = data["comment"].as<String>();
beacon_interval = data["beacon_interval"].as<int>();
aprs_is.passcode = data["aprs_is"]["passcode"].as<int>();
aprs_is.server = data["aprs_is"]["server"].as<String>();
aprs_is.port = data["aprs_is"]["port"].as<int>();
aprs_is.software_name = data["aprs_is"]["software_name"].as<String>();
aprs_is.software_version = data["aprs_is"]["software_version"].as<String>();
aprs_is.reporting_distance = data["aprs_is"]["reporting_distance"].as<int>();
aprs_is.softwareName = data["aprs_is"]["softwareName"].as<String>();
aprs_is.softwareVersion = data["aprs_is"]["softwareVersion"].as<String>();
aprs_is.reportingDistance = data["aprs_is"]["reportingDistance"].as<int>();
loramodule.frequency = data["lora"]["frequency"].as<long>();
loramodule.spreading_factor = data["lora"]["spreading_factor"].as<int>();
loramodule.signal_bandwidth = data["lora"]["signal_bandwidth"].as<long>();
loramodule.coding_rate4 = data["lora"]["coding_rate4"].as<int>();
loramodule.spreadingFactor = data["lora"]["spreadingFactor"].as<int>();
loramodule.signalBandwidth = data["lora"]["signalBandwidth"].as<long>();
loramodule.codingRate4 = data["lora"]["codingRate4"].as<int>();
loramodule.power = data["lora"]["power"].as<int>();
display.always_on = data["display"]["always_on"].as<bool>();
display.alwaysOn = data["display"]["alwaysOn"].as<bool>();
display.timeout = data["display"]["timeout"].as<int>();
beaconInterval = data["other"]["beaconInterval"].as<int>();
defaultStatusAfterBoot = data["other"]["defaultStatusAfterBoot"].as<bool>();
defaultStatus = data["other"]["defaultStatus"].as<String>();
configFile.close();
}
};
bool defaultStatusAfterBoot = true;
String defaultStatus = "https://github.com/richonguzman/LoRa_APRS_iGate";
//bool defaultStatusAfterBoot = true;
/*String defaultStatus = "https://github.com/richonguzman/LoRa_APRS_iGate";
*/
#endif

58
src/lora_utils.cpp Normal file
View File

@ -0,0 +1,58 @@
#include <LoRa.h>
#include "igate_config.h"
#include "display.h"
extern Configuration Config;
namespace LoRaUtils {
void setup() {
SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
LoRa.setPins(LORA_CS, LORA_RST, LORA_IRQ);
if (!LoRa.begin(Config.loramodule.frequency)) {
Serial.println("Starting LoRa failed!");
show_display("ERROR", "Starting LoRa failed!");
while (true) {
delay(1000);
}
}
LoRa.setSpreadingFactor(Config.loramodule.spreadingFactor);
LoRa.setSignalBandwidth(Config.loramodule.signalBandwidth);
LoRa.setCodingRate4(Config.loramodule.codingRate4);
LoRa.enableCrc();
LoRa.setTxPower(Config.loramodule.power);
Serial.println("LoRa init done!\n");
}
void sendNewPacket(const String &typeOfMessage, const String &newPacket) {
LoRa.beginPacket();
LoRa.write('<');
if (typeOfMessage == "APRS") {
LoRa.write(0xFF);
} else if (typeOfMessage == "LoRa") {
LoRa.write(0xF8);
}
LoRa.write(0x01);
LoRa.write((const uint8_t *)newPacket.c_str(), newPacket.length());
LoRa.endPacket();
Serial.print("\n---> LoRa Packet Tx : ");
Serial.println(newPacket);
}
/*String receivePacket() {
String loraPacket;
int packetSize = LoRa.parsePacket(); // Listening for LoRa Packets
if (packetSize) {
while (LoRa.available()) {
int inChar = LoRa.read();
loraPacket += (char)inChar;
}
}
return loraPacket;
}*/
}

11
src/lora_utils.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef LORA_UTILS_H_
#define LORA_UTILS_H_
namespace LoRaUtils {
void setup();
void sendNewPacket(const String &typeOfMessage, const String &newPacket);
//String receivePacket();
}
#endif