Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -rfd7a25d8f068bcba594c01410a02a03f6afbcd59 -r6edd833759b929135e2a39f00eff1f814796329d --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision fd7a25d8f068bcba594c01410a02a03f6afbcd59) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 6edd833759b929135e2a39f00eff1f814796329d) @@ -17,7 +17,7 @@ from enum import unique from logging import Logger -from .constants import NO_RESET +from .constants import NO_RESET, RESET 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 @@ -179,13 +179,6 @@ Must be logged into DG. Given sensor must be one of the sensors listed below. - pressure sensor IDs: \n - 0 = RO Pump Inlet \n - 1 = RO Pump Outlet \n - 2 = Drain Pump Inlet \n - 3 = Drain Pump Outlet \n - 4 = Barometric pressure \n - @param sensor: unsigned int - sensor ID @param pressure: unsigned int - pressure (in PSI) @param reset: integer - 1 to reset a previous override, 0 to override @@ -221,13 +214,6 @@ Must be logged into DG. Given sensor must be one of the sensors listed below. - pressure sensor IDs: \n - 0 = RO Pump Inlet \n - 1 = RO Pump Outlet \n - 2 = Drain Pump Inlet \n - 3 = Drain Pump Outlet \n - 4 = Barometric pressure \n - @param sensor: unsigned int - sensor ID @param temperature: unsigned int - pressure (in PSI) @param reset: integer - 1 to reset a previous override, 0 to override @@ -279,7 +265,7 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " microsiemens/cm" + str_res = str(sensor) + " psi" self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message @@ -316,7 +302,7 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " microsiemens/cm" + str_res = str(sensor) + " psi" self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message @@ -337,13 +323,6 @@ Must be logged into DG. Given sensor must be one of the sensors listed below. - pressure sensor IDs: \n - 0 = RO Pump Inlet \n - 1 = RO Pump Outlet \n - 2 = Drain Pump Inlet \n - 3 = Drain Pump Outlet \n - 4 = Barometric pressure \n - @param sensor: unsigned int - sensor ID @param pressure: unsigned int - pressure (in PSI) @param reset: integer - 1 to reset a previous override, 0 to override @@ -379,13 +358,6 @@ Must be logged into DG. Given sensor must be one of the sensors listed below. - pressure sensor IDs: \n - 0 = RO Pump Inlet \n - 1 = RO Pump Outlet \n - 2 = Drain Pump Inlet \n - 3 = Drain Pump Outlet \n - 4 = Barometric pressure \n - @param sensor: unsigned int - sensor ID @param temperature: unsigned int - pressure (in PSI) @param reset: integer - 1 to reset a previous override, 0 to override