diff --git a/src/doc/man/svxlink.conf.5 b/src/doc/man/svxlink.conf.5 index a609647a..fe7f7f92 100644 --- a/src/doc/man/svxlink.conf.5 +++ b/src/doc/man/svxlink.conf.5 @@ -888,13 +888,13 @@ if there have been no activity. If 1 have been specified for DEFAULT_ACTIVE, this configuration variable will specify after how many seconds the link will be reactivated after being manually deactivated. .TP -.B AUTOACTIVATE_ON_SQL +.B ACTIVATE_ON_ACTIVITY Enter a comma separated list of logics, which should automatically activate -the link if there is activity (e.g. squelch open) in it. One possible -application for this is for example to make the connection of a +the link if there is activity (e.g. squelch open, announcements etc) in it. One +possible application for this is for example to make the connection of a microphone/speaker combination (without DTMF encoder) for brief announcements but without having to constantly listen in. -Example: AUTOACTIVATE_ON_SQL=MicSpkrLogic +Example: ACTIVATE_ON_ACTIVITY=MicSpkrLogic . .SS Local Receiver Section . diff --git a/src/svxlink/ChangeLog b/src/svxlink/ChangeLog index 7481c27c..d9a4c070 100644 --- a/src/svxlink/ChangeLog +++ b/src/svxlink/ChangeLog @@ -148,6 +148,9 @@ * Bugfix in ReflectorLogic: The AUTOACTIVATE_ON_SQL logic linking functionality did not work for the ReflectorLogic. +* The AUTOACTIVATE_ON_SQL logic linking configuration variable has been + renamed to ACTIVATE_ON_ACTIVITY. + 1.7.0 -- 01 Sep 2019 diff --git a/src/svxlink/svxlink/LinkManager.cpp b/src/svxlink/svxlink/LinkManager.cpp index 1d441fa3..276ff984 100644 --- a/src/svxlink/svxlink/LinkManager.cpp +++ b/src/svxlink/svxlink/LinkManager.cpp @@ -134,7 +134,7 @@ LinkManager* LinkManager::_instance = 0; * ****************************************************************************/ -bool LinkManager::initialize(const Async::Config &cfg, +bool LinkManager::initialize(Async::Config &cfg, const std::string &link_names) { assert(!LinkManager::hasInstance()); @@ -216,11 +216,19 @@ bool LinkManager::initialize(const Async::Config &cfg, cfg.getValue(link.name, "TIMEOUT", timeout); // Automatically activate the link, if one (or more) logics - // has activity, e.g. squelch open. - string autoactivate_on_sql; - if (cfg.getValue(link.name, "AUTOACTIVATE_ON_SQL", autoactivate_on_sql)) + // has activity, e.g. squelch open, announcement activity etc. + string activate_on_activity; + if (cfg.getValue(link.name, "AUTOACTIVATE_ON_SQL", activate_on_activity)) { - SvxLink::splitStr(link.auto_activate, autoactivate_on_sql, ","); + std::cerr << "*** WARNING: Configuration variable " << link.name + << "/AUTOACTIVATE_ON_SQL has been renamed to " + "ACTIVATE_ON_ACTIVITY" + << std::endl; + cfg.setValue(link.name, "ACTIVATE_ON_ACTIVITY", activate_on_activity); + } + if (cfg.getValue(link.name, "ACTIVATE_ON_ACTIVITY", activate_on_activity)) + { + SvxLink::splitStr(link.auto_activate, activate_on_activity, ","); // An automatically connected link should be disconnected after a // while so the TIMEOUT configuration variable must be set. diff --git a/src/svxlink/svxlink/LinkManager.h b/src/svxlink/svxlink/LinkManager.h index b6656f96..cba4d43e 100644 --- a/src/svxlink/svxlink/LinkManager.h +++ b/src/svxlink/svxlink/LinkManager.h @@ -155,7 +155,7 @@ class LinkManager : public sigc::trackable * This function will initialize the link manager. It must be called * before calling the instace function. */ - static bool initialize(const Async::Config &cfg, + static bool initialize(Async::Config &cfg, const std::string &link_names); /** diff --git a/src/svxlink/svxlink/svxlink.conf.in b/src/svxlink/svxlink/svxlink.conf.in index 7543851a..a0d1c4b7 100644 --- a/src/svxlink/svxlink/svxlink.conf.in +++ b/src/svxlink/svxlink/svxlink.conf.in @@ -107,7 +107,7 @@ QSY_PENDING_TIMEOUT=15 CONNECT_LOGICS=RepeaterLogic:94:SK3AB,SimplexLogic:92:SK3CD #DEFAULT_ACTIVE=1 TIMEOUT=300 -#AUTOACTIVATE_ON_SQL=RepeaterLogic +#ACTIVATE_ON_ACTIVITY=RepeaterLogic [Macros] 1=EchoLink:9999# diff --git a/src/versions b/src/versions index 3cda9604..ce03a3c2 100644 --- a/src/versions +++ b/src/versions @@ -11,7 +11,7 @@ LIBECHOLIB=1.3.3.99.0 LIBASYNC=1.6.99.14 # SvxLink versions -SVXLINK=1.7.99.48 +SVXLINK=1.7.99.49 MODULE_HELP=1.0.0 MODULE_PARROT=1.1.1 MODULE_ECHO_LINK=1.5.99.1