From edf15b92b620231cdc26f359b10a28ecf70bee83 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 4 Dec 2017 09:46:04 +0100 Subject: [PATCH] add PLI/PLC/PLM to manual transponder selection Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/15e49f9d02901d8a9d04a292fa4c07713ddf1e28 Author: TangoCash Date: 2017-12-04 (Mon, 04 Dec 2017) --- src/zapit/include/zapit/transponder.h | 1 + src/zapit/src/transponder.cpp | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/zapit/include/zapit/transponder.h b/src/zapit/include/zapit/transponder.h index 7dd2962e4..7d894e854 100644 --- a/src/zapit/include/zapit/transponder.h +++ b/src/zapit/include/zapit/transponder.h @@ -48,6 +48,7 @@ public: void ddump(std::string label = "tp"); static char pol(unsigned char pol); std::string description(void); + std::string getPLSMode(const uint8_t pls_mode); delivery_system_t getDelSys(void) { return feparams.delsys; } t_transport_stream_id getTransportStreamId(void) { return transport_stream_id; } diff --git a/src/zapit/src/transponder.cpp b/src/zapit/src/transponder.cpp index 8b5af8d89..6a3046f4e 100644 --- a/src/zapit/src/transponder.cpp +++ b/src/zapit/src/transponder.cpp @@ -215,7 +215,7 @@ std::string transponder::description() if (CFrontend::isSat(feparams.delsys)) { CFrontend::getDelSys(feparams.delsys, getFEParams()->fec_inner, getFEParams()->modulation, f, s, m); - snprintf(buf, sizeof(buf), "%d %c %d %s %s %s ", getFEParams()->frequency/1000, pol(getFEParams()->polarization), getFEParams()->symbol_rate/1000, f, s, m); + snprintf(buf, sizeof(buf), "%d %c %d %s %s %s (%d/%d/%s)", getFEParams()->frequency/1000, pol(getFEParams()->polarization), getFEParams()->symbol_rate/1000, f, s, m, getFEParams()->plp_id, getFEParams()->pls_code, getPLSMode(getFEParams()->pls_mode).c_str()); } else if (CFrontend::isCable(feparams.delsys)) { CFrontend::getDelSys(feparams.delsys, getFEParams()->fec_inner, getFEParams()->modulation, f, s, m); snprintf(buf, sizeof(buf), "%d %d %s %s %s ", getFEParams()->frequency/1000, getFEParams()->symbol_rate/1000, f, s, m); @@ -227,3 +227,19 @@ std::string transponder::description() return std::string(buf); } + +std::string transponder::getPLSMode(const uint8_t pls_mode) +{ + switch (pls_mode) { + case 0x00: + return "Root"; + case 0x01: + return "Gold"; + case 0x02: + return "Combo"; + case 0x03: + return "Unknown"; + default: + return "Root"; + } +}