at possibility to change the motor running/stopped input power thresold in

simple motor config

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 22c99520a8b5c669c6aa04483e07ba55e2327725..30e633a04c1db14322cb48aecf03d76a7409bee2 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -29,7 +29,7 @@ def tryOpen(filename):
        return procFile
 
 class SecConfigure:
-       def addLNBSimple(self, sec, slotid, diseqcmode, toneburstmode = diseqcParam.NO, diseqcpos = diseqcParam.SENDNO, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0, turningSpeed = rotorParam.FAST):
+       def addLNBSimple(self, sec, slotid, diseqcmode, toneburstmode = diseqcParam.NO, diseqcpos = diseqcParam.SENDNO, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0, turningSpeed = rotorParam.FAST, useInputPower=True, inputPowerDelta=50):
                #simple defaults
                sec.addLNB()
                tunermask = 1 << slotid
@@ -65,8 +65,8 @@ class SecConfigure:
                        sec.setLaDirection(laDirection)
                        sec.setLongitude(longitude)
                        sec.setLoDirection(loDirection)
-                       sec.setUseInputpower(True)
-                       sec.setInputpowerDelta(50)
+                       sec.setUseInputpower(useInputPower)
+                       sec.setInputpowerDelta(inputPowerDelta)
                        sec.setRotorTurningSpeed(turningSpeed)
 
                        for x in self.NimManager.satList:
@@ -159,20 +159,28 @@ class SecConfigure:
                                                                loValue = rotorParam.EAST
                                                        else:
                                                                loValue = rotorParam.WEST
-                                                       turn_speed_dict = { "fast": rotorParam.FAST, "slow": rotorParam.SLOW }
-                                                       if turn_speed_dict.has_key(nim.turningSpeed.value):
-                                                               turning_speed = turn_speed_dict[nim.turningSpeed.value]
-                                                       else:
-                                                               beg_time = localtime(nim.fastTurningBegin.value)
-                                                               end_time = localtime(nim.fastTurningEnd.value)
-                                                               turning_speed = ((beg_time.tm_hour+1) * 60 + beg_time.tm_min + 1) << 16
-                                                               turning_speed |= (end_time.tm_hour+1) * 60 + end_time.tm_min + 1
+                                                       inputPowerDelta=50
+                                                       useInputPower=False
+                                                       turning_speed=0
+                                                       if nim.powerMeasurement.value:
+                                                               useInputPower=True
+                                                               inputPowerDelta=nim.powerThreshold.value
+                                                               turn_speed_dict = { "fast": rotorParam.FAST, "slow": rotorParam.SLOW }
+                                                               if turn_speed_dict.has_key(nim.turningSpeed.value):
+                                                                       turning_speed = turn_speed_dict[nim.turningSpeed.value]
+                                                               else:
+                                                                       beg_time = localtime(nim.fastTurningBegin.value)
+                                                                       end_time = localtime(nim.fastTurningEnd.value)
+                                                                       turning_speed = ((beg_time.tm_hour+1) * 60 + beg_time.tm_min + 1) << 16
+                                                                       turning_speed |= (end_time.tm_hour+1) * 60 + end_time.tm_min + 1
                                                        self.addLNBSimple(sec, slotid = x, diseqcmode = 3,
                                                                longitude = nim.longitude.float,
                                                                loDirection = loValue,
                                                                latitude = nim.latitude.float,
                                                                laDirection = laValue,
-                                                               turningSpeed = turning_speed)
+                                                               turningSpeed = turning_speed,
+                                                               useInputPower = useInputPower,
+                                                               inputPowerDelta = inputPowerDelta)
                                        elif nim.configMode.value == "advanced": #advanced config
                                                self.updateAdvanced(sec, x)
                print "sec config completed"
@@ -834,6 +842,8 @@ def InitNimManager(nimmgr):
                        nim.longitudeOrientation = ConfigSelection(choices={"east": _("East"), "west": _("West")}, default = "east")
                        nim.latitude = ConfigFloat(default=[50,767], limits=[(0,359),(0,999)])
                        nim.latitudeOrientation = ConfigSelection(choices={"north": _("North"), "south": _("South")}, default="north")
+                       nim.powerMeasurement = ConfigYesNo(default=True)
+                       nim.powerThreshold = ConfigInteger(default=50, limits=(0, 100))
                        nim.turningSpeed = ConfigSelection(choices = [("fast", _("Fast")), ("slow", _("Slow")), ("fast epoch", _("Fast epoch")) ], default = "fast")
                        btime = datetime(1970, 1, 1, 7, 0);
                        nim.fastTurningBegin = ConfigDateTime(default = mktime(btime.timetuple()), formatstring = _("%H:%M"), increment = 900)

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 644d1d96675f4daec6040a394986d52c79db2acc..e95a5b4620bbdc86418359447a6b8b1a08bb4a96 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -22,22 +22,23 @@ class NimSetup(Screen, ConfigListScreen):
                                list.append(getConfigListEntry(_("Port D"), self.nimConfig.diseqcD))
 
        def createPositionerSetup(self, list):
-#              list.append(getConfigListEntry(_("Positioner mode"), self.nimConfig.positionerMode))
-#              if self.nimConfig.positionerMode.value == "usals": # USALS
-               list.append(getConfigListEntry(_("Longitude"), self.nimConfig.longitude))
-               list.append(getConfigListEntry(" ", self.nimConfig.longitudeOrientation))
-               list.append(getConfigListEntry(_("Latitude"), self.nimConfig.latitude))
-               list.append(getConfigListEntry(" ", self.nimConfig.latitudeOrientation))
-               self.turningSpeed = getConfigListEntry(_("Rotor turning speed"), self.nimConfig.turningSpeed)
-               self.list.append(self.turningSpeed)
-               if self.nimConfig.turningSpeed.value == "fast epoch":
-                       self.turnFastEpochBegin = getConfigListEntry(_("Begin time"), self.nimConfig.fastTurningBegin)
-                       self.turnFastEpochEnd = getConfigListEntry(_("End time"), self.nimConfig.fastTurningEnd)
-                       self.list.append(self.turnFastEpochBegin)
-                       self.list.append(self.turnFastEpochEnd)
+               nim = self.nimConfig
+               list.append(getConfigListEntry(_("Longitude"), nim.longitude))
+               list.append(getConfigListEntry(" ", nim.longitudeOrientation))
+               list.append(getConfigListEntry(_("Latitude"), nim.latitude))
+               list.append(getConfigListEntry(" ", nim.latitudeOrientation))
 
-#              elif self.nimConfig.positionerMode.value == "manual": # manual
-#                      pass
+               self.advancedPowerMeasurement = getConfigListEntry(_("Use Power Measurement"), nim.powerMeasurement)
+               list.append(self.advancedPowerMeasurement)
+               if nim.powerMeasurement.value:
+                       list.append(getConfigListEntry(_("Power threshold in mA"), nim.powerThreshold))
+                       self.turningSpeed = getConfigListEntry(_("Rotor turning speed"), nim.turningSpeed)
+                       list.append(self.turningSpeed)
+                       if nim.turningSpeed.value == "fast epoch":
+                               self.turnFastEpochBegin = getConfigListEntry(_("Begin time"), nim.fastTurningBegin)
+                               self.turnFastEpochEnd = getConfigListEntry(_("End time"), nim.fastTurningEnd)
+                               list.append(self.turnFastEpochBegin)
+                               list.append(self.turnFastEpochEnd)
 
        def createSetup(self):
                print "Creating setup"