Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -rd748813399d38ef5b71d760e327e368cc82d7a38 -rf7f7527c0ea9c5653290ce4f5785cff90accb025 --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision d748813399d38ef5b71d760e327e368cc82d7a38) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision f7f7527c0ea9c5653290ce4f5785cff90accb025) @@ -734,13 +734,13 @@ * @param pumpId concentrate pump id to get target revolution count * @return the target revolution count for the given concentrate pump *************************************************************************/ -U16 getConcPumpTargetRevolutionCount( CONCENTRATE_PUMPS_T pumpId ) +U32 getConcPumpTargetRevolutionCount( CONCENTRATE_PUMPS_T pumpId ) { - U16 result = 0; + U32 result = 0; if ( pumpId < NUM_OF_CONCENTRATE_PUMPS ) { - result = (U16)getU32OverrideValue( &pumpTargetRevCnt[ pumpId ] ); + result = (U32)getU32OverrideValue( &pumpTargetRevCnt[ pumpId ] ); } else { @@ -760,13 +760,13 @@ * @param pumpId concentrate pump id to get current measured revolution count * @return the current revolution count for the given concentrate pump *************************************************************************/ -U16 getConcPumpCurrentMeasuredRevolutionCount( CONCENTRATE_PUMPS_T pumpId ) +U32 getConcPumpCurrentMeasuredRevolutionCount( CONCENTRATE_PUMPS_T pumpId ) { - BOOL result = FALSE; + U32 result = 0; if ( pumpId < NUM_OF_CONCENTRATE_PUMPS ) { - result = (U16)getU32OverrideValue( &pumpMesauredRevCnt[ pumpId ] ); + result = (U32)getU32OverrideValue( &pumpMesauredRevCnt[ pumpId ] ); } else { Index: firmware/App/Controllers/ConcentratePumps.h =================================================================== diff -u -rd210786d6c7d75bb0b4d9e18efc40a01d85123fe -rf7f7527c0ea9c5653290ce4f5785cff90accb025 --- firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision d210786d6c7d75bb0b4d9e18efc40a01d85123fe) +++ firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision f7f7527c0ea9c5653290ce4f5785cff90accb025) @@ -101,8 +101,8 @@ BOOL getConcPumpParkRequest( CONCENTRATE_PUMPS_T pumpId ); BOOL getConcPumpIsParked( CONCENTRATE_PUMPS_T pumpId ); BOOL getConcPumpParkIsFaulted( CONCENTRATE_PUMPS_T pumpId ); -U16 getConcPumpTargetRevolutionCount( CONCENTRATE_PUMPS_T pumpId ); -U16 getConcPumpCurrentMeasuredRevolutionCount( CONCENTRATE_PUMPS_T pumpId ); +U32 getConcPumpTargetRevolutionCount( CONCENTRATE_PUMPS_T pumpId ); +U32 getConcPumpCurrentMeasuredRevolutionCount( CONCENTRATE_PUMPS_T pumpId ); BOOL handleConcentratePumpParkRequest( void ); BOOL isConcPumpParkInProgress( CONCENTRATE_PUMPS_T pumpId ); BOOL isConcentratePumpDosingCompleted( CONCENTRATE_PUMPS_T pumpId ); Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rb2e7c9194acd84783d2bbad64c5720410493e199 -rf7f7527c0ea9c5653290ce4f5785cff90accb025 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision b2e7c9194acd84783d2bbad64c5720410493e199) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision f7f7527c0ea9c5653290ce4f5785cff90accb025) @@ -229,16 +229,16 @@ U08 fpgaD48HallStatus; ///< Reg 635. Spent dialysate pump hall sensor direction status U08 fpgaD6FloaterStatus; ///< Reg 636. Floater 1 level sensor status U08 fpgaFloater2Status; ///< Reg 637. Floater 2 level sensor status - U16 fpgaD11PumpStepCountStatus; ///< Reg 638. Acid concentrate pump revolution down count status - U16 fpgaD10PumpStepCountStatus; ///< Reg 640. Bicarb concentrate pump revolution down count status + U32 fpgaD11PumpStepCountStatus; ///< Reg 638. Acid concentrate pump revolution down count status + U32 fpgaD10PumpStepCountStatus; ///< Reg 640. Bicarb concentrate pump revolution down count status U16 fpgaAdcTemp; ///< Reg 642. TBD U16 fpgaAdcVccInt; ///< Reg 644. TBD U16 fpgaAdcVccAux; ///< Reg 646. TBD U16 fpgaAdcVpVn; ///< Reg 648. TBD U16 fpgaD12PumpSpeedFeedback; ///< Reg 650. D12 Pump speed feedback U16 fpgaD48PumpSpeedFeedback; ///< Reg 652. D48 Pump Speed feedback U16 fpga_UnUsed_6; ///< Reg 654. Not used - U16 fpgaD76PumpStepCountStatus; ///< Reg 656. UF pump revolution down count status + U32 fpgaD76PumpStepCountStatus; ///< Reg 656. UF pump revolution down count status U08 fpgaD76PumpFault; ///< Reg 658: UF pump fault U08 fpga_UnUsed_3; ///< Reg 659: Not used @@ -505,14 +505,14 @@ U16 fpgaVSPPWMLow; ///< Reg 58. VSP PWM low ( Spare valves ) U16 fpgaVSPPWMPeriod; ///< Reg 60. VSP PWM period U16 fpgaVSPPWMPullIn; ///< Reg 62. VSP PWM pull in - U16 fpgaD11PumpRevCount; ///< Reg 64. Acid Concentrate pump revolution count - U16 fpgaD10PumpRevCount; ///< Reg 66. Bicarb Concentrate pump revolution count + U32 fpgaD11PumpRevCount; ///< Reg 64. Acid Concentrate pump revolution count + U32 fpgaD10PumpRevCount; ///< Reg 66. Bicarb Concentrate pump revolution count U08 fpgaADCControl; ///< Reg 68. FPGA internal ADC Control register for debugging U08 fpgaGPIOControl; ///< Reg 69. FPGA GPIO control interface U16 fpgaACRelayPWMLow; ///< Reg 70. Length of time in 10us resoultion that PWM output stays low. U16 fpgaACRelayPWMPeriod; ///< Reg 72. PWM period for AC relay/heater. U16 fpgaNotUsed_3; ///< Reg 74. Not Used - U16 fpgaD76PumpRevCount; ///< Reg 76. UF pump revolution count + U32 fpgaD76PumpRevCount; ///< Reg 76. UF pump revolution count U08 fpgaD76PumpControl; ///< Reg 78. UF Pump Control U08 notused; ///< Reg 79. Not used @@ -567,7 +567,7 @@ U32 fpgaConSensD17D74_Data_In; ///< Reg 22. D17,D74 Initialization data register U16 fpgaConSensD27D29_Addrs; ///< Reg 26. D27,D29 Initialization Address register U32 fpgaConSensD27D29_Data_In; ///< Reg 28. D27,D29 Initialization data register - U16 fpgaRemoteUpdate_Write; ///< Reg 32.Register for Remote update used by SW. + U16 fpgaRemoteUpdate_Write; ///< Reg 32. Register for Remote update used by SW. U16 fpgaD12PumpSpeed; ///< Reg 34. D48 Speed/RPM Control U08 fpgaD12PumpControl; ///< Reg 36. DGP Control U08 fpgaD48PumpControl; ///< Reg 37. SDP Control @@ -588,14 +588,14 @@ U16 fpgaVSPPWMLow; ///< Reg 58. VSP PWM low ( Spare valves ) U16 fpgaVSPPWMPeriod; ///< Reg 60. VSP PWM period U16 fpgaVSPPWMPullIn; ///< Reg 62. VSP PWM pull in - U16 fpgaD11PumpRevCount; ///< Reg 64. Acid Concentrate pump revolution count - U16 fpgaD10PumpRevCount; ///< Reg 66. Bicarb Concentrate pump revolution count + U32 fpgaD11PumpRevCount; ///< Reg 64. Acid Concentrate pump revolution count + U32 fpgaD10PumpRevCount; ///< Reg 66. Bicarb Concentrate pump revolution count U08 fpgaADCControl; ///< Reg 68. FPGA internal ADC Control register for debugging U08 fpgaGPIOControl; ///< Reg 69. FPGA GPIO control interface U16 fpgaACRelayPWMLow; ///< Reg 70. Length of time in 10us resoultion that PWM output stays low. U16 fpgaACRelayPWMPeriod; ///< Reg 72. PWM period for AC relay/heater. U16 unusedRegister2; ///< Reg 74. Unsed register2 - U16 fpgaD76PumpRevCount; ///< Reg 76. UF pump revolution count + U32 fpgaD76PumpRevCount; ///< Reg 76. UF pump revolution count U08 fpgaD76PumpControl; ///< Reg 78. UF Pump Control U08 notused; ///< Reg 79. Not used @@ -2088,7 +2088,7 @@ * @param count the number of revolution to be rotated for the pump. * @return none *************************************************************************/ -void setFPGAD11PumpRevolutionCount( U16 count ) +void setFPGAD11PumpRevolutionCount( U32 count ) { SET_FPGA_ACTUATOR_FIELD( fpgaD11PumpRevCount, count ); } @@ -2102,7 +2102,7 @@ * @param count the number of revolution to be rotated for the pump. * @return none *************************************************************************/ -void setFPGAD10PumpRevolutionCount( U16 count ) +void setFPGAD10PumpRevolutionCount( U32 count ) { SET_FPGA_ACTUATOR_FIELD( fpgaD10PumpRevCount, count ); } @@ -2116,7 +2116,7 @@ * @param count the number of revolution to be rotated for the pump. * @return none *************************************************************************/ -void setFPGAD76PumpRevolutionCount( U16 count ) +void setFPGAD76PumpRevolutionCount( U32 count ) { SET_FPGA_ACTUATOR_FIELD( fpgaD76PumpRevCount, count ); } @@ -3519,7 +3519,7 @@ * @details \b Outputs: none * @return the current revolution of the acid concentrate pump *************************************************************************/ -U16 getFPGAD11PumpRevolutionCountStatus( void ) +U32 getFPGAD11PumpRevolutionCountStatus( void ) { return GET_FPGA_SENSOR_FIELD( fpgaD11PumpStepCountStatus ); } @@ -3532,7 +3532,7 @@ * @details \b Outputs: none * @return the current revolution of the bicarb concentrate pump *************************************************************************/ -U16 getFPGAD10PumpRevolutionCountStatus( void ) +U32 getFPGAD10PumpRevolutionCountStatus( void ) { return GET_FPGA_SENSOR_FIELD( fpgaD10PumpStepCountStatus ); } @@ -3545,7 +3545,7 @@ * @details \b Outputs: none * @return the current revolution of the UF pump *************************************************************************/ -U16 getFPGAD76PumpRevolutionCountStatus( void ) +U32 getFPGAD76PumpRevolutionCountStatus( void ) { return GET_FPGA_SENSOR_FIELD( fpgaD76PumpStepCountStatus ); } Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -r046bc2b62cf942b7e846fa5bff698b94238edf24 -rf7f7527c0ea9c5653290ce4f5785cff90accb025 --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 046bc2b62cf942b7e846fa5bff698b94238edf24) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision f7f7527c0ea9c5653290ce4f5785cff90accb025) @@ -177,9 +177,9 @@ void setFPGAD11PumpParkCmd( void ); void setFPGAD10PumpParkCmd( void ); void setFPGAD76PumpParkCmd( void ); -void setFPGAD11PumpRevolutionCount( U16 count ); -void setFPGAD10PumpRevolutionCount( U16 count ); -void setFPGAD76PumpRevolutionCount( U16 count ); +void setFPGAD11PumpRevolutionCount( U32 count ); +void setFPGAD10PumpRevolutionCount( U32 count ); +void setFPGAD76PumpRevolutionCount( U32 count ); U08 getFPGAD11PumpControlStatus( void ); U08 getFPGAD10PumpControlStatus( void ); @@ -195,9 +195,9 @@ U32 getFPGAD11PumpHallSensePulseWidth( void ); U32 getFPGAD10PumpHallSensePulseWidth( void ); U32 getFPGAD76PumpHallSensePulseWidth( void ); -U16 getFPGAD11PumpRevolutionCountStatus( void ); -U16 getFPGAD10PumpRevolutionCountStatus( void ); -U16 getFPGAD76PumpRevolutionCountStatus( void ); +U32 getFPGAD11PumpRevolutionCountStatus( void ); +U32 getFPGAD10PumpRevolutionCountStatus( void ); +U32 getFPGAD76PumpRevolutionCountStatus( void ); void setFPGAD48PumpSpeed( U16 speed ); void setFPGAD12PumpSpeed( U16 speed );