richonguzman/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-03-20 20:25:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.1.6

Browse source
This commit is contained in:
richonguzman 2023-07-30 18:57:31 -04:00
parent 2ca791ef75
commit 9c01288fd7
4 changed files with 20 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/igate_conf.json
View file

@ -5,7 +5,7 @@
"wifi": {
"AP": [
{ "ssid": "Richon",
"password": "k4fPnmg5qny",
"password": "k4fPnmg5qnyf",
"latitude": -32.9543284,
"longitude": -71.1202063
},

7
src/LoRa_APRS_iGate.cpp
View file

@ -81,9 +81,9 @@ void loop() {
Utils::checkBeaconInterval();
show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
DIGI_Utils::processPacket(LoRa_Utils::receivePacket());
} else if (stationMode==5) {
} else if (stationMode==5) { // iGate when WiFi and APRS available , DigiRepeater when not (RxFreq=TxFreq)
Utils::checkWiFiInterval();
if (WiFi.status() == WL_CONNECTED) { // Modo iGate
if (WiFi.status() == WL_CONNECTED) { // iGate Mode
thirdLine = Utils::getLocalIP();
if (!espClient.connected()) {
APRS_IS_Utils::connect();
@ -91,6 +91,7 @@ void loop() {
if (lastStationModeState == 1) {
iGateBeaconPacket = GPS_Utils::generateBeacon();
lastStationModeState = 0;
Utils::startOTAServer();
}
APRS_IS_Utils::checkStatus();
show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
@ -104,7 +105,7 @@ void loop() {
APRS_IS_Utils::processAPRSISPacket(aprsisPacket);
}
}
} else { // Modo DigiRepeater
} else { // DigiRepeater Mode
if (lastStationModeState == 0) {
iGateBeaconPacket = GPS_Utils::generateBeacon();
lastStationModeState = 1;

13
src/utils.cpp
View file

@ -78,9 +78,6 @@ void setupDisplay() {
show_display(" LoRa APRS", " ( iGate )", "", " Richonguzman", " -- CD2RXU --", "", " " + versionDate, 4000);
digitalWrite(greenLed,LOW);
firstLine = Config.callsign;
/*if (stationMode==3 || stationMode==4) {
thirdLine = "<< DigiRepeater >>";
}*/
seventhLine = " listening...";
}
@ -95,7 +92,7 @@ void activeStations() {
void checkBeaconInterval() {
uint32_t lastTx = millis() - lastBeaconTx;
String beaconPacket;
if (lastTx >= Config.beaconInterval*12*1000) { // 60!!!
if (lastTx >= Config.beaconInterval*60*1000) {
beaconUpdate = true;
}
if (beaconUpdate) {
@ -177,7 +174,7 @@ void checkBeaconInterval() {
beaconUpdate = false;
}
if (statusAfterBoot) {
//processStatus();
processStatus();
}
}
@ -192,12 +189,12 @@ void checkDisplayInterval() {
void checkWiFiInterval() {
uint32_t WiFiCheck = millis() - lastWiFiCheck;
if (WiFi.status() != WL_CONNECTED && WiFiCheck >= Config.lastWiFiCheck*4*1000) { //60!!!
if (WiFi.status() != WL_CONNECTED && WiFiCheck >= Config.lastWiFiCheck*60*1000) {
WiFiConnect = true;
}
if (WiFiConnect) {
Serial.println("\nConnecting to WiFi ...");
WIFI_Utils::startWiFi2();
WIFI_Utils::startWiFi();
lastWiFiCheck = millis();
WiFiConnect = false;
}
@ -265,7 +262,7 @@ void typeOfPacket(String packet, String packetType) {
}
void startOTAServer() {
if (stationMode==1 || stationMode==2) {
if (stationMode==1 || stationMode==2 || (stationMode==5 && WiFi.status() == WL_CONNECTED)) {
server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
request->send(200, "text/plain", "Hi " + Config.callsign + ", \n\nthis is your (Richonguzman/CD2RXU) LoRa iGate , version " + versionDate + ".\n\nTo update your firmware or filesystem go to: http://" + getLocalIP().substring(getLocalIP().indexOf(":")+3) + "/update\n\n\n73!");
});

54
src/wifi_utils.cpp
View file

@ -24,42 +24,6 @@ void checkWiFi() {
}
void startWiFi() {
int status = WL_IDLE_STATUS;
WiFi.mode(WIFI_STA);
WiFi.disconnect();
delay(500);
unsigned long start = millis();
show_display("", "", "Connecting to Wifi:", "", currentWiFi->ssid + " ...", 0);
Serial.print("\nConnecting to WiFi '"); Serial.print(currentWiFi->ssid); Serial.println("' ...");
WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str());
while (WiFi.status() != WL_CONNECTED) {
delay(500);
digitalWrite(greenLed,HIGH);
Serial.print('.');
delay(500);
digitalWrite(greenLed,LOW);
if ((millis() - start) > 15000){
delay(1000);
if(myWiFiAPIndex >= (myWiFiAPSize-1)) {
myWiFiAPIndex = 0;
} else {
myWiFiAPIndex++;
}
currentWiFi = &Config.wifiAPs[myWiFiAPIndex];
start = millis();
Serial.print("\nConnecting to WiFi '"); Serial.print(currentWiFi->ssid); Serial.println("' ...");
show_display("", "", "Connecting to Wifi:", "", currentWiFi->ssid + " ...", 0);
WiFi.disconnect();
WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str());
}
}
digitalWrite(greenLed,LOW);
Serial.print("Connected as ");
Serial.println(WiFi.localIP());
show_display("", "", " Connected!!", "" , " loading ...", 1000);
}
void startWiFi2() {
int wifiCounter = 0;
int status = WL_IDLE_STATUS;
WiFi.mode(WIFI_STA);
@ -79,7 +43,9 @@ void startWiFi2() {
delay(1000);
if(myWiFiAPIndex >= (myWiFiAPSize-1)) {
myWiFiAPIndex = 0;
wifiCounter++;
if (stationMode==5) {
wifiCounter++;
}
} else {
myWiFiAPIndex++;
}
@ -91,14 +57,14 @@ void startWiFi2() {
WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str());
}
}
digitalWrite(greenLed,LOW);
if (WiFi.status() == WL_CONNECTED) {
digitalWrite(greenLed,LOW);
Serial.print("Connected as ");
Serial.println(WiFi.localIP());
show_display("", "", " Connected!!", "" , " loading ...", 1000);
} else {
Serial.println("\nNot connected to WiFi! (DigiRepeater Mode)");
show_display("", "", " WiFi Not Connected!", " DigiRepeater MODE" , " loading ...", 2000);
Serial.print("Connected as ");
Serial.println(WiFi.localIP());
show_display("", "", " Connected!!", "" , " loading ...", 1000);
} else if (WiFi.status() != WL_CONNECTED && stationMode==5) {
Serial.println("\nNot connected to WiFi! (DigiRepeater Mode)");
show_display("", "", " WiFi Not Connected!", " DigiRepeater MODE" , " loading ...", 2000);
}
}