Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r86533b7ed5c2fb03a287ed72e366fb7b6d2aa14e -rc67b334aaf46d4b3568c93598df34ffcf14e4af4 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 86533b7ed5c2fb03a287ed72e366fb7b6d2aa14e) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision c67b334aaf46d4b3568c93598df34ffcf14e4af4) @@ -1037,13 +1037,15 @@ @unique class DDConductivityResistanceAttributes(DialinEnum): - RAW_RESISTANCE = 0 # Raw Conductivity resistance Attribute - RTD_RESISTANCE = 1 # raw RTD resistance Attribute - NUM_OF_RESISTANCE_ATTRIBUTES = 2 # Number of conductivity sensor Attributes + 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 DDConductivityResistanceAttributes._str_list = { # Official Name : Accepted strings - 'RAW_RESISTANCE': ['cond resistance,'], - 'RTD_RESISTANCE': ['rtd resistance'], + 'CONDUCTIVITY': ['conductivity,'], + 'RTD_RESISTANCE': ['conductivity resistance'], + 'UNCOMPENSATED_COND' : ['rtd resistance'], 'NUM_OF_RESISTANCE_ATTRIBUTES': [], } \ No newline at end of file