From 9c1fb348028d2ace5be8591016ec24a303f19096 Mon Sep 17 00:00:00 2001 From: CamDavidsonPilon Date: Sat, 25 Jan 2025 12:03:59 -0500 Subject: [PATCH] more 40 stuff --- pioreactor/background_jobs/monitor.py | 4 ++-- pioreactor/background_jobs/temperature_automation.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pioreactor/background_jobs/monitor.py b/pioreactor/background_jobs/monitor.py index ef45330e..c2158b1b 100644 --- a/pioreactor/background_jobs/monitor.py +++ b/pioreactor/background_jobs/monitor.py @@ -76,10 +76,10 @@ def off(): # functions don't take any arguments, nothing is passed in """ - if whoami.get_pioreactor_version() == (1, 0): + if whoami.get_pioreactor_model() == "pioreactor_20ml" and whoami.get_pioreactor_version() == (1, 0): # made from PLA MAX_TEMP_TO_SHUTDOWN = 66.0 - elif whoami.get_pioreactor_version() >= (1, 1): + else: # made from PC-CF MAX_TEMP_TO_SHUTDOWN = 85.0 # risk damaging PCB components diff --git a/pioreactor/background_jobs/temperature_automation.py b/pioreactor/background_jobs/temperature_automation.py index 2336a461..0d65059c 100644 --- a/pioreactor/background_jobs/temperature_automation.py +++ b/pioreactor/background_jobs/temperature_automation.py @@ -46,7 +46,7 @@ class TemperatureAutomationJob(AutomationJob): INFERENCE_SAMPLES_EVERY_T_SECONDS: float = 5.0 - if whoami.get_pioreactor_version() == (1, 0): + if whoami.get_pioreactor_model() == "pioreactor_20ml" and whoami.get_pioreactor_version() == (1, 0): # made from PLA MAX_TEMP_TO_REDUCE_HEATING = 63.0 MAX_TEMP_TO_DISABLE_HEATING = 65.0 # probably okay, but can't stay here for too long @@ -54,8 +54,8 @@ class TemperatureAutomationJob(AutomationJob): INFERENCE_N_SAMPLES: int = 29 INFERENCE_EVERY_N_SECONDS: float = 225.0 - elif whoami.get_pioreactor_version() >= (1, 1): - # made from PC-CF + else: + # made from PC-CF - this is true for 40ml and 20ml v1.1 MAX_TEMP_TO_REDUCE_HEATING = 78.0 MAX_TEMP_TO_DISABLE_HEATING = 80.0 MAX_TEMP_TO_SHUTDOWN = 85.0 # risk damaging PCB components