git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix not-a-string when using english
[enigma2.git]
/
lib
/
python
/
Components
/
NimManager.py
diff --git
a/lib/python/Components/NimManager.py
b/lib/python/Components/NimManager.py
index a8ad6320411a2f941304f5214a26e213cb42d307..933ebcf76b898ae34072528f5c77de44251a02a8 100644
(file)
--- a/
lib/python/Components/NimManager.py
+++ b/
lib/python/Components/NimManager.py
@@
-83,7
+83,7
@@
class SecConfigure:
nim = config.Nims[x]
if slot.nimType == self.NimManager.nimType["DVB-S"]:
print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)
nim = config.Nims[x]
if slot.nimType == self.NimManager.nimType["DVB-S"]:
print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)
- if nim.configMode.value ==
1
:
+ if nim.configMode.value ==
2
:
self.linkNIMs(x, nim.linkedTo.value)
nim = config.Nims[nim.linkedTo.value]
if nim.configMode.value == 0: #simple config
self.linkNIMs(x, nim.linkedTo.value)
nim = config.Nims[nim.linkedTo.value]
if nim.configMode.value == 0: #simple config
@@
-166,7
+166,7
@@
class NimManager:
else:
self.transponders[self.parsedCab] = [ ]
else:
self.transponders[self.parsedCab] = [ ]
- self.transponders[self.parsedCab].append((
0
, freq, sr, mod, fec))
+ self.transponders[self.parsedCab].append((
1
, freq, sr, mod, fec))
class parseTerrestrials(ContentHandler):
def __init__(self, terrestrialsList, transponders):
class parseTerrestrials(ContentHandler):
def __init__(self, terrestrialsList, transponders):
@@
-197,7
+197,7
@@
class NimManager:
else:
self.transponders[self.parsedTer] = [ ]
else:
self.transponders[self.parsedTer] = [ ]
- self.transponders[self.parsedTer].append((
0
, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
+ self.transponders[self.parsedTer].append((
2
, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
def getTransponders(self, pos):
return self.transponders[pos]
def getTransponders(self, pos):
return self.transponders[pos]
@@
-350,10
+350,10
@@
class NimManager:
#callbacks for c++ config
def nimConfigModeChanged(self, slotid, mode):
#callbacks for c++ config
def nimConfigModeChanged(self, slotid, mode):
- if (mode !=
1
): # not linked
+ if (mode !=
2
): # not linked
print "Unlinking slot " + str(slotid)
# TODO call c++ to unlink nim in slot slotid
print "Unlinking slot " + str(slotid)
# TODO call c++ to unlink nim in slot slotid
- if (mode ==
1
): # linked
+ if (mode ==
2
): # linked
pass
#FIXME!!!
#if (len(self.getNimListOfType(self.nimType["DVB-S"], slotid)) > 0):
pass
#FIXME!!!
#if (len(self.getNimListOfType(self.nimType["DVB-S"], slotid)) > 0):
@@
-406,10
+406,10
@@
def InitNimManager(nimmgr):
nim = config.Nims[x]
if slot.nimType == nimmgr.nimType["DVB-S"]:
nim = config.Nims[x]
if slot.nimType == nimmgr.nimType["DVB-S"]:
- nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Loopthrough to Socket A"))) # "Advanced"));
+ nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("
Nothing connected"), _("
Loopthrough to Socket A"))) # "Advanced"));
#important - check if just the 2nd one is LT only and the first one is DVB-S
#important - check if just the 2nd one is LT only and the first one is DVB-S
- if nim.configMode.value ==
1
: #linked
+ if nim.configMode.value ==
2
: #linked
if x == 0: #first one can never be linked to anything
nim.configMode.value = 0 #reset to simple
nim.configMode.save()
if x == 0: #first one can never be linked to anything
nim.configMode.value = 0 #reset to simple
nim.configMode.save()