Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -rbb3864d4cd7a4e121dd63b0cae2148e66c270b93 -r77740bc2ccace473a471515cadd4bc1353360cd6 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision bb3864d4cd7a4e121dd63b0cae2148e66c270b93) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) @@ -18,28 +18,13 @@ from logging import Logger from .constants import NO_RESET, RESET +from leahi_dialin.common.fp_defs import FPTemperaturesNames from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray -@unique -class FPTemperaturesNames(DialinEnum): - P10_TEMP = 0 # P10 temperature from inlet conductivity sensor. - P19_TEMP = 1 # P19 temperature from outlet conductivity sensor. - M1_TEMP = 2 # Temperature before pressure regulator (M1) - M3_TEMP = 3 # Temperature after pressure regulator (M3) - P8_TEMP = 4 # Temperature before inlet conductivity sensor (P8) - P13_TEMP = 5 # Temperature before RO filter (P13) - P17_TEMP = 6 # Temperature after RO filter (P17) - X1_TEMP = 7 # Temperature before RO pump (X1) - X2_TEMP = 8 # Temperature RO Concentrate - X3_TEMP = 9 # Temperature RO Concentrate drop - X4_TEMP = 10 # Temperature drain drop - P7_TEMP = 11 # Temperature at p7 flow meter - P16_TEMP = 12 # Temperature at p16 flow meter - NUM_OF_TEMPERATURE_SENSORS = 13 # Number of Temperature Sensors class FPTemperatureSensors(AbstractSubSystem):