Added signal level units (Thanks to Winfried).

Author: rofafor

HISTORY

@@ -547,3 +547,7 @@ VDR Plugin 'femon' Revision History
 2018-04-15: Version 2.4.0
 
 - Updated for vdr-2.4.0.
+
+2019-xx-xx: Version 2.4.1
+
+- Added signal level units (Thanks to Winfried).

README

@@ -38,7 +38,7 @@ Terminology:
 | [LOCK]     [SIGNAL]     [CARRIER]     [VITERBI]     [SYNC] |
 --------------------------------------------------------------
 
-STR     - Signal strength in dBm
+STR     - Signal strength in dBm/dBuV/dbV
 CNR     - Signal-to-noise ratio of the main carrier in dB
 BER     - Bit error rate after the forward error correction (FEC) done by inner code block
 PER     - Block error rate after the outer forward error correction coding

config.c

@@ -20,6 +20,7 @@ cFemonConfig::cFemonConfig()
   themeM(0),
   positionM(1),
   downscaleM(0),
+  signalUnitM(0),
   redLimitM(33),
   greenLimitM(66),
   updateIntervalM(5),

config.h

@@ -19,6 +19,14 @@ enum eFemonModes
   eFemonModeMaxNumber
 };
 
+enum eFemonSignalUnit
+{
+  eFemonSignalUnitdBm,
+  eFemonSignalUnitdBuV,
+  eFemonSignalUnitdBV,
+  eFemonSignalUnitMaxNumber
+};
+
 class cFemonConfig
 {
 private:
@@ -29,6 +37,7 @@ class cFemonConfig
   int themeM;
   int positionM;
   int downscaleM;
+  int signalUnitM;
   int redLimitM;
   int greenLimitM;
   int updateIntervalM;
@@ -68,6 +77,7 @@ class cFemonConfig
   int GetTheme(void) const { return themeM; }
   int GetPosition(void) const { return positionM; }
   int GetDownscale(void) const { return downscaleM; }
+  int GetSignalUnit(void) const { return signalUnitM; }
   int GetRedLimit(void) const { return redLimitM; }
   int GetGreenLimit(void) const { return greenLimitM; }
   int GetUpdateInterval(void) const { return updateIntervalM; }
@@ -84,6 +94,7 @@ class cFemonConfig
   void SetTheme(int themeP) { themeM = themeP; }
   void SetPosition(int positionP) { positionM = positionP; }
   void SetDownscale(int downscaleP) { downscaleM = downscaleP; }
+  void SetSignalUnit(int signalUnitP) { signalUnitM = signalUnitP; }
   void SetRedLimit(int redLimitP) { redLimitM = redLimitP; }
   void SetGreenLimit(int greenLimitP) { greenLimitM = greenLimitP; }
   void SetUpdateInterval(int updateIntervalP) { updateIntervalM = updateIntervalP; }

femon.c

@@ -25,7 +25,7 @@
 #define GITVERSION ""
 #endif
 
-static const char VERSION[]       = "2.4.0" GITVERSION;
+static const char VERSION[]       = "2.4.1" GITVERSION;
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");
 
@@ -165,6 +165,8 @@ bool cPluginFemon::SetupParse(const char *nameP, const char *valueP)
      FemonConfig.SetSvdrpPort(atoi(valueP));
   else if (!strcasecmp(nameP, "ServerIp"))
      FemonConfig.SetSvdrpIp(valueP);
+  else if (!strcasecmp(nameP, "SignalUnit"))
+     FemonConfig.SetSignalUnit(atoi(valueP));
   else
     return false;
 
@@ -292,7 +294,7 @@ cString cPluginFemon::SVDRPCommand(const char *commandP, const char *optionP, in
      return cString::sprintf("%d on device #%d", dev->SignalQuality(), dev->CardIndex());
      }
   else if (strcasecmp(commandP, "SGNL") == 0) {
-     return cString::sprintf("%.2f dBm on device #%d", getSignal(dev), dev->CardIndex());
+     return cString::sprintf("%s on device #%d", *getSignalStrength(getSignal(dev)), dev->CardIndex());
      }
   else if (strcasecmp(commandP, "CNRA") == 0) {
      return cString::sprintf("%.2f dB on device #%d", getCNR(dev), dev->CardIndex());

osd.c

@@ -371,7 +371,7 @@ void cFemonOsd::DrawStatusWindow(void)
      if (qualityValidM)
         OSDDRAWSTATUSBAR(qualityM);
      offset += OSDROWHEIGHT;
-     OSDDRAWSTATUSVALUES(signalValidM ? *cString::sprintf("STR: %.2f dBm", signalM) : "STR: ---",
+     OSDDRAWSTATUSVALUES(signalValidM ? *cString::sprintf("STR: %s", *getSignalStrength(signalM)) : "STR: ---",
                          cnrValidM ? *cString::sprintf("CNR: %.2f dB", cnrM) : "CNR: ---",
                          berValidM ? *cString::sprintf("BER: %.0f", berM) : "BER: ---",
                          perValidM ? *cString::sprintf("PER: %.0f", perM) : "PER: ---",

po/de_DE.po

@@ -1,9 +1,10 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2018 Rolf Ahrenberg
+# Copyright (C) 2007-2019 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Peter Marquardt
 # Andreas Brachold
-# Christian Wieninger 
+# Christian Wieninger
+# Winfried
 #
 msgid ""
 msgstr ""
@@ -129,6 +130,15 @@ msgstr "Transponder"
 msgid "stream"
 msgstr "Stream"
 
+msgid "dBm"
+msgstr "dBm"
+
+msgid "dBuV"
+msgstr "dBuV"
+
+msgid "dBV"
+msgstr "dBV"
+
 msgid "Classic"
 msgstr "Klassischer"
 
@@ -189,6 +199,12 @@ msgstr "OSD Größe verkleinern [%]"
 msgid "Define the downscale ratio for OSD size."
 msgstr "Definiert den Verkleinerungsfaktor der OSD-Größe."
 
+msgid "Signal level unit"
+msgstr "Signalpegel Einheiten"
+
+msgid "Define the used signal level unit."
+msgstr "Definiert der Einheit für Signalpegel."
+
 msgid "Red limit [%]"
 msgstr "Grenze Rot [%]"
 

po/es_ES.po

@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2018 Rolf Ahrenberg
+# Copyright (C) 2007-2019 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Luis Palacios
 #
@@ -127,6 +127,15 @@ msgstr "Transpondedor"
 msgid "stream"
 msgstr "Flujo"
 
+msgid "dBm"
+msgstr "dBm"
+
+msgid "dBuV"
+msgstr "dBuV"
+
+msgid "dBV"
+msgstr "dBV"
+
 msgid "Classic"
 msgstr "Clásico"
 
@@ -187,6 +196,12 @@ msgstr ""
 msgid "Define the downscale ratio for OSD size."
 msgstr ""
 
+msgid "Signal level unit"
+msgstr ""
+
+msgid "Define the used signal level unit."
+msgstr ""
+
 msgid "Red limit [%]"
 msgstr "Límite de rojo [%s]"
 

po/et_EE.po

@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2018 Rolf Ahrenberg
+# Copyright (C) 2007-2019 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Arthur Konovalov
 #
@@ -127,6 +127,15 @@ msgstr "transponder"
 msgid "stream"
 msgstr "voog"
 
+msgid "dBm"
+msgstr "dBm"
+
+msgid "dBuV"
+msgstr "dBuV"
+
+msgid "dBV"
+msgstr "dBV"
+
 msgid "Classic"
 msgstr "Classic"
 
@@ -187,6 +196,12 @@ msgstr "Ekraanimen
 msgid "Define the downscale ratio for OSD size."
 msgstr "Ekraanimenüü suuruse vähendamise määritlemine"
 
+msgid "Signal level unit"
+msgstr ""
+
+msgid "Define the used signal level unit."
+msgstr ""
+
 msgid "Red limit [%]"
 msgstr "Punase limiit [%]"
 

po/fi_FI.po

@@ -1,13 +1,13 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2018 Rolf Ahrenberg
+# Copyright (C) 2007-2019 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Rolf Ahrenberg
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: vdr-femon 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
+"POT-Creation-Date: 2019-10-27 16:29+0200\n"
 "PO-Revision-Date: 2018-04-15 04:15+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -127,8 +127,17 @@ msgstr "transponderi"
 msgid "stream"
 msgstr "lähete"
 
+msgid "dBm"
+msgstr "dBm"
+
+msgid "dBuV"
+msgstr "dBuV"
+
+msgid "dBV"
+msgstr "dBV"
+
 msgid "Classic"
-msgstr "Klassinen"
+msgstr ""
 
 msgid "Elchi"
 msgstr "Elchi"
@@ -187,6 +196,12 @@ msgstr "Pienennä näytön kokoa [%]"
 msgid "Define the downscale ratio for OSD size."
 msgstr "Määrittele näytön pienennyssuhde."
 
+msgid "Signal level unit"
+msgstr "Signaalitason yksikkö"
+
+msgid "Define the used signal level unit."
+msgstr "Määrittele yksikkö signaalin tasolle."
+
 msgid "Red limit [%]"
 msgstr "Punaisen taso [%]"
 
@@ -390,3 +405,6 @@ msgstr "Mbit/s"
 
 msgid "kbit/s"
 msgstr "kbit/s"
+
+#~ msgid "Clasxsic"
+#~ msgstr "Klassinen"

po/fr_FR.po

@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2018 Rolf Ahrenberg
+# Copyright (C) 2007-2019 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Nicolas Huillard
 # Michaël Nival <[email protected]>, 2010
@@ -129,6 +129,15 @@ msgstr "transpondeur"
 msgid "stream"
 msgstr "flux"
 
+msgid "dBm"
+msgstr "dBm"
+
+msgid "dBuV"
+msgstr "dBuV"
+
+msgid "dBV"
+msgstr "dBV"
+
 msgid "Classic"
 msgstr "Classique"
 
@@ -189,6 +198,12 @@ msgstr "Réduit la taille de l'OSD (%)"
 msgid "Define the downscale ratio for OSD size."
 msgstr "Définit le ration de réduction de l'OSD."
 
+msgid "Signal level unit"
+msgstr ""
+
+msgid "Define the used signal level unit."
+msgstr ""
+
 msgid "Red limit [%]"
 msgstr "Limite du rouge (%)"
 

po/hu_HU.po

@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2018 Rolf Ahrenberg
+# Copyright (C) 2007-2019 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Füley István <ifuley at tigercomp dot ro>, 2011
 #
@@ -130,6 +130,15 @@ msgstr "transponder"
 msgid "stream"
 msgstr "adatfolyam (stream)"
 
+msgid "dBm"
+msgstr "dBm"
+
+msgid "dBuV"
+msgstr "dBuV"
+
+msgid "dBV"
+msgstr "dBV"
+
 msgid "Classic"
 msgstr "Klasszikus"
 
@@ -190,6 +199,12 @@ msgstr "Az OSD lem
 msgid "Define the downscale ratio for OSD size."
 msgstr "Az OSD méretének leméretezése százalékban."
 
+msgid "Signal level unit"
+msgstr ""
+
+msgid "Define the used signal level unit."
+msgstr ""
+
 msgid "Red limit [%]"
 msgstr "Piros színt határa [%]"
 

po/it_IT.po

@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2018 Rolf Ahrenberg
+# Copyright (C) 2007-2019 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Sean Carlos
 # Diego Pierotto <[email protected]>
@@ -131,6 +131,15 @@ msgstr "transponder"
 msgid "stream"
 msgstr "flusso"
 
+msgid "dBm"
+msgstr "dBm"
+
+msgid "dBuV"
+msgstr "dBuV"
+
+msgid "dBV"
+msgstr "dBV"
+
 msgid "Classic"
 msgstr "Classico"
 
@@ -191,6 +200,12 @@ msgstr "Riduci dimensione OSD [%]"
 msgid "Define the downscale ratio for OSD size."
 msgstr "Definisci il rapporto di riduzione della dimensione OSD."
 
+msgid "Signal level unit"
+msgstr ""
+
+msgid "Define the used signal level unit."
+msgstr ""
+
 msgid "Red limit [%]"
 msgstr "Limite rosso [%]"