Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r611187f2d0918fb5fef0c8aa4e34768a2093b97c -ra2aad87f17d5f85922b458ca2b73d20fb4f49c3a --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 611187f2d0918fb5fef0c8aa4e34768a2093b97c) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision a2aad87f17d5f85922b458ca2b73d20fb4f49c3a) @@ -294,7 +294,8 @@ class DDROPermeateStates(DialinEnum): NUM_OF_RO_PERMEATE_STATES = 0 # TODO: populate with RO Permeate states -COND_SENSOR_INDEX_OFFSET = 6 # Conductivity Sensor Index Offset for the Temperature Sensors +COND_SENSOR_INDEX_OFFSET = 6 # Conductivity Sensor Index Offset for the Temperature Readings +PRES_SENSOR_INDEX_OFFSET = 15 # Pressure Sensors Offset for Temperature Readings @unique class DDTemperaturesNames(DialinEnum): @@ -313,11 +314,12 @@ D50_AVG_TEMP = 12 # D50 Filtered value D28_AVG_TEMP = 13 # D28 Filtered value D30_AVG_TEMP = 14 # D30 Filtered value - D66_TEMP = 15 # D66 Pressure sensor temperature value - D51_TEMP = 16 # D51 Pressure sensor temperature value - D18_TEMP = 17 # D18 Pressure sensor temperature value - D41_TEMP = 18 # D41 Pressure sensor temperature value - NUM_OF_TEMP_SENSORS = 19 # Number of Temperature Sensors + D9_TEMP = 15 # D9 Pressure sensor temperature value + D66_TEMP = 16 # D66 Pressure sensor temperature value + D51_TEMP = 17 # D51 Pressure sensor temperature value + D18_TEMP = 18 # D18 Pressure sensor temperature value + D41_TEMP = 19 # D41 Pressure sensor temperature value + NUM_OF_TEMP_SENSORS = 20 # Number of Temperature Sensors @unique class DDValveStates(DialinEnum): @@ -345,10 +347,10 @@ D23_VALV = 16 # Balancing chamber Valve 1 (D23) D19_VALV = 17 # Balancing chamber Valve 2 (D19) D25_VALV = 18 # Balancing chamber Valve 3 (D25) - D21_VALV = 19 # Balancing chamber Valve 7 (D26) + D21_VALV = 19 # Balancing chamber Valve 4 (D21) D24_VALV = 20 # Balancing chamber Valve 5 (D24) D20_VALV = 21 # Balancing chamber Valve 6 (D20) - D26_VALV = 22 # Balancing chamber Valve 4 (D21) + D26_VALV = 22 # Balancing chamber Valve 7 (D26) D22_VALV = 23 # Balancing chamber Valve 8 (D22) D79_PMP_VALV = 24 # D79 pump mapped to spare valve 0 SPARE1_VALV = 25 # Spare Valve 1