Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r29b65975bb4d6a5720ef39119a9af49fafc902fa -r46b0fc61730942f316c8bc967ff4dd61828ad562
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 29b65975bb4d6a5720ef39119a9af49fafc902fa)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 46b0fc61730942f316c8bc967ff4dd61828ad562)
@@ -409,7 +409,7 @@
     bloodPumpRotorCounter.data++;
 
     // Calculate rotor speed (in RPM)
-    bloodPumpRotorSpeedRPM.data = ( 1.0 / (F32)deltaTime ) * (F32)MS_PER_SECOND * (F32)SEC_PER_MIN;
+    bloodPumpRotorSpeedRPM.data = ( 1.0F / (F32)deltaTime ) * (F32)MS_PER_SECOND * (F32)SEC_PER_MIN;
     bpRotorRevStartTime = rotTime;
 
     // If we are supposed to stop pump at home position, stop pump now.
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r14c1c8086b301d5cdba1f2d4f7ee88fbed0a4287 -r46b0fc61730942f316c8bc967ff4dd61828ad562
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 14c1c8086b301d5cdba1f2d4f7ee88fbed0a4287)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 46b0fc61730942f316c8bc967ff4dd61828ad562)
@@ -407,7 +407,7 @@
     U32 deltaTime = calcTimeBetween( dipRotorRevStartTime, rotTime );
 
     // Calculate rotor speed (in RPM)
-    dialInPumpRotorSpeedRPM.data = ( 1.0 / (F32)deltaTime ) * (F32)MS_PER_SECOND * (F32)SEC_PER_MIN;
+    dialInPumpRotorSpeedRPM.data = ( 1.0F / (F32)deltaTime ) * (F32)MS_PER_SECOND * (F32)SEC_PER_MIN;
     dipRotorRevStartTime = rotTime;
     dialysateInPumpRotorCounter.data++;
 
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rac6fc5b74e15c8925e4579c847ddfca8e1e361ad -r46b0fc61730942f316c8bc967ff4dd61828ad562
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision ac6fc5b74e15c8925e4579c847ddfca8e1e361ad)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 46b0fc61730942f316c8bc967ff4dd61828ad562)
@@ -392,7 +392,7 @@
     U32 deltaTime = calcTimeBetween( dopRotorRevStartTime, rotTime );
 
     // Calculate rotor speed (in RPM)
-    dialOutPumpRotorSpeedRPM.data = ( 1.0 / (F32)deltaTime ) * (F32)MS_PER_SECOND * (F32)SEC_PER_MIN;
+    dialOutPumpRotorSpeedRPM.data = ( 1.0F / (F32)deltaTime ) * (F32)MS_PER_SECOND * (F32)SEC_PER_MIN;
     dopRotorRevStartTime = rotTime;
 
     // If we are supposed to stop pump at home position, stop pump now.
Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r46b0fc61730942f316c8bc967ff4dd61828ad562
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 46b0fc61730942f316c8bc967ff4dd61828ad562)
@@ -46,8 +46,8 @@
 #define COMM_ERROR_TIME_WINDOW_MS   (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< Time window for comm error counts.
 
 #define HET1_EDGE_BP_ROTOR_HALL_SENSOR          0                       ///< HET1 edge detector associated with blood pump rotor hall sensor.
-#define HET1_EDGE_DPI_ROTOR_HALL_SENSOR         1                       ///< HET1 edge detector associated with dialysate inlet pump rotor hall sensor.
-#define HET1_EDGE_DPO_ROTOR_HALL_SENSOR         2                       ///< HET1 edge detector associated with dialysate outlet pump rotor hall sensor.
+#define HET1_EDGE_DPO_ROTOR_HALL_SENSOR         1                       ///< HET1 edge detector associated with dialysate outlet pump rotor hall sensor.
+#define HET1_EDGE_DPI_ROTOR_HALL_SENSOR         2                       ///< HET1 edge detector associated with dialysate inlet pump rotor hall sensor.
 
 // ********** private data **********
 
@@ -271,16 +271,14 @@
                 signalBloodPumpRotorHallSensor();
                 break;
 
-            case HET1_EDGE_DPI_ROTOR_HALL_SENSOR:
-                //signalDialInPumpRotorHallSensor();
+            case HET1_EDGE_DPO_ROTOR_HALL_SENSOR:
                 signalDialOutPumpRotorHallSensor();
                 break;
 
-            case HET1_EDGE_DPO_ROTOR_HALL_SENSOR:
-                //signalDialOutPumpRotorHallSensor();
-                signalDialInPumpRotorHallSensor();
-                break;
-
+            case HET1_EDGE_DPI_ROTOR_HALL_SENSOR:
+                signalDialInPumpRotorHallSensor();
+                break;
+
             default:
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INTERRUPTS_INVALID_EDGE_DETECTED, edge )
                 break;