Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -rc67b334aaf46d4b3568c93598df34ffcf14e4af4 -rcdc6acfe393fcc90595116cf478725e16eba7f28 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision c67b334aaf46d4b3568c93598df34ffcf14e4af4) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision cdc6acfe393fcc90595116cf478725e16eba7f28) @@ -531,7 +531,7 @@ DDTemperatureSensorNames._str_list = { # Official Name : Accepted strings - 'D16_TEMP': ['d1'], + 'D1_TEMP': ['d1'], 'D78_TEMP': ['d78'], 'D4_TEMP': ['d4'], 'D50_TEMP': ['d50'], @@ -547,6 +547,7 @@ 'D99_AVG_TEMP': ['d99 avg', 'd99 average'], 'D28_AVG_TEMP': ['d28 avg', 'd28 average'], 'D30_AVG_TEMP': ['d39 avg', 'd39 average'], + 'D1_AVG_TEMP': ['d1 avg', 'd1 average'], 'D9_TEMP': ['d9'], 'D66_TEMP': ['d66'], 'D51_TEMP': ['d51'], @@ -1040,12 +1041,14 @@ CONDUCTIVITY = 0 # Conductivity CONDUCTIVITY_RESISTANCE = 1 # raw conductivity resistance Attribute RTD_RESISTANCE = 2 # raw RTD resistance Attribute - NUM_OF_RESISTANCE_ATTRIBUTES = 3 # Number of conductivity sensor Attributes + UNCOMPENSATED_COND = 3 # Uncompensated Conductivity + NUM_OF_RESISTANCE_ATTRIBUTES = 4 # Number of conductivity sensor Attributes DDConductivityResistanceAttributes._str_list = { # Official Name : Accepted strings 'CONDUCTIVITY': ['conductivity,'], - 'RTD_RESISTANCE': ['conductivity resistance'], - 'UNCOMPENSATED_COND' : ['rtd resistance'], + 'CONDUCTIVITY_RESISTANCE': ['conductivity resistance'], + 'RTD_RESISTANCE' : ['rtd resistance'], + 'UNCOMPENSATED_COND' : ['uncompensated conductivity'], 'NUM_OF_RESISTANCE_ATTRIBUTES': [], } \ No newline at end of file