FreeDV
/
freedv-gui
mirror of https://github.com/drowe67/freedv-gui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Flex: Use version number without Git hash for waveform registration. (#1359) 

* Flex: Use version number without Git hash for waveform registration.

* Add PR #1359 to changelog.
pull/1360/head
Mooneer Salem 2026-05-23 00:08:27 -07:00 committed by GitHub
parent 1359825d47
commit 0105613f17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
USER_MANUAL.md
View File

@ -944,6 +944,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
* FreeDV Reporter: Fix issue preventing mode changes on double-click. (PR #1343)
* Fix compiler warning/error in EventHandler when using GCC 16.1. (PR #1347)
* Improve Flex waveform RX audio quality. (PR #1348, 1356)
* Flex: Use version number without Git hash for waveform registration. (PR #1359)
2. Enhancements:
* Allow use of a custom key for PTT. (PR #1309)
* Improve Reporter message list usability. (PR #1310) - thanks @barjac!

1
cmake/CheckGit.cmake
View File

@ -55,6 +55,7 @@ function(CheckGitVersion)
else()
set(FREEDV_VERSION "${FreeDV_VERSION}")
endif()
set(FREEDV_VERSION_CLEAN "${FreeDV_VERSION}")
file(WRITE ${CMAKE_BINARY_DIR}/freedv-version.txt ${FREEDV_VERSION})
# Only update the git_version.cpp if the hash has changed. This will

5
cmake/git_version.cpp.in
View File

@ -22,3 +22,8 @@ std::string GetFreeDVVersion()
{
return "@FREEDV_VERSION@";
}
std::string GetFreeDVVersionClean()
{
return "@FREEDV_VERSION_CLEAN@";
}

1
cmake/git_version.h
View File

@ -27,5 +27,6 @@
extern const char* FREEDV_GIT_HASH;
std::string GetFreeDVVersion();
std::string GetFreeDVVersionClean();
#endif // GIT_HASH_H

2
src/integrations/flex/FlexTcpTask.cpp
View File

@ -217,7 +217,7 @@ void FlexTcpTask::createWaveform_(std::string const& name, std::string const& sh
sendRadioCommand_(std::string("waveform remove ") + name);
// Actually create the waveform.
std::string waveformCommand = "waveform create name=" + name + " mode=" + shortName + " underlying_mode=" + underlyingMode + " version=" + GetFreeDVVersion();
std::string waveformCommand = "waveform create name=" + name + " mode=" + shortName + " underlying_mode=" + underlyingMode + " version=" + GetFreeDVVersionClean();
std::string setPrefix = "waveform set " + name + " ";
sendRadioCommand_(waveformCommand, [&, setPrefix](unsigned int rv, std::string const& res) {
if (rv == 0)