aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2008-11-13 13:32:15 +0100
committerghost <andreas.monzner@multimedia-labs.de>2008-11-13 13:32:15 +0100
commit58163e18dce8d07d32500c8b24e616518e40710b (patch)
treee8aa0355115a1ac3eb66b98c4aa295fc6891e0f2 /lib
parent549ebaf137cabfbe9b9c3c346011c7d6241e7655 (diff)
downloadenigma2-58163e18dce8d07d32500c8b24e616518e40710b.tar.gz
enigma2-58163e18dce8d07d32500c8b24e616518e40710b.zip
add possibility to change delay after diseqc reset command and delay after diseqc peripherial poweron command via satellite equipment control plugin
Diffstat (limited to 'lib')
-rw-r--r--lib/dvb/sec.cpp4
-rw-r--r--lib/dvb/sec.h2
-rw-r--r--lib/python/Components/NimManager.py8
-rw-r--r--lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py2
4 files changed, 14 insertions, 2 deletions
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 2a6016e0..2b7f717b 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -637,11 +637,11 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
diseqc.data[2] = 0;
// diseqc reset
sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
- sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+ sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_DISEQC_RESET_CMD]) );
diseqc.data[2] = 3;
// diseqc peripherial powersupply on
sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
- sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 150) );
+ sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD]) );
}
for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 42e53ebe..e68ed167 100644
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -267,6 +267,8 @@ public:
MOTOR_COMMAND_RETRIES, // max transmit tries of rotor command when the rotor dont start turning (with power measurement)
MOTOR_RUNNING_TIMEOUT, // max motor running time before timeout
DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS, // delay after change voltage before transmit toneburst/diseqc
+ DELAY_AFTER_DISEQC_RESET_CMD,
+ DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD,
MAX_PARAMS
};
private:
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 7060168e..f4e91083 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -858,6 +858,14 @@ def InitSecParams():
x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_COMMAND_RETRIES, configElement.value))
config.sec.motor_command_retries = x
+ x = ConfigInteger(default=50, limits = (0, 9999))
+ x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_DISEQC_RESET_CMD, configElement.value))
+ config.sec.delay_after_diseqc_reset_cmd = x
+
+ x = ConfigInteger(default=150, limits = (0, 9999))
+ x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD, configElement.value))
+ config.sec.delay_after_diseqc_peripherial_poweron_cmd = x
+
# TODO add support for satpos depending nims to advanced nim configuration
# so a second/third/fourth cable from a motorized lnb can used behind a
# diseqc 1.0 / diseqc 1.1 / toneburst switch
diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
index 7b3d08f6..ec223d3e 100644
--- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
@@ -23,6 +23,8 @@ 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),