Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -red3eb121e6f8b717386c77af4419df76f9fa2e19 -rc67b334aaf46d4b3568c93598df34ffcf14e4af4
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision ed3eb121e6f8b717386c77af4419df76f9fa2e19)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision c67b334aaf46d4b3568c93598df34ffcf14e4af4)
@@ -641,7 +641,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 +657,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': [],
 }
 
Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -rd333df6a3a1191f4107fbe1832e82665d923aa8b -rc67b334aaf46d4b3568c93598df34ffcf14e4af4
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision d333df6a3a1191f4107fbe1832e82665d923aa8b)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision c67b334aaf46d4b3568c93598df34ffcf14e4af4)
@@ -351,7 +351,7 @@
     MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xA005
     MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA006
     MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA007
-    MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA008
+    MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA008
     MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA009
     MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA00A
     MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xA00B
@@ -452,7 +452,7 @@
     MSG_ID_DD_BICART_LOWER_PRESSURE_OVERRIDE_REQUEST = 0xA06B
     MSG_ID_DD_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xA06C
     MSG_ID_DD_SUBSTITUTION_PUMP_START_STOP_OVERRIDE_REQUEST = 0xA06D
-    MSG_ID_DD_SUBSTITUTION_PUMP_BROADCAST_OVERRIDE_REQUEST = 0xA06E
+    MSG_ID_DD_SUBSTITUTION_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA06E
     MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_SPEED_OVERRIDE_REQUEST = 0xA06F
     MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xA070
     MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xA071
Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -red3eb121e6f8b717386c77af4419df76f9fa2e19 -rc67b334aaf46d4b3568c93598df34ffcf14e4af4
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision ed3eb121e6f8b717386c77af4419df76f9fa2e19)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision c67b334aaf46d4b3568c93598df34ffcf14e4af4)
@@ -22,7 +22,7 @@
 from leahi_dialin.common import dd_enum_repository
 from leahi_dialin.common import fp_enum_repository
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.msg_defs import MsgIds
+from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -red3eb121e6f8b717386c77af4419df76f9fa2e19 -rc67b334aaf46d4b3568c93598df34ffcf14e4af4
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision ed3eb121e6f8b717386c77af4419df76f9fa2e19)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision c67b334aaf46d4b3568c93598df34ffcf14e4af4)
@@ -213,9 +213,10 @@
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
         """
+        modified_index = sensor + BETA_IOFP_COND_SENSOR_OFFSET
         reset_byte_array = integer_to_bytearray(reset)
         read_byte_array = integer_to_bytearray(counter)
-        sensor_byte_array = integer_to_bytearray(sensor)
+        sensor_byte_array = integer_to_bytearray(modified_index)
         payload = reset_byte_array + read_byte_array + sensor_byte_array
 
         sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor).name.split('_')[0]
@@ -239,9 +240,10 @@
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
         """
+        modified_index = sensor + BETA_IOFP_COND_SENSOR_OFFSET
         reset_byte_array = integer_to_bytearray(reset)
         error_byte_array = integer_to_bytearray(counter)
-        sensor_byte_array = integer_to_bytearray(sensor)
+        sensor_byte_array = integer_to_bytearray(modified_index)
         payload = reset_byte_array + error_byte_array + sensor_byte_array
 
         sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor).name.split('_')[0]
@@ -292,9 +294,10 @@
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
         """
+        modified_index = sensor_index + BETA_IOFP_COND_SENSOR_OFFSET
         reset_byte_array = integer_to_bytearray(reset)
         cond_byte_array = float_to_bytearray(conductivity)
-        sensor_byte_array = integer_to_bytearray(sensor_index)
+        sensor_byte_array = integer_to_bytearray(modified_index)
         payload = reset_byte_array + cond_byte_array + sensor_byte_array
 
         sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor_index).name.split('_')[0]
Index: leahi_dialin/ui/fp_messaging.py
===================================================================
diff -u -r49b711a972d5843dd6d5bd7850f3db5c8f8bb1bc -rc67b334aaf46d4b3568c93598df34ffcf14e4af4
--- leahi_dialin/ui/fp_messaging.py	(.../fp_messaging.py)	(revision 49b711a972d5843dd6d5bd7850f3db5c8f8bb1bc)
+++ leahi_dialin/ui/fp_messaging.py	(.../fp_messaging.py)	(revision c67b334aaf46d4b3568c93598df34ffcf14e4af4)
@@ -306,7 +306,7 @@
         payload += conversions.float_to_bytearray(avgRORejectionRatioTankFill  )
         payload += conversions.unsigned_integer_to_bytearray(genPermeateState             )
 
-        message = CAN.DenaliMessage.build_message(
+        message = CAN.CanMessage.build_message(
                                             channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_FP_RO_REJECTION_RATIO_DATA.value,
                                             payload=payload)