Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rbc7dad193df69c64cf213db463e5115b1ba8a5f0 -rf4076df3a44bf9751a7fa5a2d8642b450d30a536 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision bc7dad193df69c64cf213db463e5115b1ba8a5f0) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision f4076df3a44bf9751a7fa5a2d8642b450d30a536) @@ -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 @@ -1350,7 +1350,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 ); } @@ -1364,7 +1364,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 ); } @@ -1378,7 +1378,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 ); } @@ -2958,7 +2958,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 ); } @@ -2971,7 +2971,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 ); } @@ -2984,7 +2984,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 ); }