Merge branch 'develop' into bugfix/36_Error1

3 years ago · 18a9ac357b
parent 8754c50d23 9cee1b7277
commit 18a9ac357b
3 changed files with 32 additions and 30 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -109,7 +109,8 @@
            "type": "cppdbg",
            "request": "launch",
            "program": "${workspaceFolder}/DGWVoiceTransmit/dgwvoicetransmit",
-            "args": ["F4FXL  B", "${workspaceFolder}/Sandbox/Announce_F5ZEE__B.dvtool", "-text", "www.F5KAV.fr", "-dprs", "!4858.72N/00736.91Er/"],
+            "args": ["F5ZEE  B", "${workspaceFolder}/Sandbox/french_male.dvtool", "${workspaceFolder}/Sandbox/german_male.dvtool", "-text", "abcdefghij", "-dprs", "!4858.72N/00736.91Er/"],
+            //"args": ["F5ZEE  B", "${workspaceFolder}/Sandbox/french_male.dvtool", "${workspaceFolder}/Sandbox/german_male.dvtool"],
            "stopAtEntry": false,
            "cwd": "${workspaceFolder}",
            "environment": [],
--- a/DGWVoiceTransmit/VoiceTransmit.cpp
+++ b/DGWVoiceTransmit/VoiceTransmit.cpp
@ -132,9 +132,11 @@ bool CVoiceTransmit::run()
 	header->setRptCall2(m_callsign);
 	header->setDestination(address, G2_DV_PORT);

-	if(!m_text.empty()) {
+	bool overrideSlowData = !m_text.empty();
+
+	if(overrideSlowData) {
 		slowData = new CSlowDataEncoder();
-		// slowData->setHeaderData(*header);
+		slowData->setHeaderData(*header);
 		if(!m_text.empty()) slowData->setTextData(m_text);
 		if(!m_dprs.empty()) slowData->setGPSData(m_dprs);
 	}
@ -152,6 +154,7 @@ bool CVoiceTransmit::run()
 	while (loop) {
 		unsigned int needed = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start).count();
 		needed /= DSTAR_FRAME_TIME_MS;
+		unsigned char buffer[DV_FRAME_LENGTH_BYTES];

 		while (out < needed) {
 			CAMBEData* ambe = m_store->getAMBE();
@ -172,19 +175,14 @@ bool CVoiceTransmit::run()
 				break;
 			}

-			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);
-				} else {
+			} else if (overrideSlowData) {
 				slowData->getInterleavedData(buffer + VOICE_FRAME_LENGTH_BYTES);
 			}
-
 			ambe->setData(buffer, DV_FRAME_LENGTH_BYTES);
-			}
 		
 			ambe->setSeq(seqNo);
 			ambe->setDestination(address, G2_DV_PORT);
--- a/README.md
+++ b/README.md
@ -22,13 +22,14 @@
  - [4.1. Work Flow](#41-work-flow)
  - [4.2. Continuous Integration](#42-continuous-integration)
 - [5. Version History](#5-version-history)
-  - [5.1. Version 0.7](#51-version-07)
-  - [5.2. Version 0.6](#52-version-06)
-  - [5.3. Version 0.5](#53-version-05)
-  - [5.4. Version 0.4](#54-version-04)
-  - [5.5. Version 0.3](#55-version-03)
-  - [5.6. Version 0.2](#56-version-02)
-  - [5.7. Version 0.1](#57-version-01)
+  - [5.1. Version 1.0](#51-version-10)
+  - [5.2. Version 0.7](#52-version-07)
+  - [5.3. Version 0.6](#53-version-06)
+  - [5.4. Version 0.5](#54-version-05)
+  - [5.5. Version 0.4](#55-version-04)
+  - [5.6. Version 0.3](#56-version-03)
+  - [5.7. Version 0.2](#57-version-02)
+  - [5.8. Version 0.1](#58-version-01)
 - [6. Future](#6-future)


@ -144,13 +145,15 @@ I have added some basic CI using CircleCI [![F4FXL](https://circleci.com/gh/F4FX
 The testing framwework used is Google Test.

 # 5. Version History
-## 5.1. Version 0.7
+## 5.1. Version 1.0
+- [**Bugfix**] Fix #37 Unable to transmit multiple files (DGWVoiceTransmit) ([#37](https://github.com/F4FXL/DStarGateway/issues/37))
+## 5.2. Version 0.7
 - [**Bugfix**] Unknow repeater entries in log when using Icom Hardware ([#34](https://github.com/F4FXL/DStarGateway/issues/34))
 - [**Bugfix**] Malformed callsign in some cases when using DV-G (NMEA) ([#33](https://github.com/F4FXL/DStarGateway/issues/33))
 - [**Bugfix**] Crash on startup with Icom Hardware. Thanks to Josh AB9FT for reporting the issue.([#31](https://github.com/F4FXL/DStarGateway/issues/31))
 - [**Improvement**] Add/Fix DPRS Object support([#28](https://github.com/F4FXL/DStarGateway/issues/28))
 - [**Improvement**] Log incoming DPRS frames so they can be used in e.g. dashboards([#29](https://github.com/F4FXL/DStarGateway/issues/29))
-## 5.2. Version 0.6
+## 5.3. Version 0.6
 - [**Improvement**] Add DRats Support ([#24](https://github.com/F4FXL/DStarGateway/issues/24))
 - [**Improvement**] Add call sign lists ([#22](https://github.com/F4FXL/DStarGateway/issues/22))
 - [**Improvement**] Add a way to override Slow Data in VoiceTransmit ([#23](https://github.com/F4FXL/DStarGateway/issues/23))
@ -158,7 +161,7 @@ The testing framwework used is Google Test.
 - [**Improvement**] Gracefully exit on SIGINT and SIGTERM ([#21](https://github.com/F4FXL/DStarGateway/issues/21)). DStarGateway can also be run as a "forking" daemon. This might be required for distros still using sysv. Systemd can live without it.
 - [**Improvement**] Add text transmit utility dgwtexttransmit ([#18](https://github.com/F4FXL/DStarGateway/issues/18))
 - [**Improvement**] Add voice transmit utility dgwvoicetransmit ([#18](https://github.com/F4FXL/DStarGateway/issues/18))
-## 5.3. Version 0.5
+## 5.4. Version 0.5
 - [**Improvement**] Add remote control utility dgwremotecontrol ([#17](https://github.com/F4FXL/DStarGateway/issues/17))
 - [**Bugfix**] Two simultaneous incoming G2 streams would fail to be transmitted on dual band repeaters ([#16](https://github.com/F4FXL/DStarGateway/issues/16))
 - [**Improvement**] Add NAT Traversal for G2 and DExtra, using IRCDDB as a Rendez Vous server ([#5](https://github.com/F4FXL/DStarGateway/issues/5))
@ -166,17 +169,17 @@ The testing framwework used is Google Test.
 - [**Bugfix**] Failed to download XLX Hosts when URL contains a = sign ([#14](https://github.com/F4FXL/DStarGateway/issues/14))
 - [**Bugfix**] Remote control connection failed ([#13](https://github.com/F4FXL/DStarGateway/issues/13))
 - [**Bugfix**] Trying to connect to ghost ircDDB when no ircDDB is configured
-## 5.4. Version 0.4
+## 5.5. Version 0.4
 - [**Improvement**] Add APRS status link feature ([#8](https://github.com/F4FXL/DStarGateway/issues/8))
 - [**Bugfix**] Posotions received over radio were not sent to APRS-IS when GPDS connection failed. ([#7](https://github.com/F4FXL/DStarGateway/issues/7))
 - [**Improvement**] Bring back GPSD support ([#6](https://github.com/F4FXL/DStarGateway/issues/6))
 - [**Improvement**] Log enhancements ([#4](https://github.com/F4FXL/DStarGateway/issues/4))
-## 5.5. Version 0.3
+## 5.6. Version 0.3
 - [**Improvement**] Get ride of libcongig++ dependency. When upgrading from earlier version you need to manualy delete the config file before reinstalling.
-## 5.6. Version 0.2
+## 5.7. Version 0.2
 - [**Bugfix**] ircDDBFreeze when repeater not found ([#1](https://github.com/F4FXL/DStarGateway/issues/1))
 - Code sanitization
-## 5.7. Version 0.1
+## 5.8. Version 0.1
 First working version
 # 6. Future
 I started this during my 2021 seasons holiday. It took me almost 8 days to get to a workable version. Here are a couple of stuff I'd like to do :