From e7819059121174a97b64305edb73d89a771b1cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ben=C3=AD=C4=8Dek?= Date: Wed, 15 Jan 2025 09:26:17 +0100 Subject: [PATCH] return data --- scripts/speed_controller.py | 7 +++++++ scripts/speed_reader.py | 7 ++++--- scripts/timer.py | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/speed_controller.py b/scripts/speed_controller.py index 37cac11..c6d9212 100644 --- a/scripts/speed_controller.py +++ b/scripts/speed_controller.py @@ -72,6 +72,7 @@ def set_output(value: float): #control RPM def rpm_control(): + print("control_RPM") actual_rpm = float(get_variable(variable_actual_rpm)) requested_rpm = float(get_variable(variable_requested_rpm)) actual_set_U = read_0_10_out(stack=int(get_variable(variable_control_stack)), channel=int(get_variable(variable_control_channel))) @@ -79,10 +80,12 @@ def rpm_control(): #slow down rotating if over maximum if actual_rpm > float(get_variable(variable_max_rpm)): set_output(actual_set_U - 1) + print("max_rpm_reached") return if requested_rpm == 0: set_output(0) + print("control_set: 0") return #algorithm for RPM control @@ -91,6 +94,7 @@ def rpm_control(): set_output(actual_set_U - float(get_variable(variable_control_step_U))) elif requested_rpm > actual_rpm: set_output(actual_set_U + float(get_variable(variable_control_step_U))) + print("control_1") return if (requested_rpm - float(get_variable(variable_control_step_rpm_1))) < actual_rpm or actual_rpm < (requested_rpm + float(get_variable(variable_control_step_rpm_1))): @@ -98,6 +102,7 @@ def rpm_control(): set_output(actual_set_U - float(get_variable(variable_control_step_U_1))) elif requested_rpm > actual_rpm: set_output(actual_set_U + float(get_variable(variable_control_step_U_1))) + print("control_2") return if (requested_rpm - float(get_variable(variable_control_step_rpm_2))) < actual_rpm or actual_rpm < (requested_rpm + float(get_variable(variable_control_step_rpm_2))): @@ -105,6 +110,7 @@ def rpm_control(): set_output(actual_set_U - float(get_variable(variable_control_step_U_2))) elif requested_rpm > actual_rpm: set_output(actual_set_U + float(get_variable(variable_control_step_U_2))) + print("control_3") return if (requested_rpm - float(get_variable(variable_control_step_rpm_3))) < actual_rpm or actual_rpm < (requested_rpm + float(get_variable(variable_control_step_rpm_3))): @@ -112,6 +118,7 @@ def rpm_control(): set_output(actual_set_U - float(get_variable(variable_control_step_U_3))) elif requested_rpm > actual_rpm: set_output(actual_set_U + float(get_variable(variable_control_step_U_3))) + print("control_4") return print("empty_run") diff --git a/scripts/speed_reader.py b/scripts/speed_reader.py index 0606149..edf45ba 100644 --- a/scripts/speed_reader.py +++ b/scripts/speed_reader.py @@ -2,7 +2,7 @@ from src.variables.service import get_variable, set_variable from gpiozero import Button import datetime -from scripts.speed_controller import rpm_control +#from scripts.speed_controller import rpm_control pulses_per_rotation = 4 reader = Button(4, pull_up=False, bounce_time=0.0005) @@ -22,10 +22,11 @@ def event(): set_variable("actual_rpm_unfiltered", rpm, False) set_variable("actual_rpm", round(actual_rpm, 1), False) - rpm_control() + print(round(actual_rpm, 1)) +# rpm_control() -reader.when_pressed = event \ No newline at end of file +reader.when_pressed = event diff --git a/scripts/timer.py b/scripts/timer.py index 0675157..0e6cbca 100644 --- a/scripts/timer.py +++ b/scripts/timer.py @@ -11,8 +11,8 @@ if bool(os.getenv("BACKGROUND_SCRIPTS_RUN", 0)): #control speed -#from scripts.speed_controller import rpm_control -#scheduler.add_job(rpm_control, trigger=IntervalTrigger(seconds=0.5)) +from scripts.speed_controller import rpm_control +scheduler.add_job(rpm_control, trigger=IntervalTrigger(seconds=0.5)) #control fans from scripts.fan_controller import fan_control