Skip server block in client mode

pull/15/head
sh123 2020-06-19 12:42:31 +03:00
rodzic 1b8294ae3f
commit b4f40616f2
1 zmienionych plików z 27 dodań i 24 usunięć

Wyświetl plik

@ -262,6 +262,13 @@ void Service::onLoraDataAvailable(int packetSize)
float rssi = LoRa.packetRssi(); float rssi = LoRa.packetRssi();
long frequencyError = LoRa.packetFrequencyError(); long frequencyError = LoRa.packetFrequencyError();
if (autoCorrectFreq_) {
loraFreq_ -= frequencyError;
LoRa.setFrequency(loraFreq_);
}
if (!isClient_) {
String signalReport = String(" ") + String signalReport = String(" ") +
String("rssi: ") + String("rssi: ") +
String(snr < 0 ? rssi + snr : rssi) + String(snr < 0 ? rssi + snr : rssi) +
@ -273,22 +280,17 @@ void Service::onLoraDataAvailable(int packetSize)
String(frequencyError) + String(frequencyError) +
String("Hz"); String("Hz");
if (autoCorrectFreq_) {
loraFreq_ -= frequencyError;
LoRa.setFrequency(loraFreq_);
}
AX25::Payload payload(rxBuf, rxBufIndex); AX25::Payload payload(rxBuf, rxBufIndex);
if (payload.IsValid()) { if (payload.IsValid()) {
String textPayload = payload.ToString(addSignalReport_ ? signalReport : String()); String textPayload = payload.ToString(addSignalReport_ ? signalReport : String());
Serial.println(textPayload); Serial.println(textPayload);
if (enableRfToIs_ && !isClient_) { if (enableRfToIs_) {
sendToAprsis(textPayload); sendToAprsis(textPayload);
Serial.println("Packet sent to APRS-IS"); Serial.println("Packet sent to APRS-IS");
} }
if (enableRepeater_ && !isClient_ && payload.Digirepeat(ownCallsign_)) { if (enableRepeater_ && payload.Digirepeat(ownCallsign_)) {
sendToLora(payload); sendToLora(payload);
Serial.println("Packet digirepeated"); Serial.println("Packet digirepeated");
} }
@ -296,6 +298,7 @@ void Service::onLoraDataAvailable(int packetSize)
else { else {
Serial.println("Invalid or unsupported payload from LoRA"); Serial.println("Invalid or unsupported payload from LoRA");
} }
}
} }
void Service::kissResetState() void Service::kissResetState()