From 9d1465e3ded1a0ddf341ba2c365304ae92b8f39e Mon Sep 17 00:00:00 2001 From: FUJIURA Toyonori Date: Fri, 18 Mar 2022 22:33:36 +0900 Subject: [PATCH 1/6] Add is-cfg.json to lora.txok for SWL station. --- data/is-cfg.json | 3 ++- src/TaskModem.cpp | 9 ++++++++- src/project_configuration.cpp | 1 + src/project_configuration.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/data/is-cfg.json b/data/is-cfg.json index 190ad2c..04aae81 100644 --- a/data/is-cfg.json +++ b/data/is-cfg.json @@ -48,7 +48,8 @@ "power": 20, "spreading_factor": 12, "signal_bandwidth": 125000, - "coding_rate4": 5 + "coding_rate4": 5, + "txok": true }, "display": { "always_on": true, diff --git a/src/TaskModem.cpp b/src/TaskModem.cpp index d3908bc..111617f 100644 --- a/src/TaskModem.cpp +++ b/src/TaskModem.cpp @@ -54,7 +54,14 @@ bool ModemTask::loop(System &system) { if (!_toModem.empty()) { std::shared_ptr msg = _toModem.getElement(); - _lora_aprs.sendMessage(msg); + logPrintlnD(msg->toString()); + if (system.getUserConfig()->lora.txok) { + logPrintD(String("-- TXOK")); + _lora_aprs.sendMessage(msg); + logPrintlnD(String(" -- TXDone")); + } else { + logPrintlnD(String("-- TXNG")); + } } return true; diff --git a/src/project_configuration.cpp b/src/project_configuration.cpp index 061c531..c7eac3a 100644 --- a/src/project_configuration.cpp +++ b/src/project_configuration.cpp @@ -58,6 +58,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen conf.lora.spreadingFactor = data["lora"]["spreading_factor"] | 12; conf.lora.signalBandwidth = data["lora"]["signal_bandwidth"] | 125000; conf.lora.codingRate4 = data["lora"]["coding_rate4"] | 5; + conf.lora.txok = data["lora"]["txok"] | false; conf.display.alwaysOn = data["display"]["always_on"] | true; conf.display.timeout = data["display"]["timeout"] | 10; conf.display.overwritePin = data["display"]["overwrite_pin"] | 0; diff --git a/src/project_configuration.h b/src/project_configuration.h index 5fe2fb3..91743c8 100644 --- a/src/project_configuration.h +++ b/src/project_configuration.h @@ -89,6 +89,7 @@ public: int spreadingFactor; long signalBandwidth; int codingRate4; + bool txok; }; class Display { From 2b5f45b2025d0816f4dd6c64009fdc015a0f9c5a Mon Sep 17 00:00:00 2001 From: FUJIURA Toyonori Date: Fri, 18 Mar 2022 22:50:09 +0900 Subject: [PATCH 2/6] Message changes which is same as Received packet. --- src/TaskModem.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/TaskModem.cpp b/src/TaskModem.cpp index 111617f..93dc533 100644 --- a/src/TaskModem.cpp +++ b/src/TaskModem.cpp @@ -54,13 +54,15 @@ bool ModemTask::loop(System &system) { if (!_toModem.empty()) { std::shared_ptr msg = _toModem.getElement(); - logPrintlnD(msg->toString()); if (system.getUserConfig()->lora.txok) { - logPrintD(String("-- TXOK")); + logPrintD("Transmitting packet '"); + logPrintD(msg->toString()); _lora_aprs.sendMessage(msg); - logPrintlnD(String(" -- TXDone")); + logPrintlnD(String(" TXDone")); } else { - logPrintlnD(String("-- TXNG")); + logPrintD("NOT Transmitting packet '"); + logPrintD(msg->toString()); + logPrintlnD(String(" TXNG")); } } From 824e84ec6cfebd07773712e7b3772a549f994f20 Mon Sep 17 00:00:00 2001 From: FUJIURA Toyonori Date: Fri, 18 Mar 2022 23:29:19 +0900 Subject: [PATCH 3/6] version update. --- .vscode/extensions.json | 19 +++++++++++-------- platformio.ini | 1 + src/LoRa_APRS_iGate.cpp | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 27bdd05..9a91518 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,8 +1,11 @@ -{ - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": [ - "platformio.platformio-ide", - "xaver.clang-format" - ] -} +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide", + "xaver.clang-format" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" + ] +} diff --git a/platformio.ini b/platformio.ini index ce8560b..96bb0e1 100644 --- a/platformio.ini +++ b/platformio.ini @@ -22,6 +22,7 @@ check_skip_packages = yes # activate for OTA Update, use the CALLSIGN from is-cfg.json as upload_port: #upload_protocol = espota #upload_port = .local +upload_port = COM19 [env:lora_board] board = esp32doit-devkit-v1 diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 0352a6b..afaa3f0 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -19,7 +19,7 @@ #include "TaskWifi.h" #include "project_configuration.h" -#define VERSION "22.8.0" +#define VERSION "22.11.0" String create_lat_aprs(double lat); String create_long_aprs(double lng); From 518ac7f3f2cc6cc237066b384e3cb4eb0e5190d8 Mon Sep 17 00:00:00 2001 From: FUJIURA Toyonori Date: Sat, 19 Mar 2022 06:56:55 +0900 Subject: [PATCH 4/6] Revert local changes. --- .vscode/extensions.json | 19 ++++++++----------- platformio.ini | 1 - 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 9a91518..27bdd05 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,11 +1,8 @@ -{ - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": [ - "platformio.platformio-ide", - "xaver.clang-format" - ], - "unwantedRecommendations": [ - "ms-vscode.cpptools-extension-pack" - ] -} +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide", + "xaver.clang-format" + ] +} diff --git a/platformio.ini b/platformio.ini index 96bb0e1..ce8560b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -22,7 +22,6 @@ check_skip_packages = yes # activate for OTA Update, use the CALLSIGN from is-cfg.json as upload_port: #upload_protocol = espota #upload_port = .local -upload_port = COM19 [env:lora_board] board = esp32doit-devkit-v1 From f6951e7ccb472b858b63f8fb4ce343adaeb5ac6c Mon Sep 17 00:00:00 2001 From: FUJIURA Toyonori Date: Sat, 19 Mar 2022 15:24:10 +0900 Subject: [PATCH 5/6] Add setting for LoRa.txok. --- src/project_configuration.cpp | 1 + src/project_configuration.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/project_configuration.cpp b/src/project_configuration.cpp index c7eac3a..eaf27dd 100644 --- a/src/project_configuration.cpp +++ b/src/project_configuration.cpp @@ -131,6 +131,7 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co data["lora"]["spreading_factor"] = conf.lora.spreadingFactor; data["lora"]["signal_bandwidth"] = conf.lora.signalBandwidth; data["lora"]["coding_rate4"] = conf.lora.codingRate4; + data["lora"]["txok"] = conf.lora.txok; data["display"]["always_on"] = conf.display.alwaysOn; data["display"]["timeout"] = conf.display.timeout; data["display"]["overwrite_pin"] = conf.display.overwritePin; diff --git a/src/project_configuration.h b/src/project_configuration.h index 91743c8..854d450 100644 --- a/src/project_configuration.h +++ b/src/project_configuration.h @@ -79,7 +79,7 @@ public: class LoRa { public: - LoRa() : frequencyRx(433775000), frequencyTx(433775000), power(20), spreadingFactor(12), signalBandwidth(125000), codingRate4(5) { + LoRa() : frequencyRx(433775000), frequencyTx(433775000), power(20), spreadingFactor(12), signalBandwidth(125000), codingRate4(5), txok(false) { } long frequencyRx; From 85746dfd3fd6c4750abe2e4fe9d52483ba8bf46b Mon Sep 17 00:00:00 2001 From: FUJIURA Toyonori Date: Sat, 19 Mar 2022 16:37:23 +0900 Subject: [PATCH 6/6] Add timestamp. --- src/TaskModem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/TaskModem.cpp b/src/TaskModem.cpp index 93dc533..50b9035 100644 --- a/src/TaskModem.cpp +++ b/src/TaskModem.cpp @@ -54,6 +54,7 @@ bool ModemTask::loop(System &system) { if (!_toModem.empty()) { std::shared_ptr msg = _toModem.getElement(); + logPrintD("[" + timeString() + "] "); if (system.getUserConfig()->lora.txok) { logPrintD("Transmitting packet '"); logPrintD(msg->toString());