jens/HendiControlFirmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- refactored

Browse Source 
git-svn-id: http://moon:8086/svn/projects/HendiControl@133 fda53097-d464-4ada-af97-ba876c37ca34
This commit is contained in:
jens
2019-03-25 19:46:59 +00:00
parent 231675ff9c
commit 4cdb44677d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Control/brewpi/controller.py
+3 -3
View File
@@ -178,18 +178,18 @@ class Controller():
self.time_v = np.append(self.time_v, self.time/60) self.time_v = np.append(self.time_v, self.time/60)
self.power_v = np.append(self.power_v, power) self.power_v = np.append(self.power_v, power)
self.error_v = np.append(self.error_v, pid_err) self.error_v = np.append(self.error_v, pid_err)
#self.error_v = np.append(self.error_v, self.stirrer.getRpm()) #self.error_v = np.append(self.error_v, self.stirrer.getSpeed())
# ----------------------------------------- # -----------------------------------------
if ovenStateNext != self.ovenState: if ovenStateNext != self.ovenState:
self.log("{} -> {}".format(self.ovenState, ovenStateNext)) self.log("{} -> {}".format(self.ovenState, ovenStateNext))
if ovenStateNext == ovenStates.HEAT: if ovenStateNext == ovenStates.HEAT:
self.stirrer.setRpm(self.stirrSpeedHeat) self.stirrer.setSpeed(self.stirrSpeedHeat)
self.stirrer.setDutyCycle(1.0) self.stirrer.setDutyCycle(1.0)
if ovenStateNext == ovenStates.HOLD: if ovenStateNext == ovenStates.HOLD:
self.stirrer.setRpm(self.stirrSpeedRast) self.stirrer.setSpeed(self.stirrSpeedRast)
self.stirrer.setDutyCycle(self.stirrDutyRast) self.stirrer.setDutyCycle(self.stirrDutyRast)
if controllerStateNext != self.controllerState: if controllerStateNext != self.controllerState:
Control/brewpi/stirrer.py
+6 -6
View File
@@ -3,7 +3,7 @@ from astirrer import AStirrer
class Stirrer(AStirrer): class Stirrer(AStirrer):
def __init__(self, params): def __init__(self, params):
self.params = params self.params = params
self.rpm = 0 self.speed = 0
self.cycleTime = 1 self.cycleTime = 1
self.dutyCycle = 1 self.dutyCycle = 1
self.cycleCounter = 0 self.cycleCounter = 0
@@ -26,9 +26,9 @@ class Stirrer(AStirrer):
self.log ("Stirrer: Off") self.log ("Stirrer: Off")
self.isOn = 0 self.isOn = 0
def setRpm(self, rpm): def setSpeed(self, speed):
self.log ("Stirrer: Set RPM to {} rpm".format(rpm)) self.log ("Stirrer: Set speed to {} %".format(speed))
self.rpm = rpm self.speed = speed
def setCycleTime(self, time): def setCycleTime(self, time):
self.log ("Stirrer: Set cycle time to {} s".format(time)) self.log ("Stirrer: Set cycle time to {} s".format(time))
@@ -38,9 +38,9 @@ class Stirrer(AStirrer):
self.log ("Stirrer: Set duty cycle to {} %".format(100*dutyCycle)) self.log ("Stirrer: Set duty cycle to {} %".format(100*dutyCycle))
self.dutyCycle = dutyCycle self.dutyCycle = dutyCycle
def getRpm(self): def getSpeed(self):
if self.isOn and self.isMasterOn: if self.isOn and self.isMasterOn:
return self.rpm return self.speed
return 0 return 0
def start(self): def start(self):