From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Tue, 22 Nov 2005 03:49:58 +0000 (+0000)
Subject: fixed parameters for dvb-c
X-Git-Tag: 2.6.0~5022
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/d3f4cf09ab23a7a8945730679b1d3b36e41cf870?hp=9abfba44b394a64d978edebb58dc4f445cac2623

fixed parameters for dvb-c
---

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 4c5317e0..d114f568 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -649,9 +649,9 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 		if (where.getDVBC(feparm))
 			return -EINVAL;
 #if HAVE_DVB_API_VERSION < 3
-		parm.Frequency = feparm.frequency;
+		parm.Frequency = feparm.frequency * 1000;
 #else
-		parm.frequency = feparm.frequency;
+		parm.frequency = feparm.frequency * 1000;
 #endif
 
 		parm.u.qam.symbol_rate = feparm.symbol_rate;
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 57ff33f9..fd805e45 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -168,16 +168,15 @@ class ScanSetup(Screen):
 			# sat
 			config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (10000, 14000)))
 			config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, ("on", "off", "auto"))
-			config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 30000)))
+			config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 9999)))
 			config.scan.sat.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, 0, ("horizontal", "vertical",  "circular left", "circular right"))
 			config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, ("None", "1/2", "2/3", "3/4", "5/6", "7/8", "auto"))
 
-
 			# cable
-			config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (10000, 14000)))
-			config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, 0, ("off", "on", "Auto"))
-			config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 0, ("16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM", "Auto"))
-			config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 0, ("None", "1/2", "2/3", "3/4", "4/5", "5/6", "6/7", "7/8", "8/9", "Auto"))
+			config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (50, 9999)))
+			config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, 2, ("off", "on", "Auto"))
+			config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 2, ("16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM", "Auto"))
+			config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 9, ("None", "1/2", "2/3", "3/4", "4/5", "5/6", "6/7", "7/8", "8/9", "Auto"))
 			config.scan.cab.symbolrate = configElement_nonSave("config.scan.cab.symbolrate", configSequence, [6900], configsequencearg.get("INTEGER", (1, 30000)))
 
 			# terrestial