Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r57ee0134869672b53ab5b7146b8988ede8f828d6 -r6788d3f0fe41ee36ac7e9d4bd8e0f407f9fc2c4b
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 57ee0134869672b53ab5b7146b8988ede8f828d6)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 6788d3f0fe41ee36ac7e9d4bd8e0f407f9fc2c4b)
@@ -653,7 +653,11 @@
     if ( ++dialInFlowDataPublicationTimerCounter > getPublishDialInFlowDataInterval() )
     {
         S32 flowStPt = (S32)getTargetDialInFlowRate();
+#ifndef SHOW_RAW_FLOW_VALUES
         F32 measFlow = getMeasuredDialInFlowRate();
+#else
+        F32 measFlow = getFPGADialysateFlow();
+#endif
         F32 measRotSpd = getMeasuredDialInPumpRotorSpeed();
         F32 measSpd = getMeasuredDialInPumpSpeed();
         F32 measMCSpd = getMeasuredDialInPumpMCSpeed();
@@ -811,7 +815,9 @@
             dipCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
             if ( dipCurrErrorDurationCtr > DIP_MAX_CURR_ERROR_DURATION_MS )
             {
+#ifndef DISABLE_MOTOR_CURRENT_ERRORS
                 SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK, getMeasuredDialInPumpMCCurrent() );
+#endif
             }
         }
         else
@@ -828,7 +834,9 @@
             dipCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
             if ( dipCurrErrorDurationCtr > DIP_MAX_CURR_ERROR_DURATION_MS )
             {
+#ifndef DISABLE_MOTOR_CURRENT_ERRORS
                 SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK, getMeasuredDialInPumpMCCurrent() );
+#endif
             }
         }
         else