diff --git a/data/igate_conf.json b/data/igate_conf.json index de8aa7c..735aac9 100644 --- a/data/igate_conf.json +++ b/data/igate_conf.json @@ -1,6 +1,6 @@ { "callsign": "CD2RXU-10", - "stationMode": 2, + "stationMode": 4, "iGateComment": "LoRa_APRS_iGate", "wifi": { "AP": [ @@ -29,8 +29,8 @@ }, "lora": { "iGateFreq": 433775000, - "digirepeaterTxFreq": 433775000, - "digirepeaterRxFreq": 433900000, + "digirepeaterTxFreq": 433900000, + "digirepeaterRxFreq": 433775000, "spreadingFactor": 12, "signalBandwidth": 125000, "codingRate4": 5, diff --git a/src/digi_utils.cpp b/src/digi_utils.cpp index be039d6..d5bdcf4 100644 --- a/src/digi_utils.cpp +++ b/src/digi_utils.cpp @@ -26,7 +26,7 @@ void processPacket(String packet) { lastScreenOn = millis(); } else if (stationMode ==4){ utils::typeOfPacket(packet); - loraPacket = packet.substring(3,packet.indexOf(",")+1) + Config.callsign + "*" + packet.substring(packet.indexOf(",")+1); + loraPacket = packet.substring(3,packet.indexOf(",")+1) + Config.callsign + "*" + packet.substring(packet.indexOf(",")); delay(500); if (stationMode == 4) { LoRa_Utils::changeFreqTx(); diff --git a/src/utils.cpp b/src/utils.cpp index be758f7..9a94a2e 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -60,7 +60,7 @@ void setupDiplay() { } else { secondLine = ""; } - thirdLine = " LoRa Module Ready"; + thirdLine = ""; fourthLine = " listening..."; } @@ -75,10 +75,11 @@ void checkBeaconInterval() { } if (beacon_update) { display_toggle(true); - thirdLine = getLocalIP(); + //thirdLine = getLocalIP(); Serial.println("---- Sending iGate Beacon ----"); if (stationMode==1 || stationMode==2) { show_display(firstLine, secondLine, thirdLine, "SENDING iGate BEACON", 1000); + thirdLine = getLocalIP(); fourthLine = " listening..."; espClient.write((iGateBeaconPacket + "\n").c_str()); show_display(firstLine, secondLine, thirdLine, fourthLine, 0); diff --git a/src/wifi_utils.cpp b/src/wifi_utils.cpp index 123af4f..4c65208 100644 --- a/src/wifi_utils.cpp +++ b/src/wifi_utils.cpp @@ -39,6 +39,7 @@ void startWiFi() { delay(500); digitalWrite(greenLed,LOW); if ((millis() - start) > 15000){ + delay(1000); if(myWiFiAPIndex >= (myWiFiAPSize-1)) { myWiFiAPIndex = 0; } else { @@ -46,8 +47,8 @@ void startWiFi() { } currentWiFi = &Config.wifiAPs[myWiFiAPIndex]; start = millis(); - Serial.print("\nConnect to WiFi '"); Serial.print(currentWiFi->ssid); Serial.println("' ..."); - show_display("", "Connect to Wifi:", currentWiFi->ssid + " ...", 0); + 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()); } @@ -55,6 +56,7 @@ void startWiFi() { digitalWrite(greenLed,LOW); Serial.print("Connected as "); Serial.println(WiFi.localIP()); + show_display("", " Connected!", " ( " + currentWiFi->ssid + " )", 1000); } void setup() {