Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/devices/ph_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def __init__(self, titrator):
The constructor function for the PH Control class
"""
self.titrator = titrator
self.use_pid = bool(True)
self.use_pid = True
self._base_target_ph = 8.125
self._current_target_ph = 8.5
self._ph_function_type = PHControl.FLAT_TYPE # Default to FLAT_TYPE
Expand Down
2 changes: 1 addition & 1 deletion src/devices/thermal_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def __init__(self, titrator):
The constructor function for the ThermalControl class
"""
self.titrator = titrator
self._heat = bool(True)
self._heat = True
self._base_thermal_target = 78
self._current_thermal_target = 67
self._thermal_function_type = ThermalControl.FLAT_TYPE
Expand Down
1 change: 0 additions & 1 deletion src/ui_state/ui_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ def start(self):
"""
Optional function that is called upon entering a new state
"""
pass

def _set_next_state(self, state, update):
"""
Expand Down
2 changes: 1 addition & 1 deletion src/ui_state/view_menu/view_ph.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def loop(self):
"""
Rotate display between header/values and pH function/type variables every 3 seconds.
"""
elapsed = int(((time.monotonic() - self._start_time) / 3.0)) % 2
elapsed = int((time.monotonic() - self._start_time) / 3.0) % 2
if elapsed == 0:
self.load_header(line=1)
self.load_values(line=2)
Expand Down
2 changes: 1 addition & 1 deletion src/ui_state/view_menu/view_pid_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def loop(self):
"""
Rotate display between Kp/Ki and Kd/PID every 3 seconds.
"""
elapsed = int(((time.monotonic() - self._start_time) / 3.0)) % 2
elapsed = int((time.monotonic() - self._start_time) / 3.0) % 2
if elapsed == 0:
self.load_kp()
self.load_ki()
Expand Down