- fixed stirrer
git-svn-id: http://moon:8086/svn/projects/HendiControl@137 fda53097-d464-4ada-af97-ba876c37ca34
This commit is contained in:
@@ -9,7 +9,7 @@ class AStirrer(abc.ABC):
|
|||||||
self.cycleTime = 1
|
self.cycleTime = 1
|
||||||
self.dutyCycle = 1
|
self.dutyCycle = 1
|
||||||
self.cycleCounter = 0
|
self.cycleCounter = 0
|
||||||
self.isOn = 0
|
self.isOn = 1
|
||||||
|
|
||||||
def log(self, s):
|
def log(self, s):
|
||||||
print("{:.2f}: {}".format(time.time(), s))
|
print("{:.2f}: {}".format(time.time(), s))
|
||||||
@@ -35,17 +35,14 @@ class AStirrer(abc.ABC):
|
|||||||
|
|
||||||
def setSpeed(self, speed):
|
def setSpeed(self, speed):
|
||||||
self.speed = speed
|
self.speed = speed
|
||||||
if self.isOn:
|
if self.isOn or self.dutyCycle == 1:
|
||||||
self.onSetSpeed(speed)
|
self.onSetSpeed(speed)
|
||||||
self.log ("Stirrer: Set speed to {} %".format(speed))
|
|
||||||
|
|
||||||
def setCycleTime(self, time):
|
def setCycleTime(self, time):
|
||||||
self.cycleTime = time
|
self.cycleTime = time
|
||||||
self.log ("Stirrer: Set cycle time to {} s".format(time))
|
|
||||||
|
|
||||||
def setDutyCycle(self, dutyCycle):
|
def setDutyCycle(self, dutyCycle):
|
||||||
self.dutyCycle = dutyCycle
|
self.dutyCycle = dutyCycle
|
||||||
self.log ("Stirrer: Set duty cycle to {} %".format(100*dutyCycle))
|
|
||||||
|
|
||||||
@abc.abstractmethod
|
@abc.abstractmethod
|
||||||
def getSpeed(self):
|
def getSpeed(self):
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ class Pololu1376(AStirrer):
|
|||||||
|
|
||||||
def onSetSpeed(self, speed):
|
def onSetSpeed(self, speed):
|
||||||
self.ser_send("F" + str(speed) + "%")
|
self.ser_send("F" + str(speed) + "%")
|
||||||
|
self.log("Stirrer: Set speed to {} %".format(speed))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|||||||
Reference in New Issue
Block a user