Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rf5baeac6a5f000705cd51e4779a967acf4088981 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -184,8 +184,8 @@ U08 fpgaD43CondReadCnt; ///< Reg 344. D43 successful read count U08 fpgaD43CondErrorCnt; ///< Reg 345. D43 error read count - U16 fpgaLevelSensor1; ///< Reg 346. Level Sensor 1 - U16 fpgaLevelSensor2; ///< Reg 348. Level Sensor 2 + U16 fpgaD63LevelSensor; ///< Reg 346. Level Sensor 1 + U16 fpgaD46LevelSensor; ///< Reg 348. Level Sensor 2 U08 fpgaHallSensInputs; ///< Reg 350. Hall sensor Inputs @@ -206,10 +206,10 @@ U16 fpgaD11PumpHallSense; ///< Reg 368. Concentrate pump D11_Pump hall sensor pulse width U16 fpgaD10PumpHallSense; ///< Reg 370. Concentrate pump D10_Pump hall sensor pulse width - U32 fpgaTax1Temp; ///< Reg 372. Inlet heat exchanger temperature - U32 fpgaTH2Temp; ///< Reg 376. Inlet heat exchanger temperature - U32 fpgaTH1Temp; ///< Reg 380. Hydraulics primary heater temperature - U32 fpgaTH3Temp; ///< Reg 384. Trimmer heater temperature + U32 fpgaD1Temp; ///< Reg 372. Inlet heat exchanger temperature + U32 fpgaX6Temp; ///< Reg 376. Outlet heat exchanger temperature + U32 fpgaD4Temp; ///< Reg 380. Hydraulics primary heater temperature + U32 fpgaD50Temp; ///< Reg 384. Trimmer heater temperature U08 fpgaRTDReadCnt; ///< Reg 388. Read count for all RTD sensors U08 fpgaBaroReadCount; ///< Reg 389. Barometric sensor read count @@ -232,7 +232,7 @@ 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 fpgaD6FloaterStatus; ///< Reg 426. Floater 1 level sensor status U08 fpgaFloater2Status; ///< Reg 427. Floater 2 level sensor status U16 fpgaD11PumpStepCountStatus; ///< Reg 428. Acid concentrate pump revolution down count status U16 fpgaD10PumpStepCountStatus; ///< Reg 430. Bicarb concentrate pump revolution down count status @@ -269,9 +269,9 @@ U16 fpgaD31ValvePWMPeriod; ///< Reg 52. D31 PWM period U16 fpgaD31ValvePWMPullin; ///< Reg 54. D31 PWM pull in - U16 fpgaVDB2PWMLow; ///< Reg 56. VDB2 PWM low - U16 fpgaVDB2PWMPeriod; ///< Reg 58. VDB2 PWM period - U16 fpgaVDB2PWMPullin; ///< Reg 60. VDB2 PWM pull in + U16 fpgaD34ValvePWMLow; ///< Reg 56. D34 PWM low + U16 fpgaD34ValvePWMPeriod; ///< Reg 58. D34 PWM period + U16 fpgaD34ValvePWMPullin; ///< Reg 60. D34 PWM pull in U16 fpgaD35ValvePWMLow; ///< Reg 62. D35 PWM low U16 fpgaD35ValvePWMPeriod; ///< Reg 64. D35 PWM period U16 fpgaD35ValvePWMPullin; ///< Reg 66. D35 PWM pull in @@ -462,7 +462,7 @@ * 5 - D65Valve.\n * 6 - D64Valve.\n * 7 - D31Valve.\n - * 8 - VDB2.\n + * 8 - D34Valve.\n * 9 - D35Valve.\n * 10 - D40Valve.\n * 11 - D47Valve.\n @@ -2297,41 +2297,41 @@ /*********************************************************************//** * @brief - * The getFPGALevelSensor1 function gets the latest FPGA level sensor 1 + * The getFPGAD63LevelSensor function gets the latest FPGA D63 level sensor * reading. - * @details \b Inputs: fpgaSensorReadings.fpgaLevelSensor1 + * @details \b Inputs: fpgaSensorReadings.fpgaD63LevelSensor * @details \b Outputs: none - * @return last FPGA level sensor1 reading + * @return last FPGA D63 level sensor reading *************************************************************************/ -U16 getFPGALevelSensor1( void ) +U16 getFPGAD63LevelSensor( void ) { - return fpgaSensorReadings.fpgaLevelSensor1; + return fpgaSensorReadings.fpgaD63LevelSensor; } /*********************************************************************//** * @brief - * The getFPGALevelSensor2 function gets the latest FPGA level sensor 2 + * The getFPGAD46LevelSensor function gets the latest FPGA level sensor 2 * reading. - * @details \b Inputs: fpgaSensorReadings.fpgaLevelSensor2 + * @details \b Inputs: fpgaSensorReadings.fpgaD46LevelSensor * @details \b Outputs: none * @return last FPGA level sensor2 reading *************************************************************************/ -U16 getFPGALevelSensor2( void ) +U16 getFPGAD46LevelSensor( void ) { - return fpgaSensorReadings.fpgaLevelSensor2; + return fpgaSensorReadings.fpgaD46LevelSensor; } /*********************************************************************//** * @brief - * The getFPGAFloater1Status function gets the latest FPGA floater 1 level + * The getFPGAD6LevelStatus function gets the latest FPGA floater D6 level * reading. - * @details \b Inputs: fpgaSensorReadings.fpgaFloater1Status + * @details \b Inputs: fpgaSensorReadings.fpgaD6FloaterStatus * @details \b Outputs: none - * @return last FPGA floater 1 level reading + * @return last FPGA floater D6 level reading *************************************************************************/ -U08 getFPGAFloater1Status( void ) +U08 getFPGAD6LevelStatus( void ) { - return ( fpgaSensorReadings.fpgaFloater1Status & FPGA_FLOATER_LEVEL_BIT ); + return ( fpgaSensorReadings.fpgaD6FloaterStatus & FPGA_FLOATER_LEVEL_BIT ); } /*********************************************************************//** @@ -2361,53 +2361,53 @@ /*********************************************************************//** * @brief - * The getFPGAInletHeatExchangerTemp function gets the inlet heat exchanger + * The getFPGAD1Temp function gets the inlet heat exchanger * temperature. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none * @return inlet heat exchanger temperature *************************************************************************/ -U32 getFPGAInletHeatExchangerTemp( void ) +U32 getFPGAD1Temp( void ) { - return fpgaSensorReadings.fpgaTax1Temp; + return fpgaSensorReadings.fpgaD1Temp; } /*********************************************************************//** * @brief - * The getFPGAOutletHeatExchangerTemp function gets the outlet heat exchanger + * The getFPGAX6Temp function gets the outlet heat exchanger * temperature. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none * @return outlet heat exchanger temperature *************************************************************************/ -U32 getFPGAOutletHeatExchangerTemp( void ) +U32 getFPGAX6Temp( void ) { - return fpgaSensorReadings.fpgaTH2Temp; + return fpgaSensorReadings.fpgaX6Temp; } /*********************************************************************//** * @brief - * The getFPGAHydraulicsPrimaryHeaterTemp function gets the hydraulics primary + * The getFPGAD4Temp function gets the hydraulics primary * heater temperature. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none * @return hydraulics primary heater temperature *************************************************************************/ -U32 getFPGAHydraulicsPrimaryHeaterTemp( void ) +U32 getFPGAD4Temp( void ) { - return fpgaSensorReadings.fpgaTH1Temp; + return fpgaSensorReadings.fpgaD4Temp; } /*********************************************************************//** * @brief - * The getFPGATrimmerHeaterTemp function gets the trimmer heater temperature. + * The getFPGAD50Temp function gets the trimmer heater temperature. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none * @return trimmer heater temperature *************************************************************************/ -U32 getFPGATrimmerHeaterTemp( void ) +U32 getFPGAD50Temp( void ) { - return fpgaSensorReadings.fpgaTH3Temp; + return fpgaSensorReadings.fpgaD50Temp; } /*********************************************************************//**