From 7eb4291408d91a7fd7d1a6cf1f86de298081372e Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Sat, 30 Oct 2021 11:26:19 +0200 Subject: [PATCH] make use of tx_frequency (issue #238) --- RX_FSK/src/ShFreqImport.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/RX_FSK/src/ShFreqImport.cpp b/RX_FSK/src/ShFreqImport.cpp index ff0e93e..3e5983b 100644 --- a/RX_FSK/src/ShFreqImport.cpp +++ b/RX_FSK/src/ShFreqImport.cpp @@ -48,7 +48,8 @@ void ShFreqImport::setLabel(int idx, char *id, float lat, float lon) { void ShFreqImport::usekeyvalue() { if(strcmp(keyword,"lat")==0) lat = atof(value); if(strcmp(keyword,"lon")==0) lon = atof(value); - if(strcmp(keyword,"frequency")==0) freq = atof(value); + if(strcmp(keyword,"frequency")==0) { if(isnan(freq)) freq = atof(value); } // prefer tx_frequency if available + if(strcmp(keyword,"tx_frequency")==0) freq = atof(value); if(strcmp(keyword,"type")==0) strcpy(type, value); } @@ -156,7 +157,7 @@ int ShFreqImport::handleChar(char c) { if(c==':') { valuepos = 0; quotes = 0; - if(strcmp(keyword,"lat")==0 || strcmp(keyword, "lon")==0 || strcmp(keyword, "frequency")==0 ) + if(strcmp(keyword,"lat")==0 || strcmp(keyword, "lon")==0 || strcmp(keyword, "frequency")==0 || strcmp(keyword, "tx_frequency")==0) importState = BEFORENUMVAL; else { if (strcmp(keyword, "type")==0)