Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / python / Plugins / SystemPlugins / SatelliteEquipmentControl / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
index 5369ccf0840709579271f362f30ce186abff8a37..ec223d3e22ffc1ea8622446f7fd9c5b75dca918b 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
@@ -23,17 +23,21 @@ class SecParameterSetup(Screen, ConfigListScreen):
 
                Screen.__init__(self, session)
                list = [
+                       ("Delay after diseqc reset command", config.sec.delay_after_diseqc_reset_cmd),
+                       ("Delay after diseqc peripherial poweron command", config.sec.delay_after_diseqc_peripherial_poweron_cmd),
                        ("Delay after continuous tone change", config.sec.delay_after_continuous_tone_change),
                        ("Delay after last voltage change", config.sec.delay_after_final_voltage_change),
                        ("Delay between diseqc commands", config.sec.delay_between_diseqc_repeats),
                        ("Delay after last diseqc command", config.sec.delay_after_last_diseqc_command),
                        ("Delay after toneburst", config.sec.delay_after_toneburst),
+                       ("Delay after change voltage before switch command", config.sec.delay_after_change_voltage_before_switch_command),
                        ("Delay after enable voltage before switch command", config.sec.delay_after_enable_voltage_before_switch_command),
                        ("Delay between switch and motor command", config.sec.delay_between_switch_and_motor_command),
                        ("Delay after set voltage before measure motor power", config.sec.delay_after_voltage_change_before_measure_idle_inputpower),
                        ("Delay after enable voltage before motor command", config.sec.delay_after_enable_voltage_before_motor_command),
                        ("Delay after motor stop command", config.sec.delay_after_motor_stop_command),
                        ("Delay after voltage change before motor command", config.sec.delay_after_voltage_change_before_motor_command),
+                       ("Delay before sequence repeat", config.sec.delay_before_sequence_repeat),
                        ("Motor running timeout", config.sec.motor_running_timeout),
                        ("Motor command retries", config.sec.motor_command_retries) ]
                ConfigListScreen.__init__(self, list)
@@ -48,18 +52,24 @@ def confirmed(answer):
 def SecSetupMain(Session, **kwargs):
        global session
        session = Session
-       session.openWithCallback(confirmed, MessageBox, _("Please do not change values when you not know what you do!"), MessageBox.TYPE_INFO)
+       session.openWithCallback(confirmed, MessageBox, _("Please do not change any values unless you know what you are doing!"), MessageBox.TYPE_INFO)
 
 def SecSetupStart(menuid):
        show = False
-       for slot in nimmgr.nimslots:
-               if slot.nimType == nimmgr.nimType["DVB-S"]:
-                       show = True
-                       break
-       if show and menuid == "scan":
-               return [(_("Satellite Equipment Setup"), SecSetupMain)]
-       else:
-               return []
+       
+       # other menu than "scan"?
+       if menuid != "scan": 
+               return [ ]
+
+       # only show if DVB-S frontends are available
+       for slot in nimmgr.nim_slots:
+               if slot.isCompatible("DVB-S"):
+                       return [(_("Satellite Equipment Setup"), SecSetupMain, "satellite_equipment_setup", None)]
+
+       return [ ]
 
 def Plugins(**kwargs):
-       return PluginDescriptor(name=_("Satellite Equipment Setup"), description="Setup your satellite equipment", where = PluginDescriptor.WHERE_SETUP, fnc=SecSetupStart)
+       if (nimmgr.hasNimType("DVB-S")):
+               return PluginDescriptor(name=_("Satellite Equipment Setup"), description="Setup your satellite equipment", where = PluginDescriptor.WHERE_MENU, fnc=SecSetupStart)
+       else:
+               return []