jensandClaude Sonnet 4.6
77e68afef1
server/brewpi.py no longer pre-configures the real Pot's or Smith's model's plant params at startup - there's no longer any generic baseline at all, since the only source of truth is now a loaded Sud's own doc (applied via tasks/sud.py's SudTask.apply_plant_params(), on Load and on every step). Ambient temperature and PID gains stay configured at startup, since they're independent of any Sud (global setting / hardware tuning, not doc-derived). Add Pot.is_configured() (already existed)/TempControllerBase.is_configured()/ TempController(Smith).is_configured(), and have tasks/pot.py's PotTask and tasks/tempctrl.py's TcTask skip process() while not yet configured instead of letting it raise - so plant and temp control are genuinely inert (not crashing) until a Sud is loaded. "Normal" has no plant-model dependency, so it stays active regardless. Also refreshes README.md: removes stale tracer.py/.mat references (already removed in an earlier commit), documents SudLogTask's JSON logs, the doc's L/Td fields, and this inert-until-loaded behavior. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DkkuG48uHFCGKe6dPSERFk
83 lines
2.9 KiB
Python
83 lines
2.9 KiB
Python
import asyncio
|
|
from tasks import ATask
|
|
from ws.message import MsgIo
|
|
from utils.value import ChangedFloat
|
|
from components import APid
|
|
|
|
|
|
class TcTask(ATask):
|
|
def __init__(self, tc: APid, interval, msg_handler: MsgIo):
|
|
ATask.__init__(self, interval)
|
|
|
|
self.tc = tc
|
|
self.msg_handler = msg_handler
|
|
msg_handler.set_recv_handler(self.recv)
|
|
|
|
def on_state_changed(self, value):
|
|
print ("State change to {}".format(value))
|
|
asyncio.create_task(self.send({'State': str(value)}))
|
|
|
|
def on_temp_soll_changed(self, value):
|
|
print ("Temp soll change to {}".format(value))
|
|
asyncio.create_task(self.send({'Soll': {'Temp': value}}))
|
|
|
|
def on_rate_soll_curr_changed(self, value):
|
|
print ("Rate soll change to {}".format(value))
|
|
asyncio.create_task(self.send({'Soll': {'Rate': {'Current': value}}}))
|
|
|
|
def on_rate_soll_set_changed(self, value):
|
|
print ("Rate soll change to {}".format(value))
|
|
asyncio.create_task(self.send({'Soll': {'Rate': {'Set': value}}}))
|
|
|
|
def on_temp_ist_changed(self, value):
|
|
asyncio.create_task(self.send({'Ist': {'Temp': value}}))
|
|
|
|
def on_rate_ist_changed(self, value):
|
|
asyncio.create_task(self.send({'Ist': {'Rate': value}}))
|
|
|
|
def on_enabled_changed(self, value):
|
|
print("Enabled change to {}".format(value))
|
|
asyncio.create_task(self.send({'Enabled': value}))
|
|
|
|
async def recv(self, msg):
|
|
print(msg)
|
|
for key in msg.keys():
|
|
if 'Soll' in key:
|
|
submsg = msg['Soll']
|
|
for subkey in submsg.keys():
|
|
if 'Temp' in subkey:
|
|
self.tc.set_theta_soll(submsg['Temp'])
|
|
if 'Rate' in subkey:
|
|
self.tc.set_heatrate_soll(submsg['Rate'])
|
|
if 'Enable' in key:
|
|
self.tc.set_enabled(bool(msg['Enable']))
|
|
|
|
async def send(self, data):
|
|
await self.msg_handler.send(data)
|
|
|
|
async def on_process(self):
|
|
print("{}: Started with interval {} s".format(self.msg_handler.get_key(), self.interval))
|
|
|
|
self.tc.set_on_changed('state', self.on_state_changed)
|
|
self.tc.set_on_changed('theta_ist', ChangedFloat(self.on_temp_ist_changed, prec=1).set)
|
|
self.tc.set_on_changed('heatrate_ist', ChangedFloat(self.on_rate_ist_changed, prec=1).set)
|
|
self.tc.set_on_changed('theta_soll_set', ChangedFloat(self.on_temp_soll_changed, prec=1).set)
|
|
self.tc.set_on_changed('heatrate_soll', ChangedFloat(self.on_rate_soll_curr_changed, prec=1).set)
|
|
self.tc.set_on_changed('heatrate_soll_set', ChangedFloat(self.on_rate_soll_set_changed, prec=1).set)
|
|
self.tc.set_on_changed('enabled', self.on_enabled_changed)
|
|
|
|
self.tc.set_theta_soll(20.0)
|
|
self.tc.set_heatrate_soll(1.0)
|
|
await self.send({'Enabled': self.tc.enabled})
|
|
|
|
while True:
|
|
# Stays inert until set_params() (and, for a model-based
|
|
# controller like Smith, its model's plant params/ambient too
|
|
# - see components/pid/temp_controller_smith.py's
|
|
# is_configured()) has actually been supplied - process()
|
|
# would otherwise raise.
|
|
if self.tc.is_configured():
|
|
self.tc.process()
|
|
await asyncio.sleep(self.interval)
|
|
|