From c2a940bee7af88b36a7f0b1985cf7f52815371e0 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Thu, 24 Mar 2022 18:57:12 +0100 Subject: [PATCH] #23 add possibility to override text --- .vscode/launch.json | 2 +- .vscode/tasks.json | 10 ++--- DGWVoiceTransmit/VoiceTransmit.cpp | 72 +++++++++++++++++++++--------- DGWVoiceTransmit/VoiceTransmit.h | 5 ++- 4 files changed, 59 insertions(+), 30 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 55284ba..94b71b0 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -109,7 +109,7 @@ "type": "cppdbg", "request": "launch", "program": "${workspaceFolder}/DGWVoiceTransmit/dgwvoicetransmit", - "args": ["F4FXL B", "${workspaceFolder}/Sandbox/Announce_F5ZEE__B.dvtool"], + "args": ["F4FXL B", "${workspaceFolder}/Sandbox/Announce_F5ZEE__B.dvtool", "-text", "www.F5KAV.fr"], "stopAtEntry": false, "cwd": "${workspaceFolder}", "environment": [], diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 995a9f1..df6906d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -78,7 +78,10 @@ "USE_GPSD=1", "DGWVoiceTransmit/dgwvoicetransmit" ], - "group": "build", + "group": { + "kind": "build", + "isDefault": true + }, "problemMatcher": [] }, { @@ -91,10 +94,7 @@ "ENABLE_DEBUG=1", "USE_GPSD=1" ], - "group": { - "kind": "build", - "isDefault": true - }, + "group": "build", "problemMatcher": [] } ] diff --git a/DGWVoiceTransmit/VoiceTransmit.cpp b/DGWVoiceTransmit/VoiceTransmit.cpp index d173241..67b76ca 100644 --- a/DGWVoiceTransmit/VoiceTransmit.cpp +++ b/DGWVoiceTransmit/VoiceTransmit.cpp @@ -22,16 +22,18 @@ #include #include +#include "ProgramArgs.h" #include "DStarDefines.h" #include "VoiceTransmit.h" +#include "SlowDataEncoder.h" -int main(int argc, char** argv) +int main(int argc, const char * argv[]) { - std::string repeater; + std::string repeater, text; std::vector filenames; - if (!parseCLIArgs(argc, argv, repeater, filenames)) { - ::fprintf(stderr, "dgwvoicetransmit: invalid command line usage: dgwvoicetransmit ..., exiting\n"); + if (!parseCLIArgs(argc, argv, repeater, filenames, text)) { + ::fprintf(stderr, "dgwvoicetransmit: invalid command line usage: dgwvoicetransmit [-text text] ..., exiting\n"); return 1; } @@ -44,7 +46,7 @@ int main(int argc, char** argv) return 1; } - CVoiceTransmit tt(repeater, &store); + CVoiceTransmit tt(repeater, &store, text); bool ret = tt.run(); store.close(); @@ -53,30 +55,36 @@ int main(int argc, char** argv) return ret ? 0 : 1; } -bool parseCLIArgs(int argc, char * argv[], std::string& repeater, std::vector& files) +bool parseCLIArgs(int argc, const char * argv[], std::string& repeater, std::vector& files, std::string& text) { if(argc < 3) return false; - repeater.assign(argv[1]); - boost::to_upper(repeater); - boost::replace_all(repeater, "_", " "); - repeater.resize(LONG_CALLSIGN_LENGTH, ' '); + std::unordered_map namedArgs; + std::vector positionalArgs; - files.clear(); + CProgramArgs::eatArguments(argc, argv, namedArgs, positionalArgs); - for(int i = 2; i < argc; i++) { - if(argv[i] != nullptr) { - files.push_back(std::string(argv[i])); - } + if(positionalArgs.size() < 2U) + return false; + + repeater.assign(positionalArgs[0]); + files.assign(positionalArgs.begin() + 1, positionalArgs.end()); + + if(namedArgs.count("text") > 0U) { + text.assign(namedArgs["text"]); + } + else { + text.assign(""); } - return files.size() > 0U; + return true; } -CVoiceTransmit::CVoiceTransmit(const std::string& callsign, CVoiceStore* store) : +CVoiceTransmit::CVoiceTransmit(const std::string& callsign, CVoiceStore* store, const std::string& text) : m_socket("", 0U), m_callsign(callsign), +m_text(text), m_store(store) { assert(store != NULL); @@ -88,6 +96,7 @@ CVoiceTransmit::~CVoiceTransmit() bool CVoiceTransmit::run() { + CSlowDataEncoder * slowData = nullptr; bool opened = m_socket.open(); if (!opened) return false; @@ -110,6 +119,12 @@ bool CVoiceTransmit::run() header->setRptCall2(m_callsign); header->setDestination(address, G2_DV_PORT); + if(!m_text.empty()) { + slowData = new CSlowDataEncoder(); + slowData->setHeaderData(*header); + slowData->setTextData(m_text); + } + sendHeader(header); delete header; @@ -127,10 +142,6 @@ bool CVoiceTransmit::run() CAMBEData* ambe = m_store->getAMBE(); if (ambe == NULL) { - seqNo++; - if (seqNo >= 21U) - seqNo = 0U; - CAMBEData data; data.setData(END_PATTERN_BYTES, DV_FRAME_LENGTH_BYTES); data.setDestination(address, G2_DV_PORT); @@ -145,8 +156,22 @@ bool CVoiceTransmit::run() return true; } - seqNo = ambe->getSeq(); + if(slowData != nullptr) { // Override slowdata if specified so + unsigned char buffer[DV_FRAME_LENGTH_BYTES]; + ambe->getData(buffer, DV_FRAME_LENGTH_BYTES); + + // Insert sync bytes when the sequence number is zero, slow data otherwise + if (seqNo == 0U) { + ::memcpy(buffer + VOICE_FRAME_LENGTH_BYTES, DATA_SYNC_BYTES, DATA_FRAME_LENGTH_BYTES); + slowData->sync(); + } else { + slowData->getInterleavedData(buffer + VOICE_FRAME_LENGTH_BYTES); + } + ambe->setData(buffer, DV_FRAME_LENGTH_BYTES); + } + + ambe->setSeq(seqNo); ambe->setDestination(address, G2_DV_PORT); ambe->setEnd(false); ambe->setId(id); @@ -156,6 +181,9 @@ bool CVoiceTransmit::run() delete ambe; out++; + + seqNo++; + if(seqNo >= 21U) seqNo = 0U; } std::this_thread::sleep_for(std::chrono::milliseconds(10U)); diff --git a/DGWVoiceTransmit/VoiceTransmit.h b/DGWVoiceTransmit/VoiceTransmit.h index 3a72384..2bc0fb8 100644 --- a/DGWVoiceTransmit/VoiceTransmit.h +++ b/DGWVoiceTransmit/VoiceTransmit.h @@ -28,11 +28,11 @@ #include "HeaderData.h" #include "AMBEData.h" -bool parseCLIArgs(int argc, char * argv[], std::string& repeater, std::vector& vector); +bool parseCLIArgs(int argc, const char * argv[], std::string& repeater, std::vector& vector, std::string& text); class CVoiceTransmit { public: - CVoiceTransmit(const std::string& callsign, CVoiceStore* store); + CVoiceTransmit(const std::string& callsign, CVoiceStore* store, const std::string& text); ~CVoiceTransmit(); bool run(); @@ -40,6 +40,7 @@ public: private: CUDPReaderWriter m_socket; std::string m_callsign; + std::string m_text; CVoiceStore* m_store; bool sendHeader(CHeaderData* header);