mirror
/
esp32_loraprs
kopia lustrzana https://github.com/sh123/esp32_loraprs
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Add * suffix for digirepaters only

pull/42/head 1.0.4
sh123 2022-12-01 19:24:57 +02:00
rodzic f0fcd6ce03
commit aba3fd1645
3 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ax25_callsign.cpp
Wyświetl plik

@ -62,11 +62,11 @@ bool Callsign::ToBinary(byte *txPayload, int bufferLength) const
return true; return true;
} }
String Callsign::ToString() const String Callsign::ToString(bool isDigirepeater) const
{ {
String result = call_; String result = call_;
if (ssid_ == 0) { if (ssid_ == 0) {
result += "*"; result += isDigirepeater ? "*" : "";
} else { } else {
result += "-" + String(ssid_); result += "-" + String(ssid_);
} }

2
ax25_callsign.h
Wyświetl plik

@ -20,7 +20,7 @@ public:
inline bool IsWide() const { return call_.startsWith("WIDE"); } inline bool IsWide() const { return call_.startsWith("WIDE"); }
inline bool IsPath() const { return IsWide(); } inline bool IsPath() const { return IsWide(); }
String ToString() const; String ToString(bool isDigirepeater=false) const;
bool ToBinary(byte *txPayload, int bufferLength) const; bool ToBinary(byte *txPayload, int bufferLength) const;
bool Digirepeat(); bool Digirepeat();

2
ax25_payload.cpp
Wyświetl plik

@ -96,7 +96,7 @@ String Payload::ToString(const String &customComment) const
for (int i = 0; i < rptCallsCount_; i++) { for (int i = 0; i < rptCallsCount_; i++) {
if (rptCalls_[i].IsValid()) { if (rptCalls_[i].IsValid()) {
txt += String(",") + rptCalls_[i].ToString(); txt += String(",") + rptCalls_[i].ToString(true);
} }
} }