From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Thu, 9 Oct 2008 22:18:08 +0000 (+0000)
Subject: add delay before send sequence repeat (diseqc/toneburst)
X-Git-Tag: 2.6.0~780
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/793a21597557994f9e57ce16df22437fa38bd45e

add delay before send sequence repeat (diseqc/toneburst)
---

diff --git a/configure.ac b/configure.ac
index fd3dc63c..dcfeafcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,10 +69,10 @@ AM_CONDITIONAL(WITH_SDL, test "$WITH_SDL" = "yes")
 
 CPPFLAGS="$CPPFLAGS "'-I$(top_srcdir)'
 CPPFLAGS="$CPPFLAGS -D_REENTRANT $PYTHON_CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SDL_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $DVBSI_CFLAGS $GSTREAMER_CFLAGS $LIBUNGIF_CLFAGS"
-#CPPFLAGS="$CPPFLAGS -DMEMLEAK_CHECK"
+CPPFLAGS="$CPPFLAGS -DMEMLEAK_CHECK"
 CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
 LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS $GSTREAMER_LDFLAGS $LIBUNGIF_LDFLAGS"
-#LDFLAGS="-rdynamic $LDFLAGS"
+LDFLAGS="-rdynamic $LDFLAGS"
 
 TUXBOX_APPS_GETTEXT
 
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 70cbf047..0f2069c1 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -689,6 +689,9 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 								sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
 								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_TONEBURST]) );
 							}
+
+							if (di_param.m_seq_repeat && seq_repeat == 0)
+								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BEFORE_SEQUENCE_REPEAT]) );
 						}
 						sendDiSEqC = true;
 					}
diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 24c606f0..42e53ebe 100644
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -263,6 +263,7 @@ public:
 		DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD, // delay after enable voltage before transmit motor command
 		DELAY_AFTER_MOTOR_STOP_CMD, // delay after transmit motor stop
 		DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD, // delay after voltage change before transmit motor command
+		DELAY_BEFORE_SEQUENCE_REPEAT, // delay before the complete sequence is repeated (when enabled)
 		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
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index aae7dabc..3c7a147e 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -822,6 +822,10 @@ def InitSecParams():
 	x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD, configElement.value))
 	config.sec.delay_after_voltage_change_before_motor_command = x
 
+	x = ConfigInteger(default=70, limits = (0, 9999))
+	x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_BEFORE_SEQUENCE_REPEAT, configElement.value))
+	config.sec.delay_before_sequence_repeat = x
+
 	x = ConfigInteger(default=360, limits = (0, 9999))
 	x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_RUNNING_TIMEOUT, configElement.value))
 	config.sec.motor_running_timeout = x
@@ -1030,7 +1034,8 @@ def InitNimManager(nimmgr):
 			nim.terrestrial_5V = ConfigOnOff()
 		else:
 			nim.configMode = ConfigSelection(choices = { "nothing": _("disabled") }, default="nothing");
-			print "pls add support for this frontend type!"		
+			if slot.type is not None:
+				print "pls add support for this frontend type!", slot.type
 #			assert False
 
 	nimmgr.sec = SecConfigure(nimmgr)
diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
index fa5ed24e..7b3d08f6 100644
--- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
@@ -35,6 +35,7 @@ class SecParameterSetup(Screen, ConfigListScreen):
 			("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)