Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r372d9868eab437585688e307e166881c42d2fc9b -r253a299b8b4682e8ff688b83e4a2b5085c2d8ef1 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 372d9868eab437585688e307e166881c42d2fc9b) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 253a299b8b4682e8ff688b83e4a2b5085c2d8ef1) @@ -363,10 +363,10 @@ M4_VALV = 32 # First IO valve (M4) M12_VALV = 33 # Last IO valve IO valve (M12) P11_VALV = 34 # First FP Valve (P11) - P33_VALV = 35 # Valve (P33) - P34_VALV = 36 # Valve (P34) - P37_VALV = 37 # Valve (P37) - P39_VALV = 38 # Valve (P39) + P33_VALV = 35 # FP Valve (P33) + P34_VALV = 36 # FP Valve (P34) + P37_VALV = 37 # FP Valve (P37) + P39_VALV = 38 # FP Valve (P39) P6_VALV = 39 # Last FP Valve (P6) NUM_OF_DD_VALVES = 40 # Number of Valves for the DD Index: leahi_dialin/ui/dd_messaging.py =================================================================== diff -u -r372d9868eab437585688e307e166881c42d2fc9b -r253a299b8b4682e8ff688b83e4a2b5085c2d8ef1 --- leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 372d9868eab437585688e307e166881c42d2fc9b) +++ leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 253a299b8b4682e8ff688b83e4a2b5085c2d8ef1) @@ -651,29 +651,20 @@ (SPARE6_VALV << 6 )|\ (SPARE7_VALV << 7 ) - io_valves = (M4_VALV << 0 )|\ + ioFP_valves = (M4_VALV << 0 )|\ (M12_VALV << 1 )|\ - (0 << 2 )|\ - (0 << 3 )|\ - (0 << 4 )|\ - (0 << 5 )|\ - (0 << 6 )|\ - (0 << 7 ) + (P11_VALV << 2 )|\ + (P33_VALV << 3 )|\ + (P34_VALV << 4 )|\ + (P37_VALV << 5 )|\ + (P39_VALV << 6 )|\ + (P6_VALV << 7 ) - fp_valves = (P11_VALV << 0 )|\ - (P33_VALV << 1 )|\ - (P34_VALV << 2 )|\ - (P37_VALV << 3 )|\ - (P39_VALV << 4 )|\ - (P6_VALV << 5 )|\ - (0 << 6 )|\ - (0 << 7 ) payload = conversions.unsigned_short_to_bytearray(hydraulic_valves ) payload += conversions.unsigned_byte_to_bytearray (balancing_chamber_valves ) payload += conversions.unsigned_byte_to_bytearray (spare_valves ) - payload += conversions.unsigned_byte_to_bytearray (io_valves ) - payload += conversions.unsigned_byte_to_bytearray (fp_valves ) + payload += conversions.unsigned_byte_to_bytearray (ioFP_valves ) for i in range(len(valvesensedState)): payload += conversions.unsigned_byte_to_bytearray(valvesensedState[i])