Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -rd3147dff7c95e3ab5a507591ce5b9e1e74911a19 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision d3147dff7c95e3ab5a507591ce5b9e1e74911a19) @@ -318,7 +318,8 @@ '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 - 'NUM_OF_FP_PRES_SENSORS' : 4, # Number of Pressure Sensors + 'P46_PRES' : 4, # Pressure after the RO filter + 'NUM_OF_FP_PRES_SENSORS' : 5, # Number of Pressure Sensors } return unique(DialinEnum('FPPressureSensorNames', members)) @@ -353,21 +354,22 @@ 'P8_TEMP' : 1, # Temperature before inlet conductivity sensor (P8) 'P13_TEMP' : 2, # Temperature before RO filter (P13) 'P17_TEMP' : 3, # Temperature after RO filter (P17) - 'P10_TEMP' : 4, # P10 temperature from inlet conductivity sensor. - 'P19_TEMP' : 5, # P19 temperature from outlet conductivity sensor. - 'P7_TEMP' : 6, # Temperature at p7 flow meter - 'P16_TEMP' : 7, # Temperature at p16 flow meter - 'P7_INTERNAL_TEMP' : 8, # Interal Temperature at p7 flow meter - 'P16_INTERNAL_TEMP' : 9, # Interal Temperature at p16 flow meter - 'NUM_OF_TEMPERATURE_SENSORS' : 10, # Number of Temperature Sensors + 'P46_TEMP' : 4, # Temperature after sediment filter (P46) + 'P10_TEMP' : 5, # P10 temperature from inlet conductivity sensor. + 'P19_TEMP' : 6, # P19 temperature from outlet conductivity sensor. + 'P7_TEMP' : 7, # Temperature at p7 flow meter + 'P16_TEMP' : 8, # Temperature at p16 flow meter + 'P7_INTERNAL_TEMP' : 9, # Interal Temperature at p7 flow meter + 'P16_INTERNAL_TEMP' : 10, # Interal Temperature at p16 flow meter + 'NUM_OF_TEMPERATURE_SENSORS' : 11, # Number of Temperature Sensors } # Create the enum created_enum = DialinEnum('FPTemperatureSensorNames', members) # Add aliases extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.M3_TEMP.value) - extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.P17_TEMP.value) + extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.P46_TEMP.value) extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.P10_TEMP.value) extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.P19_TEMP.value) extend_enum(created_enum, 'FIRST_FLOW_SENSOR', created_enum.P7_TEMP.value)