Index: dialin/common/AlarmIds.txt
===================================================================
diff -u -r8a4783c11ec826a2b84480ffb6b033edcac12954 -r5d36fab08811664f85c4de033dc34c51cc9bb9a4
--- dialin/common/AlarmIds.txt	(.../AlarmIds.txt)	(revision 8a4783c11ec826a2b84480ffb6b033edcac12954)
+++ dialin/common/AlarmIds.txt	(.../AlarmIds.txt)	(revision 5d36fab08811664f85c4de033dc34c51cc9bb9a4)
@@ -94,7 +94,7 @@
 ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE = 94
 ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 95
 ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE = 96
-ALARM_ID_DG_THERMISOTRS_TEMPERATURE_OUT_OF_RANGE = 97
+ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE = 97
 ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE = 98
 ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME = 99
 ALARM_ID_CP1_SPEED_CONTROL_ERROR = 100
@@ -112,3 +112,29 @@
 ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE = 112
 ALARM_ID_DRAIN_PUMP_OFF_FAULT = 113
 ALARM_ID_RO_PUMP_OFF_FAULT = 114
+ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT = 115
+ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT = 116
+ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY = 117
+ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY = 118
+ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY = 119
+ALARM_ID_PRIME_OUT_OF_TIME = 120
+ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 121
+ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM = 122
+ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM = 123
+ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK = 124
+ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM = 125
+ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM = 126
+ALARM_ID_CARTRIDGE_DOOR_OPENED = 127
+ALARM_ID_PRE_TREATMENT_NO_CART_SELF_TEST_FAILURE = 128
+ALARM_ID_INSTALL_NEW_CARTRIDGE = 129
+ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY = 130
+ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE = 131
+ALARM_ID_NO_CARTRIDGE_LOADED = 132
+ALARM_ID_END_TREATMENT_TIMEOUT_ALARM = 133
+ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE = 134
+ALARM_ID_DIALYSATE_TEMPERATURE_TOO_HIGH = 135
+ALARM_ID_DIALYSATE_TEMPERATRUE_TOO_LOW = 136
+ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE = 137
+ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE = 138
+ALARM_ID_DG_FLOW_METER_CHECK_FAILURE = 139
+ALARM_ID_DG_RO_PUMP_TOO_MANY_RAMP_UP_RETRY = 140
Index: dialin/dg/conductivity_sensors.py
===================================================================
diff -u -rde0e1f2ae881066bb34b6ebc4c9a219389bd988f -r5d36fab08811664f85c4de033dc34c51cc9bb9a4
--- dialin/dg/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision de0e1f2ae881066bb34b6ebc4c9a219389bd988f)
+++ dialin/dg/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 5d36fab08811664f85c4de033dc34c51cc9bb9a4)
@@ -17,10 +17,15 @@
 from .constants import RESET,NO_RESET
 from ..utils.conversions import integer_to_bytearray, float_to_bytearray
 from ..protocols.CAN import (DenaliMessage, DenaliChannels)
-from ..utils.base import _AbstractSubSystem, _publish
+from ..utils.base import _AbstractSubSystem, _publish, DialinEnum
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from logging import Logger
 
+class ConductivitySensorsEnum(DialinEnum):
+    CPI = 0
+    CPO = 1
+    CD1 = 2
+    CD2 = 3
 
 class ConductivitySensors(_AbstractSubSystem):
     """