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

Consolidate States/DEFAULT_THRESHOLDS into temp_controller_base.py

Browse Source 
tc_constants.py only held States and DEFAULT_THRESHOLDS, both used
exclusively by temp_controller_base.py and its subclasses; fold them
into temp_controller_base.py directly and drop the now-empty module.
Also drop heat_diffusion.py, unused since pot.py switched to the
delay-line model, and the matching dead import in pot.py.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
jens
2026-06-19 16:57:35 +02:00
co-authored by Claude Sonnet 4.6
parent ac8de9da55
commit fef0f1e2a3
6 changed files with 17 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/pid/__init__.py
-1
View File
@@ -1,5 +1,4 @@
from components.pid.pid import *
from components.pid.kalman import *
from components.pid.tc_constants import *
from components.pid.pid_factory import PidFactory
components/pid/tc_constants.py
-60
View File
@@ -1,60 +0,0 @@
from enum import Enum
class States(Enum):
INIT = -1,
IDLE = 0,
HEAT = 1,
HOLD = 2
DEFAULT_THRESHOLDS = {
"HoldIdle": 0.1,
"HoldHeat": 1.0,
"IdleHeat": 1.0,
"IdleHold": 0.1,
"HeatHold": 1.0,
"HeatIdle": 1.0
}
class Test:
tc_ctrl_params = {
"Kalman": {
"var_P": 1.0,
"var_Q": 0.0001,
"var_R": 1.0
},
"Hold": {
"kp": 0.4,
"ki": 0.0,
"kd": 0.0,
"kt": 0.0
},
"Heat": {
"kp": 0.02,
"ki": 0.01,
"kd": 0.0,
"kt": 1.5
}
}
tc_model_params = {
"theta" : 20,
"C" : 4190,
"M" : 20,
"L" : 0.01,
"Td" : 30,
"kn" : 0.2,
"gain" : 1.0
}
tc_pot_params = {
"theta" : 20,
"C" : 4190,
"M" : 20,
"L" : 0.01,
"Td" : 30,
"kn" : 0.2,
"gain" : 1.0
}
components/pid/temp_controller_base.py
+16 -1
View File
@@ -1,9 +1,24 @@
from components import APid
from components.pid.pid import Pid
from components.pid.tc_constants import States, DEFAULT_THRESHOLDS
import enum
DEFAULT_THRESHOLDS = {
"HoldIdle": 0.1,
"HoldHeat": 1.0,
"IdleHeat": 1.0,
"IdleHold": 0.1,
"HeatHold": 1.0,
"HeatIdle": 1.0
}
class States(enum.Enum):
INIT = -1,
IDLE = 0,
HEAT = 1,
HOLD = 2
class TempControllerBase(APid):
def __init__(self, dt, params):
APid.__init__(self)
self.pid_hold = Pid(dt)
components/pid/temp_controller_smith.py
+1 -2
View File
@@ -1,6 +1,5 @@
from components.plant.pot import Pot
from components.pid.temp_controller_base import TempControllerBase
from components.pid.tc_constants import States
from components.pid.temp_controller_base import TempControllerBase, States
class TempController(TempControllerBase):