Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r622eebf6fb7f1c6c232ffd82bc072dd30a7b3f94 -r9a3be9ebb32e5e0d8e1496def50e04dedf490406
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 622eebf6fb7f1c6c232ffd82bc072dd30a7b3f94)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 9a3be9ebb32e5e0d8e1496def50e04dedf490406)
@@ -21,6 +21,7 @@
 #include "mibspi.h"
 
 #include "FPGA.h"
+#include "InternalADC.h"
 #include "NVDataMgmt.h"
 #include "MessageSupport.h"
 #include "OperationModes.h"
@@ -86,8 +87,8 @@
 #define ROP_PSI_TO_PWM_DC(p)                           ( 0.2 + ( (F32)((p) - 100) * 0.01 ) )       ///< Conversion factor from target PSI to PWM duty cycle estimate.
 #define SAFETY_SHUTDOWN_TIMEOUT                        ( 3 * MS_PER_SECOND )                       ///< RO pump safety shutdown activation timeout in ms.
 
-#define ROP_ZERO_DUTY_CYCLE_FEEDBACK                   0x01FF                                      ///< RO pump zero duty cycle feedback from FPGA.
-#define ROP_DUTY_CYCLE_PERIOD_US                       500                                         ///< RO pump duty cycle period in micro seconds.
+#define ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE          0.0                                         ///< RO pump 0% duty cycle feedback voltage.
+#define ROP_FEEDBACK_100_PCT_DUTY_CYCLE_VOLTAGE        2.5                                         ///< RO pump 100% duty cycle feedback voltage.
 #define ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE          0.05                                        ///< RO pump duty cycle out of range tolerance.
 
 /// Enumeration of RO pump states.
@@ -117,6 +118,7 @@
 static BOOL isROPumpOn = FALSE;                                                                    ///< RO pump is currently running.
 static F32 roPumpPWMDutyCyclePct = 0.0;                                                            ///< Initial RO pump PWM duty cycle.
 static F32 roPumpDutyCyclePctSet = 0.0;                                                            ///< Currently set RO pump PWM duty cycle.
+static F32 roPumpFeedbackDutyCyclePct = 0.0;                                                       ///< RO pump feedback duty cycle in percent.
 static PUMP_CONTROL_MODE_T roPumpControlMode = PUMP_CONTROL_MODE_CLOSED_LOOP;                      ///< Requested RO pump control mode.
 
 static F32 pendingROPumpCmdMaxPressure = 0.0;                                                      ///< Delayed (pending) RO pump max pressure (in PSI) setting.
@@ -194,6 +196,7 @@
     roPumpState                       = RO_PUMP_OFF_STATE;
     roPumpControlMode                 = NUM_OF_PUMP_CONTROL_MODES;
     isROPumpOn                        = FALSE;
+    roPumpFeedbackDutyCyclePct        = 0.0;
 }
 
 /*********************************************************************//**
@@ -326,8 +329,8 @@
  *************************************************************************/
 void execROPumpMonitor( void )
 {
-    U16 roFlowReading      = getFPGAROPumpFlowRate();
-    U16 roFeedbackDCPeriod = getFPGAROPumpDutyCycleFeedback();
+    U16 roFlowReading     = getFPGAROPumpFlowRate();
+    U16 roFeedbackVoltage = getIntADCVoltageConverted( INT_ADC_RO_PUMP_FEEDBACK_DUTY_CYCLE );
 
     // Update sum for flow average calculation
     measuredFlowReadingsSum += (S32)roFlowReading;
@@ -385,9 +388,9 @@
         checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, isFlowOutOfLowerRange, currentFlow, targetFlow );
     }
 
-    if ( ( FALSE == isROPumpOn ) && ( roFeedbackDCPeriod != ROP_ZERO_DUTY_CYCLE_FEEDBACK ) )
+    if ( ( FALSE == isROPumpOn ) && ( roFeedbackVoltage != ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE ) )
     {
-        checkPersistentAlarm( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, TRUE, roFeedbackDCPeriod, ROP_ZERO_DUTY_CYCLE_FEEDBACK );
+        checkPersistentAlarm( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, TRUE, roFeedbackVoltage, ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE );
 
         // Check if it has timed out
         if ( TRUE == isAlarmActive( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE ) )
@@ -396,12 +399,13 @@
         }
     }
 
-    if ( TRUE == isROPumpOn )  // TODO do we need to check all this every 1 second and not every 10 ms?
+    if ( TRUE == isROPumpOn )
     {
-        F32 roDutyCycle     = roFeedbackDCPeriod / ROP_DUTY_CYCLE_PERIOD_US;
-        BOOL isDCOutOfRange = ( fabs( roDutyCycle - roPumpDutyCyclePctSet ) > ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE ? TRUE : FALSE );
+        F32 roFeedbackDutyCycle    = ROP_FEEDBACK_100_PCT_DUTY_CYCLE_VOLTAGE / roFeedbackVoltage;
+        BOOL isDCOutOfRange        = ( fabs( roFeedbackDutyCycle - roPumpDutyCyclePctSet ) > ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE ? TRUE : FALSE );
+        roPumpFeedbackDutyCyclePct = roFeedbackDutyCycle;
 
-        checkPersistentAlarm( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, TRUE, roDutyCycle, roPumpDutyCyclePctSet );
+        checkPersistentAlarm( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, TRUE, roFeedbackDutyCycle, roPumpDutyCyclePctSet );
     }
 #endif
 
@@ -841,7 +845,9 @@
         pumpData.measROFlowRate    = getMeasuredROFlowRate();
         pumpData.roPumpDutyCycle   = roPumpDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR;
         pumpData.roPumpState       = (U32)roPumpState;
+        pumpData.roPumpFBDutyCycle = roPumpFeedbackDutyCyclePct * FRACTION_TO_PERCENT_FACTOR;
 
+
         broadcastData( MSG_ID_RO_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&pumpData, sizeof( RO_PUMP_DATA_T ) );
         roPumpDataPublicationTimerCounter = 0;
     }