Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r11fe14dad253faa257f49a1325b24a5f6846501e -ra4ec379f84f2a737f2f5c16fb925f1371c9fd55a --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 11fe14dad253faa257f49a1325b24a5f6846501e) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision a4ec379f84f2a737f2f5c16fb925f1371c9fd55a) @@ -138,6 +138,8 @@ VALVE_STATE_CLOSED = 0 # Valve Closed State VALVE_STATE_OPEN = 1 # Valve Open State +BETA_IOFP_VALVE_OFFSET = 31 # Offset to translate Dialin FPValveNames to DD firmware DD_Valves + @unique class FPValveNames(DialinEnum): M4_VALV = 0 # Valve (M4 VWi) Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -r11fe14dad253faa257f49a1325b24a5f6846501e -ra4ec379f84f2a737f2f5c16fb925f1371c9fd55a --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 11fe14dad253faa257f49a1325b24a5f6846501e) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision a4ec379f84f2a737f2f5c16fb925f1371c9fd55a) @@ -20,7 +20,7 @@ from collections import OrderedDict from .constants import NO_RESET -from leahi_dialin.common.fp_defs import FPValveStates, FPValveNames +from leahi_dialin.common.fp_defs import FPValveStates, FPValveNames, BETA_IOFP_VALVE_OFFSET from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum @@ -215,7 +215,7 @@ rst = integer_to_bytearray(reset) ste = integer_to_bytearray(int(state)) - vlv = integer_to_bytearray(valve) + vlv = integer_to_bytearray(valve + BETA_IOFP_VALVE_OFFSET) payload = rst + ste + vlv message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,