Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r79697500614904bafb56f3d33e368b954ba78f7d -r0f5edef41f89475eff5505a71625dff13c27114a --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 79697500614904bafb56f3d33e368b954ba78f7d) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 0f5edef41f89475eff5505a71625dff13c27114a) @@ -153,11 +153,11 @@ @unique class FPPressureSensorNames(DialinEnum): - M1_PRES = 0 # Water inlet pressure before regulator - M3_PRES = 1 # Water inlet pressure after regulator - P8_PRES = 2 # Water inlet pressure before the conductivity sensor - P13_PRES = 3 # Pressure before the RO filter - P17_PRES = 4 # Pressure after the RO filter + M3_PRES = 0 # Water inlet pressure before regulator + P8_PRES = 1 # Water inlet pressure after regulator + P13_PRES = 2 # Water inlet pressure before the conductivity sensor + P17_PRES = 3 # Pressure before the RO filter + P46_PRES = 4 # Pressure after the RO filter NUM_OF_FP_PRES_SENSORS = 5 # Number of Pressure Sensors @unique @@ -180,31 +180,33 @@ @unique class FPTemperaturesNames(DialinEnum): - M1_TEMP = 0 # Temperature before pressure regulator (M1) - M3_TEMP = 1 # Temperature after pressure regulator (M3) - P10_TEMP = 2 # P10 temperature from inlet conductivity sensor. - P19_TEMP = 3 # P19 temperature from outlet conductivity sensor. - 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) - P7_TEMP = 7 # Temperature at p7 flow meter - P16_TEMP = 8 # Temperature at p16 flow meter - NUM_OF_TEMPERATURE_SENSORS = 9 # Number of Temperature Sensors + M3_TEMP = 0 # Temperature after pressure regulator (M3) + P10_TEMP = 1 # P10 temperature from inlet conductivity sensor. + P19_TEMP = 2 # P19 temperature from outlet conductivity sensor. + P8_TEMP = 3 # Temperature before inlet conductivity sensor (P8) + P13_TEMP = 4 # Temperature before RO filter (P13) + P17_TEMP = 5 # Temperature after RO filter (P17) + P7_TEMP = 6 # Temperature at p7 flow meter + P16_TEMP = 7 # Temperature at p16 flow meter + P46_TEMP = 8 # Temperature after sediment filter (P46) + NUM_OF_TEMPERATURE_SENSORS = 9 # Number of Temperature Sensors @unique class FPValveStates(DialinEnum): VALVE_STATE_CLOSED = 0 # Valve Closed State VALVE_STATE_OPEN = 1 # Valve Open State +BETA_IOFP_VALVE_OFFSET = 32 # Offset to translate Dialin FPValveNames to DD firmware DD_Valves + @unique class FPValveNames(DialinEnum): M4_VALV = 0 # Valve (M4 VWi) - P11_VALV = 1 # Valve (P11 VPi) - P33_VALV = 2 # Valve (P33 VCr) - P34_VALV = 3 # Valve (P34 VCb) - P37_VALV = 4 # Valve (P37 VCd) - P39_VALV = 5 # Valve (P39 VROd) - P43_VALV = 6 # Valve (P43) + M12_VALV = 1 # Valve (M12) + P11_VALV = 2 # Valve (P11 VPi) + P33_VALV = 3 # Valve (P33 VCr) + P34_VALV = 4 # Valve (P34 VCb) + P37_VALV = 5 # Valve (P37 VCd) + P39_VALV = 6 # Valve (P39 VROd) P6_VALV = 7 # Valve (P6 VFF) NUM_OF_FP_VALVES = 8 # Number of valves