Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -radae506afce35a0063c6c2baf7e8580986f3bee7 -r3296c4c943e4a6581a4c9a4c3423664896617e29
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision adae506afce35a0063c6c2baf7e8580986f3bee7)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 3296c4c943e4a6581a4c9a4c3423664896617e29)
@@ -613,13 +613,13 @@
 
     def cmd_set_treatment_blood_flow_rate(self, flow_set_pt: int, measured_flow: float,
                                           rot_speed: float, mot_speed: float, mc_speed: float,
-                                          mc_current: float, pwm: float, signal_strength: float) -> None:
+                                          mc_current: float, pwm: float, rotor_count: int) -> None:
         """
         The Blood Flow Data message setter/sender method
 
-        | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description     | #1:(S32)                 | #2:(F32)                 | #3:(F32)               | #4:(F32)               | #5:(F32)                  | #6:(F32)                    | #7:(F32)                 | #8:(F32)                |
+        | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description     | #1:(S32)                 | #2:(F32)                 | #3:(F32)               | #4:(F32)               | #5:(F32)                  | #6:(F32)                    | #7:(F32)                 | #8:(U32)                |
         |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:    |:--:                      |:--:                      |:--:                    |:--:                    |:--:                       |:--:                         |:--:                      |:--:                     |
-        |0x0500| 0x040  | 7   | 1 Hz   | N   | HD  | All | Blood Flow Data | \ref Data::mFlowSetPoint | \ref Data::mMeasuredFlow | \ref Data::mRotorSpeed | \ref Data::mMotorSpeed | \ref Data::mMotorCtlSpeed | \ref Data::mMotorCtlCurrent | \ref Data::mPWMDutyCycle | \ref Data::mSigStrenght |
+        |0x0500| 0x040  | 7   | 1 Hz   | N   | HD  | All | Blood Flow Data | \ref Data::mFlowSetPoint | \ref Data::mMeasuredFlow | \ref Data::mRotorSpeed | \ref Data::mMotorSpeed | \ref Data::mMotorCtlSpeed | \ref Data::mMotorCtlCurrent | \ref Data::mPWMDutyCycle | \ref Data::mRotorCount |
 
         @param flow_set_pt: (int) Flow Set Point
         @param measured_flow: (float) Measured Flow
@@ -628,7 +628,7 @@
         @param mc_speed: (float) MC Speed
         @param mc_current: (float) MC Current
         @param pwm: (float) PWM
-        @param signal_strength: (float) Signal strength in percent
+        @param rotor_count: (int) Rotor Count
         @return: None
         """
 
@@ -639,7 +639,7 @@
         payload += float_to_bytearray(mc_speed)
         payload += float_to_bytearray(mc_current)
         payload += float_to_bytearray(pwm)
-        payload += float_to_bytearray(signal_strength)
+        payload += integer_to_bytearray(rotor_count)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id,
                                               message_id=MsgIds.MSG_ID_BLOOD_FLOW_DATA.value,
@@ -649,13 +649,13 @@
 
     def cmd_set_treatment_dialysate_flow_rate(self, flow_set_pt: int, measured_flow: float,
                                               rot_speed: float, mot_speed: float, mc_speed: float,
-                                              mc_current: float, pwm: float, signal_strength: float) -> None:
+                                              mc_current: float, pwm: float) -> None:
         """
         The Dialysate Flow Data message setter/sender method
 
-        | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description         | #1:(S32)      | #2:(F32)      | #3:(F32)    | #4:(F32)    | #5:(F32)       | #6:(F32)         | #7:(F32)      | #8:(F32)                |
-        |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:        |:--:           |:--:           |:--:         |:--:         |:--:            |:--:              |:--:           |:--:                     |
-        |0x0800| 0x040  | 7   | 1 Hz   | N   | HD  | All | Dialysate Flow Data | mFlowSetPoint | mMeasuredFlow | mRotorSpeed | mMotorSpeed | mMotorCtlSpeed | mMotorCtlCurrent | mPWMDutyCycle | \ref Data::mSigStrenght |
+        | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description         | #1:(S32)      | #2:(F32)      | #3:(F32)    | #4:(F32)    | #5:(F32)       | #6:(F32)         | #7:(F32)      |
+        |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:        |:--:           |:--:           |:--:         |:--:         |:--:            |:--:              |:--:           |
+        |0x0800| 0x040  | 7   | 1 Hz   | N   | HD  | All | Dialysate Flow Data | mFlowSetPoint | mMeasuredFlow | mRotorSpeed | mMotorSpeed | mMotorCtlSpeed | mMotorCtlCurrent | mPWMDutyCycle |
 
         @param flow_set_pt: (signed int) Flow Set Point
         @param measured_flow: (float) Measured Flow
@@ -664,7 +664,6 @@
         @param mc_speed: (float) MC Speed
         @param mc_current: (float) MC Current
         @param pwm: (float) PWM
-        @param signal_strength: (float) Signal strength in percent
         @return: None
         """
 
@@ -675,7 +674,6 @@
         payload += float_to_bytearray(mc_speed)
         payload += float_to_bytearray(mc_current)
         payload += float_to_bytearray(pwm)
-        payload += float_to_bytearray(signal_strength)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id,
                                               message_id=MsgIds.MSG_ID_DIALYSATE_FLOW_DATA.value,
@@ -1821,7 +1819,8 @@
 
         self.can_interface.send(message, 0)
 
-    def cmd_send_hd_disinfection_state(self, sub_mode: int, flush_mode: int, heat_mode: int, chemical_mode: int) -> None:
+    def cmd_send_hd_disinfection_state(self, sub_mode: int, flush_mode: int, heat_mode: int,
+                                       chemical_mode: int) -> None:
         """
         Broadcasts the current DG disinfection mode
         @param sub_mode: (int) disinfect states