Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r34d5565286b43d593aea1a854f7cb2fb917de777 -red3eb121e6f8b717386c77af4419df76f9fa2e19 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 34d5565286b43d593aea1a854f7cb2fb917de777) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision ed3eb121e6f8b717386c77af4419df76f9fa2e19) @@ -1029,13 +1029,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