X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/af55c6eade1569161bcb04cdbec7586dbedbcd14..d2bea1918fa33f5e92ed75f3f744c119439924bc:/lib/python/Screens/ScanSetup.py diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 1dd71a48..e20a5de8 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -190,8 +190,8 @@ class ScanSetup(ConfigListScreen, Screen): if nimmanager.getNimType(self.scan_nims.index) == nimmanager.nimType["DVB-S"]: if self.scan_type.value == "single_transponder": - self.systemEntry = getConfigListEntry(_('Transpondertype'), self.scan_sat.system) - self.list.append(self.systemEntry) +# self.systemEntry = getConfigListEntry(_('Transpondertype'), self.scan_sat.system) +# self.list.append(self.systemEntry) self.list.append(getConfigListEntry(_('Satellite'), self.scan_satselection[self.scan_nims.index])) self.list.append(getConfigListEntry(_('Frequency'), self.scan_sat.frequency)) self.list.append(getConfigListEntry(_('Inversion'), self.scan_sat.inversion)) @@ -327,9 +327,9 @@ class ScanSetup(ConfigListScreen, Screen): elif frontendData["tuner_type"] == "DVB-C": defaultCab["frequency"] = int(frontendData["frequency"] / 1000) defaultCab["symbolrate"] = int(frontendData["symbol_rate"] / 1000) - defaultSat["inversion"] = {"INVERSION_OFF": "off", "INVERSION_ON": "on", "INVERSION_AUTO": "auto"}[frontendData["inversion"]] - defaultSat["fec"] = {"FEC_AUTO": "auto", "FEC_1_2": "1_2", "FEC_2_3": "2_3", "FEC_3_4": "3_4", "FEC_5_6": "5_6", "FEC_7_8": "7_8", "FEC_8_9": "8_9", "FEC_NONE": "none"}[frontendData["fec_inner"]] - defaultSat["modulation"] = {"QAM_AUTO": "auto", "QAM_16": "16qam", "QAM_32": "32qam", "QAM_64": "64qam", "QAM_128": "128qam", "QAM_256": "256qam"}[frontendData["modulation"]] + defaultCab["inversion"] = {"INVERSION_OFF": "off", "INVERSION_ON": "on", "INVERSION_AUTO": "auto"}[frontendData["inversion"]] + defaultCab["fec"] = {"FEC_AUTO": "auto", "FEC_1_2": "1_2", "FEC_2_3": "2_3", "FEC_3_4": "3_4", "FEC_5_6": "5_6", "FEC_7_8": "7_8", "FEC_8_9": "8_9", "FEC_NONE": "none"}[frontendData["fec_inner"]] + defaultCab["modulation"] = {"QAM_AUTO": "auto", "QAM_16": "16qam", "QAM_32": "32qam", "QAM_64": "64qam", "QAM_128": "128qam", "QAM_256": "256qam"}[frontendData["modulation"]] self.scan_sat = ConfigSubsection() self.scan_cab = ConfigSubsection()