Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -rc6b28ca8a6aae3f70458f05b5bf445069e2fe457 -r57ca71b2ff74ef3b96b29586f5aefd5abea222df --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision c6b28ca8a6aae3f70458f05b5bf445069e2fe457) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 57ca71b2ff74ef3b96b29586f5aefd5abea222df) @@ -509,21 +509,22 @@ D99_AVG_TEMP = 13 # D99 Filtered value D28_AVG_TEMP = 14 # D28 Filtered value D30_AVG_TEMP = 15 # D30 Filtered value - D9_TEMP = 16 # D9 Pressure sensor temperature value - D66_TEMP = 17 # D66 Pressure sensor temperature value - D51_TEMP = 18 # D51 Pressure sensor temperature value - D18_TEMP = 19 # D18 Pressure sensor temperature value - D41_TEMP = 20 # D41 Pressure sensor temperature value - D87_TEMP = 21 # D87 Pressure sensor temperature value - NUM_OF_TEMP_SENSORS = 22 # Number of Temperature Sensors + D78_AVG_TEMP = 16 # D78 Filtered value + D9_TEMP = 17 # D9 Pressure sensor temperature value + D66_TEMP = 18 # D66 Pressure sensor temperature value + D51_TEMP = 19 # D51 Pressure sensor temperature value + D18_TEMP = 20 # D18 Pressure sensor temperature value + D41_TEMP = 21 # D41 Pressure sensor temperature value + D87_TEMP = 22 # D87 Pressure sensor temperature value + NUM_OF_TEMP_SENSORS = 23 # Number of Temperature Sensors # Aliases FIRST_PRESSURE_SENSOR = D9_TEMP LAST_PRESSURE_SENSOR = D87_TEMP FIRST_CONDUCTIVITY_SENSOR = D16_TEMP LAST_CONDUCTIVITY_SENSOR = D75_TEMP FIRST_AVERAGE_SENSOR = D4_AVG_TEMP - LAST_AVERAGE_SENSOR = D30_AVG_TEMP + LAST_AVERAGE_SENSOR = D78_AVG_TEMP DDTemperatureSensorNames._str_list = { # Official Name : Accepted strings Index: leahi_dialin/common/fp_defs_proxy.py =================================================================== diff -u -rc6b28ca8a6aae3f70458f05b5bf445069e2fe457 -r57ca71b2ff74ef3b96b29586f5aefd5abea222df --- leahi_dialin/common/fp_defs_proxy.py (.../fp_defs_proxy.py) (revision c6b28ca8a6aae3f70458f05b5bf445069e2fe457) +++ leahi_dialin/common/fp_defs_proxy.py (.../fp_defs_proxy.py) (revision 57ca71b2ff74ef3b96b29586f5aefd5abea222df) @@ -38,7 +38,7 @@ FPInletPresCheckStates = fp_defs.FPInletPresCheckStates FPFilterFlushStates = fp_defs.FPFilterFlushStates FPPermeateFlushStates = fp_defs.FPPermeateFlushStates - FPConcentrateFlushStates = fp_defs.FPFilterFlushStates + FPConcentrateFlushStates = fp_defs.FPConcentrateFlushStates FPDefFlushStates = fp_defs.FPDefFlushStates # Events