Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rc49f9ed931d60e5bd1d0a406fde6c9fe1437f73b -r1158d9e342ab00e93e264b8f161696c012302751 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision c49f9ed931d60e5bd1d0a406fde6c9fe1437f73b) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 1158d9e342ab00e93e264b8f161696c012302751) @@ -463,6 +463,56 @@ U16 fpgaACDCPMonVrms; ///< Reg 824. AC DC Power Supply RMS Voltage U16 fpgaACHeaterPMonIrms; ///< Reg 826. AC Heater RMS Current U16 fpgaACHeaterPMonVrms; ///< Reg 828. AC Heater RMS Voltage. + U08 fpgaD10FaultStatus; ///< Reg 830. DRV8434S Fault Status Register for D10. + U08 fpgaD10DiagStatus1; ///< Reg 831. DRV8434S Diag Status1 Register for D10. + U08 fpgaD10DiagStatus2; ///< Reg 832. DRV8434S Diag Status2 Register for D10. + U08 fpgaD10CtrlReg1Status; ///< Reg 833. DRV8434S CtrlReg1 Status for D10. + U08 fpgaD10CtrlReg2Status; ///< Reg 834. DRV8434S CtrlReg2 Status for D10. + U08 fpgaD10CtrlReg3Status; ///< Reg 835. DRV8434S CtrlReg3 Status for D10. + U08 fpgaD10CtrlReg4Status; ///< Reg 836. DRV8434S CtrlReg4 Status for D10. + U08 fpgaD10CtrlReg5Status; ///< Reg 837. DRV8434S CtrlReg5 Status for D10. + U08 fpgaD10CtrlReg6Status; ///< Reg 838. DRV8434S CtrlReg6 Status for D10. + U08 fpgaD10CtrlReg7Status; ///< Reg 839. DRV8434S CtrlReg7 Status for D10. + U08 fpgaD10CtrlReg8Status; ///< Reg 840. DRV8434S CtrlReg8 Status for D10. + U08 fpgaD10CtrlReg9Status; ///< Reg 841. DRV8434S CtrlReg9 Status for D10. + U08 fpgaD11FaultStatus; ///< Reg 842. DRV8434S Fault Status Register for D11. + U08 fpgaD11DiagStatus1; ///< Reg 843. DRV8434S Diag Status1 Register for D11. + U08 fpgaD11DiagStatus2; ///< Reg 844. DRV8434S Diag Status2 Register for D11. + U08 fpgaD11CtrlReg1Status; ///< Reg 845. DRV8434S CtrlReg1 Status for D11. + U08 fpgaD11CtrlReg2Status; ///< Reg 846. DRV8434S CtrlReg2 Status for D11. + U08 fpgaD11CtrlReg3Status; ///< Reg 847. DRV8434S CtrlReg3 Status for D11. + U08 fpgaD11CtrlReg4Status; ///< Reg 848. DRV8434S CtrlReg4 Status for D11. + U08 fpgaD11CtrlReg5Status; ///< Reg 849. DRV8434S CtrlReg5 Status for D11. + U08 fpgaD11CtrlReg6Status; ///< Reg 850. DRV8434S CtrlReg6 Status for D11. + U08 fpgaD11CtrlReg7Status; ///< Reg 851. DRV8434S CtrlReg7 Status for D11. + U08 fpgaD11CtrlReg8Status; ///< Reg 852. DRV8434S CtrlReg8 Status for D11. + U08 fpgaD11CtrlReg9Status; ///< Reg 853. DRV8434S CtrlReg9 Status for D11. + U08 fpgaD76FaultStatus; ///< Reg 854. DRV8434S Fault Status Register for D76. + U08 fpgaD76DiagStatus1; ///< Reg 855. DRV8434S Diag Status1 Register for D76. + U08 fpgaD76DiagStatus2; ///< Reg 856. DRV8434S Diag Status2 Register for D76. + U08 fpgaD76CtrlReg1Status; ///< Reg 857. DRV8434S CtrlReg1 Status for D76. + U08 fpgaD76CtrlReg2Status; ///< Reg 858. DRV8434S CtrlReg2 Status for D76. + U08 fpgaD76CtrlReg3Status; ///< Reg 859. DRV8434S CtrlReg3 Status for D76. + U08 fpgaD76CtrlReg4Status; ///< Reg 860. DRV8434S CtrlReg4 Status for D76. + U08 fpgaD76CtrlReg5Status; ///< Reg 861. DRV8434S CtrlReg5 Status for D76. + U08 fpgaD76CtrlReg6Status; ///< Reg 862. DRV8434S CtrlReg6 Status for D76. + U08 fpgaD76CtrlReg7Status; ///< Reg 863. DRV8434S CtrlReg7 Status for D76. + U08 fpgaD76CtrlReg8Status; ///< Reg 864. DRV8434S CtrlReg8 Status for D76. + U08 fpgaD76CtrlReg9Status; ///< Reg 865. DRV8434S CtrlReg9 Status for D76. + U08 fpgaD92FaultStatus; ///< Reg 866. DRV8434S Fault Status Register for D92. + U08 fpgaD92DiagStatus1; ///< Reg 867. DRV8434S Diag Status1 Register for D92. + U08 fpgaD92DiagStatus2; ///< Reg 868. DRV8434S Diag Status2 Register for D92. + U08 fpgaD92CtrlReg1Status; ///< Reg 869. DRV8434S CtrlReg1 Status for D92. + U08 fpgaD92CtrlReg2Status; ///< Reg 870. DRV8434S CtrlReg2 Status for D92. + U08 fpgaD92CtrlReg3Status; ///< Reg 871. DRV8434S CtrlReg3 Status for D92. + U08 fpgaD92CtrlReg4Status; ///< Reg 872. DRV8434S CtrlReg4 Status for D92. + U08 fpgaD92CtrlReg5Status; ///< Reg 873. DRV8434S CtrlReg5 Status for D92. + U08 fpgaD92CtrlReg6Status; ///< Reg 874. DRV8434S CtrlReg6 Status for D92. + U08 fpgaD92CtrlReg7Status; ///< Reg 875. DRV8434S CtrlReg7 Status for D92. + U08 fpgaD92CtrlReg8Status; ///< Reg 876. DRV8434S CtrlReg8 Status for D92. + U08 fpgaD92CtrlReg9Status; ///< Reg 877. DRV8434S CtrlReg9 Status for D92. + U16 fpgaCondSensorCalCmdStatus; ///< Reg 878. Conductivity sensor cal commands status + U08 fpgaCondSensorCmdSensorID; ///< Reg 880. Conductivty sensor cal command sensor ID } DD_FPGA_SENSORS_T; // TODO: Remove when Beta 1.9 is obsolete @@ -628,17 +678,17 @@ U32 fpgaD92PumpRevCount; ///< Reg 142. HDF pump revolution count U32 fpgaCondSensCalData1; ///< Reg 146 Conductivity Sensor Calibration Coefficient 1 - U32 fpgaCondSensCalData2; ///< Reg 150 Conductivity Sensor Calibration Coefficient - U32 fpgaCondSensCalData3; ///< Reg 154 Conductivity Sensor Calibration Coefficient - U32 fpgaCondSensCalData4; ///< Reg 158 Conductivity Sensor Calibration Coefficient - U32 fpgaCondSensCalData5; ///< Reg 162 Conductivity Sensor Calibration Coefficient - U32 fpgaCondSensCalData6; ///< Reg 166 Conductivity Sensor Calibration Coefficient - U32 fpgaCondSensCalData7; ///< Reg 170 Conductivity Sensor Calibration Coefficient - U32 fpgaCondSensCalData8; ///< Reg 174 Conductivity Sensor Calibration Coefficient - U32 fpgaCondSensCalData9; ///< Reg 178 Conductivity Sensor Calibration Coefficient - U32 fpgaCondSensCalData10; ///< Reg 182 Conductivity Sensor Calibration Coefficient - U32 fpgaCondSensCalData11; ///< Reg 186 Conductivity Sensor Calibration Coefficient - U32 fpgaCondSensCalData12; ///< Reg 190 Conductivity Sensor Calibration Coefficient + U32 fpgaCondSensCalData2; ///< Reg 150 Conductivity Sensor Calibration Coefficient 2 + U32 fpgaCondSensCalData3; ///< Reg 154 Conductivity Sensor Calibration Coefficient 3 + U32 fpgaCondSensCalData4; ///< Reg 158 Conductivity Sensor Calibration Coefficient 4 + U32 fpgaCondSensCalData5; ///< Reg 162 Conductivity Sensor Calibration Coefficient 5 + U32 fpgaCondSensCalData6; ///< Reg 166 Conductivity Sensor Calibration Coefficient 6 + U32 fpgaCondSensCalData7; ///< Reg 170 Conductivity Sensor Calibration Coefficient 7 + U32 fpgaCondSensCalData8; ///< Reg 174 Conductivity Sensor Calibration Coefficient 8 + U32 fpgaCondSensCalData9; ///< Reg 178 Conductivity Sensor Calibration Coefficient 9 + U32 fpgaCondSensCalData10; ///< Reg 182 Conductivity Sensor Calibration Coefficient 10 + U32 fpgaCondSensCalData11; ///< Reg 186 Conductivity Sensor Calibration Coefficient 11 + U32 fpgaCondSensCalData12; ///< Reg 190 Conductivity Sensor Calibration Coefficient 12 U32 fpgaCondSensCalibrationTime; ///< Reg 194 Conductivity Sensor Calibration Time U16 fpgaCondSensCalibrationCRC; ///< Reg 198 Conductivity Sensor Calibration Data CRC U08 fpgaCondSensorID; ///< Reg 200 Conductivity Sensor Id @@ -4345,4 +4395,28 @@ fpgaActuatorSetPoints.fpgaCondSensorSerialNum = value; } +/*********************************************************************//** + * @brief + * The getFPGACalCmdStatus function gets conductivity sensor command status + * @details \b Inputs: fpgaCondSensorCalCmdStatus + * @details \b Outputs: none + * @return cal command status. + *************************************************************************/ +U16 getFPGACalCmdStatus( void ) +{ + return fpgaSensorReadings.fpgaCondSensorCalCmdStatus; +} + +/*********************************************************************//** + * @brief + * The getFPGACalCmdSensorId function gets conductivity sensor ID for commands + * @details \b Inputs: fpgaCondSensorCmdSensorID + * @details \b Outputs: none + * @return conductivity sensor ID. + *************************************************************************/ +U08 getFPGACalCmdSensorId( void ) +{ + return fpgaSensorReadings.fpgaCondSensorCmdSensorID; +} + /**@}*/