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

- use better config

Browse Source 
git-svn-id: http://moon:8086/svn/projects/HendiControl@145 fda53097-d464-4ada-af97-ba876c37ca34
This commit is contained in:
jens
2019-03-26 20:03:50 +00:00
parent 90ad3ade4c
commit 10f9c134b1
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Control/brewpi/brewpi.py
+1 -1
View File
@@ -44,7 +44,7 @@ if __name__ == '__main__':
plant_class = globals()[configJson["Controller"]['plant_name']] plant_class = globals()[configJson["Controller"]['plant_name']]
plant = plant_class(configJson["WaterSim"]) plant = plant_class(configJson["WaterSim"])
ruehrer_class = globals()[configJson["Controller"]['stirrer_name']] ruehrer_class = globals()[configJson["Controller"]['stirrer_name']]
ruehrer = ruehrer_class(configJson["Controller"]['dt']) ruehrer = ruehrer_class(configJson["Stirrer"])
ablauf = Controller(configJson["Controller"], plant, ruehrer) ablauf = Controller(configJson["Controller"], plant, ruehrer)
Control/brewpi/pololu1376.py
+5 -4
View File
@@ -5,13 +5,14 @@ import serial
class Pololu1376(AStirrer): class Pololu1376(AStirrer):
def __init__(self, dt, com_port='/dev/ttyUSB0', com_baud=9600): def __init__(self, params):
super(Pololu1376, self).__init__(dt) super(Pololu1376, self).__init__(params["dt"])
self.isMasterOn = 0 self.isMasterOn = 0
self.ser = serial.Serial(com_port, com_baud) self.ser_speed = params["speed"]
self.ser_port = params["port"]
self.ser = serial.Serial(self.ser_port, self.ser_speed)
self.ser.set_output_flow_control(False) self.ser.set_output_flow_control(False)
try: try:
self.ser.open() self.ser.open()
except: except: