Fixed VOX enable/disable for channels in Radioddity & TyT codeplugs.

hmatuschek · Oct 2, 2021 · 9bca34f · 9bca34f
1 parent 518e0d3
commit 9bca34f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/radioddity_codeplug.cc b/lib/radioddity_codeplug.cc
@@ -417,7 +417,10 @@ RadioddityCodeplug::ChannelElement::fromChannelObj(const Channel *c, Context &ct
   else
     setTXTimeOut(c->timeout());
   enableRXOnly(c->rxOnly());
-  enableVOX((c->defaultVOX() && (!ctx.config()->settings()->voxDisabled())) || (!c->voxDisabled()));
+  // Enable vox
+  bool defaultVOXEnabled = (c->defaultVOX() && (!ctx.config()->settings()->voxDisabled()));
+  bool channelVOXEnabled = (! (c->voxDisabled()||c->defaultVOX()));
+  enableVOX(defaultVOXEnabled || channelVOXEnabled);
 
   if (c->scanListObj())
     setScanListIndex(ctx.index(c->scanListObj()));

diff --git a/lib/tyt_codeplug.cc b/lib/tyt_codeplug.cc
@@ -254,6 +254,8 @@ TyTCodeplug::ChannelElement::vox() const {
 }
 void
 TyTCodeplug::ChannelElement::enableVOX(bool enable) {
+  if (enable)
+    logDebug() << "Enable VOX!";
   setBit(4,4, enable);
 }
 
@@ -593,7 +595,9 @@ TyTCodeplug::ChannelElement::fromChannelObj(const Channel *chan, Context &ctx) {
   else
     setScanListIndex(0);
   // Enable vox
-  enableVOX((chan->defaultVOX() && (!ctx.config()->settings()->voxDisabled())) || (!chan->voxDisabled()));
+  bool defaultVOXEnabled = (chan->defaultVOX() && (!ctx.config()->settings()->voxDisabled()));
+  bool channelVOXEnabled = (! (chan->voxDisabled()||chan->defaultVOX()));
+  enableVOX(defaultVOXEnabled || channelVOXEnabled);
   // encode power setting
   if (chan->defaultPower())
     setPower(ctx.config()->settings()->power());