From 042408bae352ba0ef78b36cd4f8f467f60535f53 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 3 Feb 2025 11:29:45 -0500 Subject: [PATCH] fix pinctl and pi5 l298n outputs --- mycodo/outputs/on_off_pinctrl.py | 3 ++- mycodo/outputs/pump_l298n_pi5.py | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/mycodo/outputs/on_off_pinctrl.py b/mycodo/outputs/on_off_pinctrl.py index eb5dcc1fa..1d0691c5a 100644 --- a/mycodo/outputs/on_off_pinctrl.py +++ b/mycodo/outputs/on_off_pinctrl.py @@ -206,6 +206,7 @@ def switch_pin(self, pin, state): set_opt = "dl" cmd = f"pinctrl set {pin} {set_opt}" cmd_return, cmd_error, cmd_status = cmd_output(cmd, user="root") + state_text = 'ON' if state else 'OFF' self.logger.debug( - f"GPIO {self.options_channels['pin'][0]} set ON with '{cmd}': " + f"GPIO {pin} set {state_text} with '{cmd}': " f"Status: {cmd_status}, Return: {cmd_return}, Error: {cmd_error}") diff --git a/mycodo/outputs/pump_l298n_pi5.py b/mycodo/outputs/pump_l298n_pi5.py index 0c8b2ab57..6892090df 100644 --- a/mycodo/outputs/pump_l298n_pi5.py +++ b/mycodo/outputs/pump_l298n_pi5.py @@ -167,10 +167,29 @@ def initialize(self): "Check your configuration.") self.channel_setup[channel] = False else: + cmd = f"pinctrl set {self.options_channels['pin_1'][channel]} op dl" + cmd_return, cmd_error, cmd_status = cmd_output(cmd, user="root") + self.logger.debug( + f"GPIO {self.options_channels['pin_1'][channel]} setup with '{cmd}': " + f"Status: {cmd_status}, Return: {cmd_return}, Error: {cmd_error}") + + cmd = f"pinctrl set {self.options_channels['pin_2'][channel]} op dl" + cmd_return, cmd_error, cmd_status = cmd_output(cmd, user="root") + self.logger.debug( + f"GPIO {self.options_channels['pin_2'][channel]} setup with '{cmd}': " + f"Status: {cmd_status}, Return: {cmd_return}, Error: {cmd_error}") + + cmd = f"pinctrl set {self.options_channels['pin_enable'][channel]} op dl" + cmd_return, cmd_error, cmd_status = cmd_output(cmd, user="root") + self.logger.debug( + f"GPIO {self.options_channels['pin_enable'][channel]} setup with '{cmd}': " + f"Status: {cmd_status}, Return: {cmd_return}, Error: {cmd_error}") + self.channel_setup[channel] = True - self.output_setup = True self.output_states[channel] = False + self.output_setup = True + def output_switch(self, state, output_type=None, amount=None, output_channel=None): if not self.is_setup(): msg = "Error 101: Device not set up. " \ @@ -280,6 +299,7 @@ def switch_pin(self, pin, state): set_opt = "dl" cmd = f"pinctrl set {pin} {set_opt}" cmd_return, cmd_error, cmd_status = cmd_output(cmd, user="root") + state_text = 'ON' if state else 'OFF' self.logger.debug( - f"GPIO {self.options_channels['pin'][0]} set ON with '{cmd}': " + f"GPIO {pin} set {state_text} with '{cmd}': " f"Status: {cmd_status}, Return: {cmd_return}, Error: {cmd_error}")