Index: dialin/dg/cpld.py =================================================================== diff -u -racfa80c678c2eb2e10ced4321e14b47b2f02f300 -r92e4385d5cc52e8034e55ed2cb641e664a0985c0 --- dialin/dg/cpld.py (.../cpld.py) (revision acfa80c678c2eb2e10ced4321e14b47b2f02f300) +++ dialin/dg/cpld.py (.../cpld.py) (revision 92e4385d5cc52e8034e55ed2cb641e664a0985c0) @@ -17,12 +17,9 @@ from enum import unique from logging import Logger -from .constants import RESET, NO_RESET from ..common.msg_defs import MsgIds, MsgFieldPositions from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish, DialinEnum -from ..utils.checks import check_broadcast_interval_override_ms -from ..utils.conversions import integer_to_bytearray, float_to_bytearray @unique class CPLD_LED_COLORS(DialinEnum): @@ -58,47 +55,43 @@ self.cpld_fault_led = 0 self.cpld_clean_led = 0 - def get_cpld_wdog(self): + def get_cpld_wdog(self) -> int: """ Gets the current CPLD watchdog value @return: cpld_wdog - 0 if timeout, 1 if OK """ - return [self.cpld_wdog] + return self.cpld_wdog - def get_cpld_audio(self): + def get_cpld_audio(self) -> int: """ Gets the current CPLD audio value @return: cpld_audio - 0=OFF, 1=ON """ - return [self.cpld_audio] + return self.cpld_audio - def get_cpld_fault_led(self): + def get_cpld_fault_led(self) -> int: """ Gets the current CPLD Fault LED value @return: cpld_fault_led - 0=OFF, 1=ON """ - return [self.cpld_fault_led] + return self.cpld_fault_led - def get_cpld_clean_led(self): + def get_cpld_clean_led(self) -> int: """ Gets the current CPLD Clean LED value + CPLD_LED_COLOR_OFF = 0 + CPLD_LED_COLOR_ORANGE_HEAT_DISINFECT = 1 + CPLD_LED_COLOR_YELLOW_CHEM_DISINFECT = 2 + CPLD_LED_COLOR_BLUE_FLUSH_DISINFECT = 3 + @return: cpld_clean_led - CPLD_LED_COLORS enum """ - return [self.cpld_clean_led] + return self.cpld_clean_led - def get_cpld(self): - """ - Gets the current CPLD values - - @return: List containing cpld values: [ cpld_wdog, cpld_audio, cpld_fault_led, cpld_clean_led ] - """ - return [self.cpld_wdog, self.cpld_audio, - self.cpld_fault_led, self.cpld_clean_led] - @publish(["cpld_wdog", "cpld_audio", "cpld_fault_led", "cpld_clean_led"]) def _handler_cpld_sync(self, message): """