Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r34d5565286b43d593aea1a854f7cb2fb917de777 -r01af2d84b2cb4aa87c58f10eb8af669820e71f49
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 34d5565286b43d593aea1a854f7cb2fb917de777)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 01af2d84b2cb4aa87c58f10eb8af669820e71f49)
@@ -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'],
@@ -641,7 +642,11 @@
     MONITORED_LINE_FPGA_VCC_V       = 5                         # FPGA Vcc (3V)
     MONITORED_LINE_FPGA_AUX_V       = 6                         # FPGA Vaux (3V)
     MONITORED_LINE_FPGA_PVN_V       = 7                         # FPGA Vpvn (1V)
-    NUM_OF_MONITORED_VOLTAGE_LINES  = 8                         # Number of TD operation modes
+    FPGA_AC_DC_POWER_SUPPY_VOLTAGE  = 8                         # FPGA power supply voltage, not-monitored
+    FPGA_AC_DC_POWER_SUPPY_CURRENT  = 9                         # FPGA power supply current, not-monitored
+    FPGA_AC_HEATER_VOLTAGE          = 10                        # FPGA heater voltage, not-monitored
+    FPGA_AC_HEATER_CURRENT          = 11                        # FPGA heater current, not-monitored
+    NUM_OF_MONITORED_VOLTAGE_LINES  = 12                        # Number of TD operation modes
 
 DDMonitoredVoltages._str_list = {
     # Official Name :       Accepted strings
@@ -653,6 +658,10 @@
     'MONITORED_LINE_FPGA_VCC_V': ['fpga vcc'],
     'MONITORED_LINE_FPGA_AUX_V': ['fpga aux'],
     'MONITORED_LINE_FPGA_PVN_V': ['fpga pvn'],
+    'FPGA_AC_DC_POWER_SUPPY_VOLTAGE': ['power supply voltage'],
+    'FPGA_AC_DC_POWER_SUPPY_CURRENT': ['power supply current'],
+    'FPGA_AC_HEATER_VOLTAGE':['ac heater voltage'],
+    'FPGA_AC_HEATER_CURRENT':['ac heater current'],
     'NUM_OF_MONITORED_VOLTAGE_LINES': [],
 }
 
@@ -1029,13 +1038,17 @@
 
 @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
+    UNCOMPENSATED_COND                  = 3                     # Uncompensated Conductivity
+    NUM_OF_RESISTANCE_ATTRIBUTES        = 4                     # Number of conductivity sensor Attributes
 
 DDConductivityResistanceAttributes._str_list = {
     # Official Name :       Accepted strings
-    'RAW_RESISTANCE': ['cond resistance,'],
-    'RTD_RESISTANCE': ['rtd resistance'],
+    'CONDUCTIVITY': ['conductivity,'],
+    'CONDUCTIVITY_RESISTANCE': ['conductivity resistance'],
+    'RTD_RESISTANCE' : ['rtd resistance'],
+    'UNCOMPENSATED_COND' : ['uncompensated conductivity'],
     'NUM_OF_RESISTANCE_ATTRIBUTES': [],
 }
\ No newline at end of file