From c10c7151d4d79034c763989f1f1acf0cfeec363e Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 25 Mar 2022 16:28:59 +0100 Subject: [PATCH] #23 add possibility to override dprs --- .vscode/launch.json | 2 +- DGWVoiceTransmit/Makefile | 7 ++--- DGWVoiceTransmit/VoiceTransmit.cpp | 43 +++++++++++++++++++++--------- DGWVoiceTransmit/VoiceTransmit.h | 7 ++--- 4 files changed, 39 insertions(+), 20 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index d6dd4ae..ae32c96 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", "-text", "www.F5KAV.fr", "-dprs", "!4858.72ND00736.91E&RNG0037/A=000098 440 Voice 439.80000MHz -9.4000MHz"], + "args": ["F4FXL B", "${workspaceFolder}/Sandbox/Announce_F5ZEE__B.dvtool", "-text", "www.F5KAV.fr", "-dprs", "!4858.72N/00736.91Er/"], "stopAtEntry": false, "cwd": "${workspaceFolder}", "environment": [], diff --git a/DGWVoiceTransmit/Makefile b/DGWVoiceTransmit/Makefile index 4579621..d214adb 100644 --- a/DGWVoiceTransmit/Makefile +++ b/DGWVoiceTransmit/Makefile @@ -2,11 +2,11 @@ SRCS = $(wildcard *.cpp) OBJS = $(SRCS:.cpp=.o) DEPS = $(SRCS:.cpp=.d) -dgwvoicetransmit: ../VersionInfo/GitVersion.h $(OBJS) ../DStarBase/DStarBase.a ../BaseCommon/BaseCommon.a - $(CC) $(CPPFLAGS) -o dgwvoicetransmit $(OBJS) ../DStarBase/DStarBase.a ../BaseCommon/BaseCommon.a $(LDFLAGS) +dgwvoicetransmit: ../VersionInfo/GitVersion.h $(OBJS) ../DStarBase/DStarBase.a ../APRS/APRS.a ../BaseCommon/BaseCommon.a + $(CC) $(CPPFLAGS) -o dgwvoicetransmit $(OBJS) ../DStarBase/DStarBase.a ../APRS/APRS.a ../BaseCommon/BaseCommon.a $(LDFLAGS) %.o : %.cpp - $(CC) -I../BaseCommon -I../DStarBase -I../VersionInfo -DCFG_DIR='"$(CFG_DIR)"' $(CPPFLAGS) -MMD -MD -c $< -o $@ + $(CC) -I../BaseCommon -I../APRS -I../DStarBase -I../VersionInfo -DCFG_DIR='"$(CFG_DIR)"' $(CPPFLAGS) -MMD -MD -c $< -o $@ .PHONY clean: clean: @@ -17,6 +17,7 @@ install: dgwvoicetransmit # copy executable @cp -f dgwvoicetransmit $(BIN_DIR) +../APRS/APRS.a: ../BaseCommon/BaseCommon.a: ../DStarBase/DStarBase.a: ../VersionInfo/GitVersion.h: diff --git a/DGWVoiceTransmit/VoiceTransmit.cpp b/DGWVoiceTransmit/VoiceTransmit.cpp index 67b76ca..655f5c7 100644 --- a/DGWVoiceTransmit/VoiceTransmit.cpp +++ b/DGWVoiceTransmit/VoiceTransmit.cpp @@ -26,13 +26,15 @@ #include "DStarDefines.h" #include "VoiceTransmit.h" #include "SlowDataEncoder.h" +#include "APRSUtils.h" +#include "StringUtils.h" int main(int argc, const char * argv[]) { - std::string repeater, text; + std::string repeater, text, dprs; std::vector filenames; - if (!parseCLIArgs(argc, argv, repeater, filenames, text)) { + if (!parseCLIArgs(argc, argv, repeater, filenames, text, dprs)) { ::fprintf(stderr, "dgwvoicetransmit: invalid command line usage: dgwvoicetransmit [-text text] ..., exiting\n"); return 1; } @@ -46,7 +48,7 @@ int main(int argc, const char * argv[]) return 1; } - CVoiceTransmit tt(repeater, &store, text); + CVoiceTransmit tt(repeater, &store, text, dprs); bool ret = tt.run(); store.close(); @@ -55,7 +57,7 @@ int main(int argc, const char * argv[]) return ret ? 0 : 1; } -bool parseCLIArgs(int argc, const char * argv[], std::string& repeater, std::vector& files, std::string& text) +bool parseCLIArgs(int argc, const char * argv[], std::string& repeater, std::vector& files, std::string& text, std::string& dprs) { if(argc < 3) return false; @@ -68,7 +70,7 @@ bool parseCLIArgs(int argc, const char * argv[], std::string& repeater, std::vec if(positionalArgs.size() < 2U) return false; - repeater.assign(positionalArgs[0]); + repeater.assign(boost::replace_all_copy(positionalArgs[0], "_", " ")); files.assign(positionalArgs.begin() + 1, positionalArgs.end()); if(namedArgs.count("text") > 0U) { @@ -78,13 +80,24 @@ bool parseCLIArgs(int argc, const char * argv[], std::string& repeater, std::vec text.assign(""); } + if(namedArgs.count("dprs") > 0U) { + std::string dprsRepeater(repeater); + CAPRSUtils::dstarCallsignToAPRS(dprsRepeater); + std::string dprsnoCrc = CStringUtils::string_format("%s>DPRS:%s\r", dprsRepeater.c_str(), namedArgs["dprs"].c_str()); + dprs = CStringUtils::string_format("$$CRC%04X,%s", CAPRSUtils::calcGPSAIcomCRC(dprsnoCrc), dprsnoCrc.c_str()); + } + else { + dprs.assign(""); + } + return true; } -CVoiceTransmit::CVoiceTransmit(const std::string& callsign, CVoiceStore* store, const std::string& text) : +CVoiceTransmit::CVoiceTransmit(const std::string& callsign, CVoiceStore* store, const std::string& text, const std::string& dprs) : m_socket("", 0U), m_callsign(callsign), m_text(text), +m_dprs(dprs), m_store(store) { assert(store != NULL); @@ -121,8 +134,9 @@ bool CVoiceTransmit::run() if(!m_text.empty()) { slowData = new CSlowDataEncoder(); - slowData->setHeaderData(*header); - slowData->setTextData(m_text); + // slowData->setHeaderData(*header); + if(!m_text.empty()) slowData->setTextData(m_text); + if(!m_dprs.empty()) slowData->setGPSData(m_dprs); } sendHeader(header); @@ -133,8 +147,9 @@ bool CVoiceTransmit::run() unsigned int out = 0U; unsigned int seqNo = 0U; + bool loop = true; - for (;;) { + while (loop) { unsigned int needed = std::chrono::duration_cast(std::chrono::high_resolution_clock::now() - start).count(); needed /= DSTAR_FRAME_TIME_MS; @@ -153,7 +168,8 @@ bool CVoiceTransmit::run() m_socket.close(); - return true; + loop = false; + break; } if(slowData != nullptr) { // Override slowdata if specified so @@ -163,7 +179,6 @@ bool CVoiceTransmit::run() // 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); } @@ -177,17 +192,19 @@ bool CVoiceTransmit::run() ambe->setId(id); sendData(ambe); - delete ambe; out++; - seqNo++; if(seqNo >= 21U) seqNo = 0U; } std::this_thread::sleep_for(std::chrono::milliseconds(10U)); } + + if(slowData != nullptr) delete slowData; + + return true; } bool CVoiceTransmit::sendHeader(CHeaderData* header) diff --git a/DGWVoiceTransmit/VoiceTransmit.h b/DGWVoiceTransmit/VoiceTransmit.h index 2bc0fb8..38838cc 100644 --- a/DGWVoiceTransmit/VoiceTransmit.h +++ b/DGWVoiceTransmit/VoiceTransmit.h @@ -28,11 +28,11 @@ #include "HeaderData.h" #include "AMBEData.h" -bool parseCLIArgs(int argc, const char * argv[], std::string& repeater, std::vector& vector, std::string& text); +bool parseCLIArgs(int argc, const char * argv[], std::string& repeater, std::vector& vector, std::string& text, std::string& dprs); class CVoiceTransmit { public: - CVoiceTransmit(const std::string& callsign, CVoiceStore* store, const std::string& text); + CVoiceTransmit(const std::string& callsign, CVoiceStore* store, const std::string& text, const std::string& dprs); ~CVoiceTransmit(); bool run(); @@ -41,7 +41,8 @@ class CVoiceTransmit { CUDPReaderWriter m_socket; std::string m_callsign; std::string m_text; - CVoiceStore* m_store; + std::string m_dprs; + CVoiceStore* m_store; bool sendHeader(CHeaderData* header); bool sendData(CAMBEData* data);