ua1zbe
/
svxlink
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into reflector_tg

This commit is contained in:
Tobias Blomberg 2019-09-27 22:57:35 +02:00
parent b44387168a 025912a916
commit ddaf9dcc82
5 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/async/ChangeLog
View File

@ -1,3 +1,10 @@
1.6.1 -- ?? ??? 2019
----------------------
* ASYNC_AUDIO_ALSA_ZEROFILL is now enabled by default.
1.6.0 -- 01 Sep 2019
----------------------

2
src/async/audio/AsyncAudioDeviceAlsa.cpp
View File

@ -194,7 +194,7 @@ AudioDeviceAlsa::AudioDeviceAlsa(const std::string& dev_name)
: AudioDevice(dev_name), play_block_size(0), play_block_count(0),
rec_block_size(0), rec_block_count(0), play_handle(0),
rec_handle(0), play_watch(0), rec_watch(0), duplex(false),
zerofill_on_underflow(false)
zerofill_on_underflow(true)
{
assert(AudioDeviceAlsa_creator_registered);

11
src/svxlink/modules/frn/QsoFrn.cpp
View File

@ -373,6 +373,13 @@ std::string QsoFrn::stateToString(State state)
int QsoFrn::writeSamples(const float *samples, int count)
{
//cout << __FUNCTION__ << " " << count << endl;
if (state == STATE_IDLE)
{
sendRequest(RQ_TX0);
setState(STATE_TX_AUDIO_WAITING);
}
int samples_read = 0;
con_timeout_timer->reset();
@ -438,8 +445,8 @@ void QsoFrn::squelchOpen(bool is_open)
{
if (is_open && state == STATE_IDLE)
{
sendRequest(RQ_TX0);
setState(STATE_TX_AUDIO_WAITING);
// sendRequest(RQ_TX0);
// setState(STATE_TX_AUDIO_WAITING);
}
}

10
src/svxlink/systemd/CMakeLists.txt
View File

@ -23,10 +23,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/svxlink_gpio_setup.service
message(STATUS "Systemd unit files will be installed to "
"${SYSTEMD_CONFIGURATIONS_FILES_DIR} after make install")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/svxlink
${CMAKE_CURRENT_BINARY_DIR}/remotetrx
${CMAKE_CURRENT_BINARY_DIR}/svxreflector
DESTINATION ${SYSTEMD_DEFAULTS_FILES_DIR} )
install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/svxlink
${SYSTEMD_DEFAULTS_FILES_DIR} )
install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/remotetrx
${SYSTEMD_DEFAULTS_FILES_DIR} )
install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/svxreflector
${SYSTEMD_DEFAULTS_FILES_DIR} )
message(STATUS "Systemd unit configuration files will be "
"installed to ${SYSTEMD_DEFAULTS_FILES_DIR} "
"after make install")

2
src/versions
View File

@ -8,7 +8,7 @@ QTEL=1.2.4
LIBECHOLIB=1.3.3
# Version for the Async library
LIBASYNC=1.6.0
LIBASYNC=1.6.0.99.0
# SvxLink versions
SVXLINK=1.7.99.2-reflector-tg