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

- warp factor is parameter

Browse Source 
git-svn-id: http://moon:8086/svn/projects/HendiControl@140 fda53097-d464-4ada-af97-ba876c37ca34
This commit is contained in:
jens
2019-03-26 19:12:20 +00:00
parent 724fd61f04
commit 76e93e8fdb
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Control/brewpi/Rezept-001.json
+1 -1
View File
@@ -4,7 +4,7 @@
"Wasser_kg" : 18, "Wasser_kg" : 18,
"stirrSpeedHeat" : 50, "stirrSpeedHeat" : 50,
"stirrSpeedRast" : 30, "stirrSpeedRast" : 30,
"stirrDutyRast" : 0.2, "stirrDutyRast" : 0.5,
"stirrCycleTime" : 120, "stirrCycleTime" : 120,
"Rasten" : "Rasten" :
[ [
Control/brewpi/brewpi.cfg.json
+1
View File
@@ -8,6 +8,7 @@
"P_max" : 3000, "P_max" : 3000,
"P_q_W" : 100, "P_q_W" : 100,
"theta_lock_K" : 0.5, "theta_lock_K" : 0.5,
"sim_warp_factor" : 1.0,
"Hold" : { "Hold" : {
"Acqu": { "Acqu": {
"Pid" : { "Pid" : {
Control/brewpi/brewpi.py
+1 -3
View File
@@ -6,7 +6,6 @@ from controller import Controller
from mass import Mass from mass import Mass
from stirrer import Stirrer from stirrer import Stirrer
from matplotlib.pyplot import figure, clf, plot, xlabel, ylabel, xlim, ylim, title, grid, axes, show, subplot from matplotlib.pyplot import figure, clf, plot, xlabel, ylabel, xlim, ylim, title, grid, axes, show, subplot
from pololu1376 import Pololu1376
def results_plot(self): def results_plot(self):
@@ -41,8 +40,7 @@ if __name__ == '__main__':
configJson = json.load(fp) configJson = json.load(fp)
plant = Mass(configJson["WaterSim"]) plant = Mass(configJson["WaterSim"])
# ruehrer = Stirrer(configJson["Controller"]['dt']) ruehrer = Stirrer(configJson["Controller"]['dt'])
ruehrer = Pololu1376(configJson["Controller"]['dt'], "/dev/ttyACM0", "115200")
ablauf = Controller(configJson["Controller"], plant, ruehrer) ablauf = Controller(configJson["Controller"], plant, ruehrer)
Control/brewpi/controller.py
+1 -1
View File
@@ -30,7 +30,7 @@ class Controller():
self.power_v = np.empty(0) self.power_v = np.empty(0)
self.error_v = np.empty(0) self.error_v = np.empty(0)
self.time = 0 self.time = 0
self.sim_warp_factor = 100 self.sim_warp_factor = params['sim_warp_factor']
self.report_interval = 1.0 self.report_interval = 1.0
self.report_last_time = 0 self.report_last_time = 0
self.thread = None self.thread = None