Index: leahi_dialin/td/modules/blood_flow.py
===================================================================
diff -u -rafe332fec54d9d0432dfc0d54aef1debaa92b066 -r9904f1ca279d6c71e6ee12e6503ec609d52fa3e0
--- leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
+++ leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision 9904f1ca279d6c71e6ee12e6503ec609d52fa3e0)
@@ -48,15 +48,15 @@
         self.measured_blood_flow_rate = 0.0
         self.measured_blood_pump_rotor_speed = 0.0
         self.measured_blood_pump_speed = 0.0
-        self.measured_blood_pump_motor_speed = 0.0
         self.measured_blood_pump_motor_current = 0.0
+        self.set_rpm = 0.0
         self.rotor_count = 0
         self.pres_blood_flow_rate = 0
         self.rotor_hall_state = 0
 
 
-    @publish(["td_blood_flow_timestamp", "target_blood_flow_rate", "measured_blood_flow_rate", "measured_blood_pump_rotor_speed",
-              "measured_blood_pump_speed", "measured_blood_pump_mc_speed", "measured_blood_pump_mc_current",
+    @publish(["td_blood_flow_timestamp", "set_blood_flow_rate", "measured_blood_flow_rate", "measured_blood_pump_rotor_speed",
+              "measured_blood_pump_speed", "measured_blood_pump_motor_current", "set_rpm",
               "rotor_count", "pres_blood_flow_rate", "rotor_hall_state"])
     def _handler_blood_flow_sync(self, message, timestamp=0.0):
         """
@@ -75,9 +75,9 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
         speed = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
-        mcspeed = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
         mccurr = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
+        rpm = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
         rot = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_7]))
@@ -86,12 +86,12 @@
         hal = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_9]))
 
-        self.target_blood_flow_rate = tgt[0]
+        self.set_blood_flow_rate = tgt[0]
         self.measured_blood_flow_rate = flow[0]
         self.measured_blood_pump_rotor_speed = rotor[0]
         self.measured_blood_pump_speed = speed[0]
-        self.measured_blood_pump_motor_speed = mcspeed[0]
         self.measured_blood_pump_motor_current = mccurr[0]
+        self.set_rpm = rpm[0]
         self.rotor_count = rot[0]
         self.pres_blood_flow_rate = pres[0]
         self.rotor_hall_state = hal[0]