Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rf49295a21525d5d1b88ec52eb4fcac72e7a526b7 -ra3a396aa37fb562327f05e54990f06538c7617ed --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision f49295a21525d5d1b88ec52eb4fcac72e7a526b7) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision a3a396aa37fb562327f05e54990f06538c7617ed) @@ -89,8 +89,8 @@ #define FPGA_READ_V3_START_BYTE_NUM 256 ///< FPGA V3 read sensors start byte number. #define FPGA_READ_V3_END_BYTE_NUM 430 ///< FPGA V3 read sensors end byte number. -#define FPGA_DGP_PUMP_ERROR_BIT 0x01 ///< Fresh dialysate pump error bit mask. -#define FPGA_SDP_PUMP_ERROR_BIT 0x02 ///< Spent dialysate pump error bit mask. +#define FPGA_D12_PUMP_ERROR_BIT 0x01 ///< Fresh dialysate pump error bit mask. +#define FPGA_D48_PUMP_ERROR_BIT 0x02 ///< Spent dialysate pump error bit mask. #define FPGA_FLOATER_LEVEL_BIT 0x03 ///< Floater level bit mask. @@ -224,18 +224,18 @@ U32 fpgaBaroPressure; ///< Reg 406. Barometric sensor pressure value U32 fpgaBaroTemperature; ///< Reg 410. Barometric sensor temperature sensor - U16 fpgaDGPMeasuredSpeed; ///< Reg 414. Fresh dialysate pump measured speed - U16 fpgaSDPMeasuredSpeed; ///< Reg 416. Spent dialysate pump measured speed + U16 fpgaD12MeasuredSpeed; ///< Reg 414. Fresh dialysate pump measured speed + U16 fpgaD48MeasuredSpeed; ///< Reg 416. Spent dialysate pump measured speed U08 fpgaBaroErrorCount; ///< Reg 418. Barometric sensor Error count - U08 fpgaDGPSDPPumpStatus; ///< Reg 419. Dialysate pumps Error status - U16 fpgaDGPCurrentFeedback; ///< Reg 420. Fresh dialysate pump current feedback - U16 fpgaSDPCurrentFeedback; ///< Reg 422. Spent dialysate pump current feedback - U08 fpgaDGPHallStatus; ///< Reg 424. Fresh dialysate pump hall sensor direction status - U08 fpgaSDPHallStatus; ///< Reg 425. Spent dialysate pump hall sensor direction status + U08 fpgaD12D48PumpStatus; ///< Reg 419. Dialysate pumps Error status + U16 fpgaD12CurrentFeedback; ///< Reg 420. Fresh dialysate pump current feedback + U16 fpgaD48CurrentFeedback; ///< Reg 422. Spent dialysate pump current feedback + U08 fpgaD12HallStatus; ///< Reg 424. Fresh dialysate pump hall sensor direction status + U08 fpgaD48HallStatus; ///< Reg 425. Spent dialysate pump hall sensor direction status U08 fpgaFloater1Status; ///< Reg 426. Floater 1 level sensor status U08 fpgaFloater2Status; ///< Reg 427. Floater 2 level sensor status - U16 fpgaD11_PumpStepCountStatus; ///< Reg 428. Acid concentrate pump revolution down count status - U16 fpgaD10_PumpStepCountStatus; ///< Reg 430. Bicarb concentrate pump revolution down count status + U16 fpgaD11PumpStepCountStatus; ///< Reg 428. Acid concentrate pump revolution down count status + U16 fpgaD10PumpStepCountStatus; ///< Reg 430. Bicarb concentrate pump revolution down count status } DD_FPGA_SENSORS_T; typedef struct @@ -302,20 +302,20 @@ U16 fpgaRemoteUpdate_Write; ///< Reg 110.Register for Remote update used by SW. - U16 fpgaDGPSpeed; ///< Reg 112. DGP Speed/RPM Control - U08 fpgaDGPControl; ///< Reg 114. DGP Control - U08 fpgaSDPControl; ///< Reg 115. SDP Control - U16 fpgaSDPSpeed; ///< Reg 116. SDP Speed/RPM Control - U16 fpgaD11_PumpSpeed; ///< Reg 118. Acid Concentrate Pump Speed/RPM Control - U08 fpgaD11_PumpControl; ///< Reg 120. Acid Concentrate Pump Control - U08 fpgaD10_PumpControl; ///< Reg 121. BiCarb Concentrate Pump Control - U16 fpgaD10_PumpSpeed; ///< Reg 122. BiCarb Concentrate Pump Speed/RPM Control + U16 fpgaD12PumpSpeed; ///< Reg 112. D48 Speed/RPM Control + U08 fpgaD12PumpControl; ///< Reg 114. DGP Control + U08 fpgaD48PumpControl; ///< Reg 115. SDP Control + U16 fpgaD48PumpSpeed; ///< Reg 116. SDP Speed/RPM Control + U16 fpgaD11PumpSpeed; ///< Reg 118. Acid Concentrate Pump Speed/RPM Control + U08 fpgaD11PumpControl; ///< Reg 120. Acid Concentrate Pump Control + U08 fpgaD10PumpControl; ///< Reg 121. BiCarb Concentrate Pump Control + U16 fpgaD10PumpSpeed; ///< Reg 122. BiCarb Concentrate Pump Speed/RPM Control U08 fpgaBloodLeakSensorTest; ///< Reg 124. Blood leak sensor test U08 fpgaBloodLeakUARTControl; ///< Reg 125. Blood leak sensor UART control U08 fpgaBloodLeakFIFOTx; ///< Reg 126. Blood leak sensor FIFO transmit control - U08 fpgaPrimaryHeaterPWMControl; ///< Reg 127. Primary heater PWM control - U08 fpgaTrimmerHeaterPWMControl; ///< Reg 128. Trimmer heater PWM control + U08 fpgaD5HeaterPWMControl; ///< Reg 127. Primary heater PWM control + U08 fpgaD45HeaterPWMControl; ///< Reg 128. Trimmer heater PWM control U08 fpgaNotUsed; ///< Reg 129. Not used U16 fpgaVBCPWMLow; ///< Reg 130. VBC PWM low ( Balancing chamber valves) @@ -324,8 +324,8 @@ U16 fpgaVUFPWMLow; ///< Reg 136. VUF PWM low ( Ultra filteration valves ) U16 fpgaVUFPWMPeriod; ///< Reg 138. VUF PWM period U16 fpgaVUFPWMPullin; ///< Reg 140. VUF PWM pull in - U16 fpgaD11_PumpRevCount; ///< Reg 142. Acid Concentrate pump revolution count - U16 fpgaD10_PumpRevCount; ///< Reg 144. Bicarb Concentrate pump revolution count + U16 fpgaD11PumpRevCount; ///< Reg 142. Acid Concentrate pump revolution count + U16 fpgaD10PumpRevCount; ///< Reg 144. Bicarb Concentrate pump revolution count U08 fpgaADCControl; ///< Reg 146. FPGA internal ADC Control register for debugging U08 fpgaGPIOControl; ///< Reg 147. FPGA GPIO control interface } FPGA_ACTUATORS_T; @@ -524,35 +524,35 @@ /*********************************************************************//** * @brief - * The setFPGASpentDialysatePumpSpeed function sets the speed for the + * The setFPGAD48PumpSpeed function sets the speed for the * spent dialysate pump (SDP). * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaSDPSpeed + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD48PumpSpeed * @param speed The spent dialysate pump speed * @return none *************************************************************************/ -void setFPGASpentDialysatePumpSpeed( U16 speed ) +void setFPGAD48PumpSpeed( U16 speed ) { - fpgaActuatorSetPoints.fpgaSDPSpeed = speed; + fpgaActuatorSetPoints.fpgaD48PumpSpeed = speed; } /*********************************************************************//** * @brief - * The setFPGAFreshDialysatePumpSpeed function sets the speed for the + * The setFPGAD12PumpSpeed function sets the speed for the * fresh dialysate pump (DGP). * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaDGPSpeed + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD12PumpSpeed * @param speed The fresh dialysate pump speed * @return none *************************************************************************/ -void setFPGAFreshDialysatePumpSpeed( U16 speed ) +void setFPGAD12PumpSpeed( U16 speed ) { - fpgaActuatorSetPoints.fpgaDGPSpeed = speed; + fpgaActuatorSetPoints.fpgaD12PumpSpeed = speed; } /*********************************************************************//** * @brief - * The setFPGASpentDialysatePumpControl function sets the controls for + * The setFPGAD48PumpControl function sets the controls for * dialysate out pump (SDP). * bit 7: TBD * bit 6: TBD @@ -562,18 +562,18 @@ * bit 1-2: TBD * bit 0: Run (1), stop (0) * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaSDPControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD48PumpControl * @param control The dialysate out pump controls * @return none *************************************************************************/ -void setFPGASpentDialysatePumpControl( U08 control ) +void setFPGAD48PumpControl( U08 control ) { - fpgaActuatorSetPoints.fpgaSDPControl = control; + fpgaActuatorSetPoints.fpgaD48PumpControl = control; } /*********************************************************************//** * @brief - * The setFPGAFreshDialysatePumpControl function sets the controls for + * The setFPGAD12PumpControl function sets the controls for * dialysate In pump (DGP). * bit 7: TBD * bit 6: TBD @@ -583,41 +583,41 @@ * bit 1-2: TBD * bit 0: Run (1), stop (0) * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaDGPControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD12PumpControl * @param control The dialysate In pump controls * @return none *************************************************************************/ -void setFPGAFreshDialysatePumpControl( U08 control ) +void setFPGAD12PumpControl( U08 control ) { - fpgaActuatorSetPoints.fpgaDGPControl = control; + fpgaActuatorSetPoints.fpgaD12PumpControl = control; } /*********************************************************************//** * @brief * The setFPGAD11PumpSetStepSpeed function sets the step speed period for * concentrate pump D11_Pump. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11_PumpSpeed + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11PumpSpeed * @param stepSpeed The concentrate pump step speed period * @return none *************************************************************************/ void setFPGAD11PumpSetStepSpeed( U16 stepSpeed ) { - fpgaActuatorSetPoints.fpgaD11_PumpSpeed = stepSpeed; + fpgaActuatorSetPoints.fpgaD11PumpSpeed = stepSpeed; } /*********************************************************************//** * @brief * The setFPGAD10PumpSetStepSpeed function sets the step speed period for * concentrate pump D10_Pump. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10_PumpSpeed + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10PumpSpeed * @param stepSpeed The concentrate pump step speed period * @return none *************************************************************************/ void setFPGAD10PumpSetStepSpeed( U16 stepSpeed ) { - fpgaActuatorSetPoints.fpgaD10_PumpSpeed = stepSpeed; + fpgaActuatorSetPoints.fpgaD10PumpSpeed = stepSpeed; } /*********************************************************************//** @@ -631,14 +631,14 @@ * bit 3: Direction (1=Fwd, 0=Rev) * bit 0-2: Microstepping resolution * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11_PumpControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11PumpControl * @param control Concentrate pump control set * @return none *************************************************************************/ void setFPGAD11PumpControl( U08 control ) { - fpgaActuatorSetPoints.fpgaD11_PumpControl &= FPGA_CONC_PUMP_PARK_COMMAND; // preserve msb (park command bit) - fpgaActuatorSetPoints.fpgaD11_PumpControl |= control; + fpgaActuatorSetPoints.fpgaD11PumpControl &= FPGA_CONC_PUMP_PARK_COMMAND; // preserve msb (park command bit) + fpgaActuatorSetPoints.fpgaD11PumpControl |= control; } /*********************************************************************//** @@ -652,14 +652,14 @@ * bit 3: Direction (1=Fwd, 0=Rev) * bit 0-2: Microstepping resolution * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10_PumpControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10PumpControl * @param control Concentrate pump control set * @return none *************************************************************************/ void setFPGAD10PumpControl( U08 control ) { - fpgaActuatorSetPoints.fpgaD10_PumpControl &= FPGA_CONC_PUMP_PARK_COMMAND; // preserve msb (park command bit) - fpgaActuatorSetPoints.fpgaD10_PumpControl |= control; + fpgaActuatorSetPoints.fpgaD10PumpControl &= FPGA_CONC_PUMP_PARK_COMMAND; // preserve msb (park command bit) + fpgaActuatorSetPoints.fpgaD10PumpControl |= control; } /*********************************************************************//** @@ -669,13 +669,13 @@ * bit 7: Park command bit * bit 0-6: Other pump control bits (set in different function) * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11_PumpControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11PumpControl * @param Park command bit set * @return none *************************************************************************/ void setFPGAD11PumpParkCmd( void ) { - fpgaActuatorSetPoints.fpgaD11_PumpControl |= FPGA_CONC_PUMP_PARK_COMMAND; // this bit must be cleared after next transmit to prevent continuous park commands + fpgaActuatorSetPoints.fpgaD11PumpControl |= FPGA_CONC_PUMP_PARK_COMMAND; // this bit must be cleared after next transmit to prevent continuous park commands } /*********************************************************************//** @@ -685,13 +685,13 @@ * bit 7: Park command bit * bit 0-6: Other pump control bits (set in different function) * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10_PumpControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10PumpControl * @param Park command bit set * @return none *************************************************************************/ void setFPGAD10PumpParkCmd( void ) { - fpgaActuatorSetPoints.fpgaD10_PumpControl |= FPGA_CONC_PUMP_PARK_COMMAND; // this bit must be cleared after next transmit to prevent continuous park commands + fpgaActuatorSetPoints.fpgaD10PumpControl |= FPGA_CONC_PUMP_PARK_COMMAND; // this bit must be cleared after next transmit to prevent continuous park commands } /*********************************************************************//** @@ -1271,55 +1271,55 @@ * The setFPGAPrimaryHeaterPWMControl function sets the primary heater * PWM input. * @details \b Inputs: none - * @details \b Outputs: fpgaPrimaryHeaterPWMControl + * @details \b Outputs: fpgaD5HeaterPWMControl * @param control the PWM dutycycle to control the heater * @return none *************************************************************************/ void setFPGAPrimaryHeaterPWMControl( U08 control ) { - fpgaActuatorSetPoints.fpgaPrimaryHeaterPWMControl = control; + fpgaActuatorSetPoints.fpgaD5HeaterPWMControl = control; } /*********************************************************************//** * @brief * The setFPGATrimmerHeaterPWMControl function sets the trimmer heater * PWM input. * @details \b Inputs: none - * @details \b Outputs: fpgaTrimmerHeaterPWMControl + * @details \b Outputs: fpgaD45HeaterPWMControl * @param control the PWM dutycycle to control the heater * @return none *************************************************************************/ void setFPGATrimmerHeaterPWMControl( U08 control ) { - fpgaActuatorSetPoints.fpgaTrimmerHeaterPWMControl = control; + fpgaActuatorSetPoints.fpgaD45HeaterPWMControl = control; } /*********************************************************************//** * @brief * The setFPGAD11PumpRevolutionCount function sets the Acid concentrate * pump revolution count. * @details \b Inputs: none - * @details \b Outputs: fpgaD11_PumpRevCount + * @details \b Outputs: fpgaD11PumpRevCount * @param count the number of revolution to be rotated for the pump. * @return none *************************************************************************/ void setFPGAD11PumpRevolutionCount( U16 count ) { - fpgaActuatorSetPoints.fpgaD11_PumpRevCount = count; + fpgaActuatorSetPoints.fpgaD11PumpRevCount = count; } /*********************************************************************//** * @brief * The setFPGAD10PumpRevolutionCount function sets the Bicarb concentrate * pump revolution count. * @details \b Inputs: none - * @details \b Outputs: fpgaD10_PumpRevCount + * @details \b Outputs: fpgaD10PumpRevCount * @param count the number of revolution to be rotated for the pump. * @return none *************************************************************************/ void setFPGAD10PumpRevolutionCount( U16 count ) { - fpgaActuatorSetPoints.fpgaD10_PumpRevCount = count; + fpgaActuatorSetPoints.fpgaD10PumpRevCount = count; } /*********************************************************************//** @@ -1360,7 +1360,7 @@ /*********************************************************************//** * @brief - * The getFPGASpentDialysatePumpControl function gets the status of the + * The getFPGAD48PumpControl function gets the status of the * dialysate out pump control status bits. * bit 7: TBD * bit 6: TBD @@ -1370,17 +1370,17 @@ * bit 1-2: TBD * bit 0: Run (1), stop (0) * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaSDPControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD48PumpControl * @return Dialysate Out pump control status bit *************************************************************************/ -U08 getFPGASpentDialysatePumpControl( void ) +U08 getFPGAD48PumpControl( void ) { - return fpgaActuatorSetPoints.fpgaSDPControl; + return fpgaActuatorSetPoints.fpgaD48PumpControl; } /*********************************************************************//** * @brief - * The getFPGAFreshDialysatePumpControl function gets the status of the + * The getFPGAD12PumpControl function gets the status of the * dialysate Inlet pump control status bits. * bit 7: TBD * bit 6: TBD @@ -1390,128 +1390,128 @@ * bit 1-2: TBD * bit 0: Run (1), stop (0) * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaDGPControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD12PumpControl * @return Dialysate Inlet pump control status bit *************************************************************************/ -U08 getFPGAFreshDialysatePumpControl( void ) +U08 getFPGAD12PumpControl( void ) { - return fpgaActuatorSetPoints.fpgaDGPControl; + return fpgaActuatorSetPoints.fpgaD12PumpControl; } /*********************************************************************//** * @brief - * The getFPGASpentDialysatePumpSpeed function gets the spent dialysate + * The getFPGAD48PumpSpeed function gets the spent dialysate * pump speed. * @details \b Inputs: none - * @details \b Outputs: fpgaSensorReadings.fpgaSDPMeasuredSpeed + * @details \b Outputs: fpgaSensorReadings.fpgaD48MeasuredSpeed * @return Spent dialysate pump measured speed. *************************************************************************/ -U16 getFPGASpentDialysatePumpSpeed( void ) +U16 getFPGAD48PumpSpeed( void ) { - return fpgaSensorReadings.fpgaSDPMeasuredSpeed; + return fpgaSensorReadings.fpgaD48MeasuredSpeed; } /*********************************************************************//** * @brief - * The getFPGAFreshDialysatePumpSpeed function gets the fresh dialysate + * The getFPGAD12PumpSpeed function gets the fresh dialysate * pump speed. * @details \b Inputs: none - * @details \b Outputs: fpgaSensorReadings.fpgaDGPMeasuredSpeed + * @details \b Outputs: fpgaSensorReadings.fpgaD12MeasuredSpeed * @return fresh dialysate pump measured speed. *************************************************************************/ -U16 getFPGAFreshDialysatePumpSpeed( void ) +U16 getFPGAD12PumpSpeed( void ) { - return fpgaSensorReadings.fpgaDGPMeasuredSpeed; + return fpgaSensorReadings.fpgaD12MeasuredSpeed; } /*********************************************************************//** * @brief - * The getFPGAFreshDialysatePumpErrorStatus function gets the fresh dialysate + * The getFPGAD12PumpErrorStatus function gets the fresh dialysate * pump error status. * bit 7-2: TBD * bit 1 : spent dialysate pump error (1), no error(0) * bit 0 : fresh dialysate pump error (1), no error(0) * @details \b Inputs: none - * @details \b Outputs: fpgaSensorReadings.fpgaDGPSDPPumpStatus + * @details \b Outputs: fpgaSensorReadings.fpgaD12D48PumpStatus * @return fresh dialysate pump error status. *************************************************************************/ -BOOL getFPGAFreshDialysatePumpErrorStatus( void ) +BOOL getFPGAD12PumpErrorStatus( void ) { - U08 mask = fpgaSensorReadings.fpgaDGPSDPPumpStatus & FPGA_DGP_PUMP_ERROR_BIT; + U08 mask = fpgaSensorReadings.fpgaD12D48PumpStatus & FPGA_D12_PUMP_ERROR_BIT; BOOL result = ( mask > 0 ? TRUE : FALSE ); return result; } /*********************************************************************//** * @brief - * The getFPGASpentDialysatePumpErrorStatus function gets the spent dialysate + * The getFPGAD48PumpErrorStatus function gets the spent dialysate * pump error status. * bit 7-2: TBD * bit 1 : spent dialysate pump error (1), no error(0) * bit 0 : fresh dialysate pump error (1), no error(0) * @details \b Inputs: none - * @details \b Outputs: fpgaSensorReadings.fpgaDGPSDPPumpStatus + * @details \b Outputs: fpgaSensorReadings.fpgaD12D48PumpStatus * @return spent dialysate pump error status. *************************************************************************/ -BOOL getFPGASpentDialysatePumpErrorStatus( void ) +BOOL getFPGAD48PumpErrorStatus( void ) { - U08 mask = fpgaSensorReadings.fpgaDGPSDPPumpStatus & FPGA_SDP_PUMP_ERROR_BIT; + U08 mask = fpgaSensorReadings.fpgaD12D48PumpStatus & FPGA_D48_PUMP_ERROR_BIT; BOOL result = ( mask > 0 ? TRUE : FALSE ); return result; } /*********************************************************************//** * @brief - * The getFPGAFreshDialysatePumpCurrentFeedback function gets the fresh dialysate + * The getFPGAD12PumpCurrentFeedback function gets the fresh dialysate * pump current consumption. * @details \b Inputs: none - * @details \b Outputs: fpgaSensorReadings.fpgaDGPCurrentFeedback + * @details \b Outputs: fpgaSensorReadings.fpgaD12CurrentFeedback * @return fresh dialysate pump measured current. *************************************************************************/ -U16 getFPGAFreshDialysatePumpCurrentFeedback( void ) +U16 getFPGAD12PumpCurrentFeedback( void ) { - return fpgaSensorReadings.fpgaDGPCurrentFeedback; + return fpgaSensorReadings.fpgaD12CurrentFeedback; } /*********************************************************************//** * @brief - * The getFPGASpentDialysatePumpCurrentFeedback function gets the spent dialysate + * The getFPGAD48PumpCurrentFeedback function gets the spent dialysate * pump current consumption. * @details \b Inputs: none - * @details \b Outputs: fpgaSensorReadings.fpgaSDPCurrentFeedback + * @details \b Outputs: fpgaSensorReadings.fpgaD48CurrentFeedback * @return spent dialysate pump measured current. *************************************************************************/ -U16 getFPGASpentDialysatePumpCurrentFeedback( void ) +U16 getFPGAD48PumpCurrentFeedback( void ) { - return fpgaSensorReadings.fpgaSDPCurrentFeedback; + return fpgaSensorReadings.fpgaD48CurrentFeedback; } /*********************************************************************//** * @brief - * The getFPGAFreshDialysatePumpHallDirectionStatus function gets the fresh dialysate + * The getFPGAD12PumpHallDirectionStatus function gets the fresh dialysate * pump hall sensor based direction error status. * @details \b Inputs: none - * @details \b Outputs: fpgaSensorReadings.fpgaDGPHallStatus + * @details \b Outputs: fpgaSensorReadings.fpgaD12HallStatus * @return fresh dialysate pump hall sensor based direction status. *************************************************************************/ -U08 getFPGAFreshDialysatePumpHallDirectionStatus( void ) +U08 getFPGAD12PumpHallDirectionStatus( void ) { - return fpgaSensorReadings.fpgaDGPHallStatus; + return fpgaSensorReadings.fpgaD12HallStatus; } /*********************************************************************//** * @brief - * The getFPGASpentDialysatePumpHallDirectionStatus function gets the spent dialysate + * The getFPGAD48PumpHallDirectionStatus function gets the spent dialysate * pump hall sensor based direction error status. * @details \b Inputs: none - * @details \b Outputs: fpgaSensorReadings.fpgaSDPHallStatus + * @details \b Outputs: fpgaSensorReadings.fpgaD48HallStatus * @return spent dialysate pump hall sensor based direction status. *************************************************************************/ -U08 getFPGASpentDialysatePumpHallDirectionStatus( void ) +U08 getFPGAD48PumpHallDirectionStatus( void ) { - return fpgaSensorReadings.fpgaSDPHallStatus; + return fpgaSensorReadings.fpgaD48HallStatus; } /*********************************************************************//** @@ -1525,12 +1525,12 @@ * bit 3: Direction (1=Fwd, 0=Rev) * bit 0-2: Microstepping resolution * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11_PumpControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11PumpControl * @return Acid pump control status bit *************************************************************************/ U08 getFPGAD11PumpControlStatus( void ) { - return fpgaActuatorSetPoints.fpgaD11_PumpControl; + return fpgaActuatorSetPoints.fpgaD11PumpControl; } /*********************************************************************//** @@ -1544,12 +1544,12 @@ * bit 3: Direction (1=Fwd, 0=Rev) * bit 0-2: Microstepping resolution * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10_PumpControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10PumpControl * @return Bicarb pump control status bit *************************************************************************/ U08 getFPGAD10PumpControlStatus( void ) { - return fpgaActuatorSetPoints.fpgaD10_PumpControl; + return fpgaActuatorSetPoints.fpgaD10PumpControl; } /*********************************************************************//** @@ -2614,26 +2614,26 @@ * @brief * The getFPGAD11PumpRevolutionCountStatus function gets the current revolution of * acid concentrate pump (down counter). - * @details \b Inputs: fpgaD11_PumpStepCountStatus + * @details \b Inputs: fpgaD11PumpStepCountStatus * @details \b Outputs: none * @return the current revolution of the acid concentrate pump *************************************************************************/ U16 getFPGAD11PumpRevolutionCountStatus( void ) { - return fpgaSensorReadings.fpgaD11_PumpStepCountStatus; + return fpgaSensorReadings.fpgaD11PumpStepCountStatus; } /*********************************************************************//** * @brief * The getFPGAD10PumpRevolutionCountStatus function gets the current revolution of * bicarb concentrate pump (down counter). - * @details \b Inputs: fpgaD10_PumpStepCountStatus + * @details \b Inputs: fpgaD10PumpStepCountStatus * @details \b Outputs: none * @return the current revolution of the bicarb concentrate pump *************************************************************************/ U16 getFPGAD10PumpRevolutionCountStatus( void ) { - return fpgaSensorReadings.fpgaD10_PumpStepCountStatus; + return fpgaSensorReadings.fpgaD10PumpStepCountStatus; } /*********************************************************************//**