Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) @@ -157,8 +157,8 @@ * @brief * The handleROPumpOffState function handles the off state of the RO pump * state machine. - * @details \b Inputs: - * @details \b Outputs: + * @details \b Inputs: none + * @details \b Outputs: none * @param pumpID ID of boost pump to handle off state for * @return next state *************************************************************************/ Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) @@ -356,7 +356,7 @@ /*********************************************************************//** * @brief - * The publishValvesStates function publishes DG valves states at the set interval. + * The publishValvesStates function publishes RO valves states at the set interval. * @details \b Inputs: valvesStatesPublicationTimerCounter * @details \b Outputs: valvesStatesPublicationTimerCounter * @details \b Message \b Sent: MSG_ID_RO_VALVES_STATES_DATA to publish FPGA read valve states. Index: firmware/App/Drivers/BoostPump.c =================================================================== diff -u -r0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda --- firmware/App/Drivers/BoostPump.c (.../BoostPump.c) (revision 0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef) +++ firmware/App/Drivers/BoostPump.c (.../BoostPump.c) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) @@ -235,7 +235,7 @@ * The testSetBoostPumpPWM function sets a given boost pump to a given PWM * value. * @details \b Inputs: none - * @details \b Outputs: valveStates[] + * @details \b Outputs: boostPumpCmdDutyCycle[] * @param message Override message from Dialin which includes an ID of * the valve to override and the state to override the valve to. * @return TRUE if override successful, FALSE if not Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -rd8cd7de2f84b26aafc153e2bb665a5058a040bf0 -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision d8cd7de2f84b26aafc153e2bb665a5058a040bf0) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) @@ -82,20 +82,7 @@ } // Initialize the FPGA persistent alarms -// initFPGAPersistentAlarm( FPGA_PERS_ERROR_HYDRAULICS_OUTLET_PRESSURE, ALARM_ID_DD_HYD_OUTLET_PRES_TIMEOUT_FAULT, -// PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS, PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS ); -// initFPGAPersistentAlarm( FPGA_PERS_ERROR_BIBAG_PRESSURE, ALARM_ID_DD_BIBAG_PRES_TIMEOUT_FAULT, -// PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS, PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS ); -// initFPGAPersistentAlarm( FPGA_PERS_ERROR_SPENT_DIALYSATE_PRESSURE, ALARM_ID_DD_SPENT_DIALYSATE_PRES_TIMEOUT_FAULT, -// PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS, PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS ); -// initFPGAPersistentAlarm( FPGA_PERS_ERROR_FRESH_DIALYSATE_PRESSURE, ALARM_ID_DD_FRESH_DIALYSATE_PRES_TIMEOUT_FAULT, -// PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS, PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS ); -// initFPGAPersistentAlarm( FPGA_PERS_ERROR_TRANSMEMBRANE_PRESSURE, ALARM_ID_DD_TRANSMEMB_PRES_TIMEOUT_FAULT, -// PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS, PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS ); -// initFPGAPersistentAlarm( FPGA_PERS_ERROR_WATER_INLET_INPUT_PRESSURE, ALARM_ID_DD_WATER_INLET_INPUT_PRES_TIMEOUT_FAULT, -// PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS, PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS ); -// initFPGAPersistentAlarm( FPGA_PERS_ERROR_WATER_INLET_OUTPUT_PRESSURE, ALARM_ID_DD_WATER_INLET_OUTPUT_PRES_TIMEOUT_FAULT, -// PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS, PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS ); + // TODO - initialize persistent alarms. } /*********************************************************************//** Index: firmware/App/Drivers/TemperatureSensors.c =================================================================== diff -u -r2205857f59dd884c4af450239381387cfb560c2e -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda --- firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 2205857f59dd884c4af450239381387cfb560c2e) +++ firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) @@ -113,7 +113,7 @@ static OVERRIDE_U32_T lastBaroTempReadCounter; ///< Barometric sensor read count from FPGA. static BARO_SENSOR_CONSTS_T baroConvConsts; ///< Barometric sensor conversion constants. -//static DD_TEMP_SENSORS_CAL_RECORD_T tempSensorCalRecord; ///< Temperature sensors calibration record. +//static RO_TEMP_SENSORS_CAL_RECORD_T tempSensorCalRecord; ///< Temperature sensors calibration record. // ********** private function prototypes ********** @@ -150,33 +150,16 @@ memset( &baroConvConsts, 0x0, sizeof( BARO_SENSOR_CONSTS_T ) ); // Initialize TH1 (primary heater), TH2(outlet Heat Exchanger), TAUX ( Inlet Heat exchanger), - // TH3 ( Trim Heater) constants. For now, assume same gain across all sensors. - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + // TH3 ( Trim Heater) constants. For now, assume same gain across all sensors. // TODO - do for all RO temp sensors when defined + tempSensors[ TEMPSENSORS_TBD ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; + tempSensors[ TEMPSENSORS_TBD ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ TEMPSENSORS_TBD ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ TEMPSENSORS_TBD ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].maxAllowedTemp = HEATERS_INTERNAL_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - // Board temperature sensors conversion coefficient - tempSensors[ TEMPSENSORS_BOARD_TEMPERATURE ].conversionCoeff = conversionCoeff; - tempSensors[ TEMPSENSORS_BOARD_TEMPERATURE ].maxAllowedTemp = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; +// tempSensors[ TEMPSENSORS_BOARD_TEMPERATURE ].conversionCoeff = conversionCoeff; +// tempSensors[ TEMPSENSORS_BOARD_TEMPERATURE ].maxAllowedTemp = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ].maxAllowedTemp = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - // Persistent alarm for the temperature sensors range check // initPersistentAlarm( ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS ); Index: firmware/App/Drivers/TemperatureSensors.h =================================================================== diff -u -r2205857f59dd884c4af450239381387cfb560c2e -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda --- firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 2205857f59dd884c4af450239381387cfb560c2e) +++ firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) @@ -35,13 +35,8 @@ /// Enumeration of temperature sensors. typedef enum SENSORS_NAME { - TEMPSENSORS_INLET_HEAT_EXCHANGER = 0, ///< First temp sensor to scan - TEMPSENSORS_FIRST = TEMPSENSORS_INLET_HEAT_EXCHANGER, ///< Heat exchanger Inlet temperature sensor - TEMPSENSORS_OUTLET_HEAT_EXCHANGER, ///< Heat exchanger Outlet temperature sensor - TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER, ///< Hydraulics primary heater temperature sensor - TEMPSENSORS_TRIMMER_HEATER, ///< Trimmer heater temperature sensor - TEMPSENSORS_BAROMETRIC_TEMP_SENSOR, ///< Barometric temperature sensor - TEMPSENSORS_BOARD_TEMPERATURE, ///< DD board temperature sensor ( thermistor ) + TEMPSENSORS_TBD = 0, ///< TBD temperature sensor + TEMPSENSORS_FIRST = TEMPSENSORS_TBD, ///< First temp sensor to scan NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors } TEMPERATURE_SENSORS_T; Index: firmware/App/Monitors/Level.c =================================================================== diff -u -rc9aa3971be05f25a7b0d7124e57cc60617c90ad7 -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda --- firmware/App/Monitors/Level.c (.../Level.c) (revision c9aa3971be05f25a7b0d7124e57cc60617c90ad7) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) @@ -37,7 +37,7 @@ typedef struct { OVERRIDE_U32_T level; ///< Level state. - U32 PriorRawLevel; ///< Prior level state (not debounced). + U32 priorRawLevel; ///< Prior level state (not debounced). U32 debounceStartTime; ///< Debounce start time. U32 debounceTime; ///< Debounce time } LEVEL_STATE_REC_T; @@ -91,7 +91,7 @@ if ( currentLevelState != levelState.level.data ) { // If the debounce time is 0 or the current state not same as prior state, restart the debounce timer - if ( ( 0 == levelState.debounceStartTime ) || ( currentLevelState != levelState.PriorRawLevel ) ) + if ( ( 0 == levelState.debounceStartTime ) || ( currentLevelState != levelState.priorRawLevel ) ) { levelState.debounceStartTime = getMSTimerCount(); } @@ -108,7 +108,7 @@ levelState.debounceStartTime = 0; } - levelState.PriorRawLevel = currentLevelState; + levelState.priorRawLevel = currentLevelState; publishLevelsData(); } Index: firmware/App/Services/FpgaRO.c =================================================================== diff -u -rc9aa3971be05f25a7b0d7124e57cc60617c90ad7 -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda --- firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision c9aa3971be05f25a7b0d7124e57cc60617c90ad7) +++ firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) @@ -199,7 +199,7 @@ if ( FPGA_EXPECTED_ID == fpgaHeader.fpgaId ) { // Check FPGA compatibility w/ firmware - if ( TD_FPGA_COMPATIBILITY_REV == fpgaSensorReadings.compatibilityRev ) + if ( RO_FPGA_COMPATIBILITY_REV == fpgaSensorReadings.compatibilityRev ) { result = SELF_TEST_STATUS_PASSED; } @@ -386,10 +386,7 @@ *************************************************************************/ void setROPumpPWMPct( U16 pwm ) { - if ( pwm <= MAX_RO_PUMP_PWM ) - { - fpgaActuatorSetPoints.roPumpPWMDutyCyclePct = pwm; - } + fpgaActuatorSetPoints.roPumpPWMDutyCyclePct = pwm; } /*********************************************************************//** @@ -418,106 +415,253 @@ return fpgaSensorReadings.roPumpTachCount; } +/*********************************************************************//** + * @brief + * The getFPGAPRiRawPressure function gets the PRi pressure reading. + * @details \b Inputs: fpgaSensorReadings.pressurePri + * @details \b Outputs: none + * @return PRi pressure + *************************************************************************/ S16 getFPGAPRiRawPressure( void ) { return fpgaSensorReadings.pressurePri; } +/*********************************************************************//** + * @brief + * The getFPGAPRiRawTemperature function gets the PRi sensor temperature reading. + * @details \b Inputs: fpgaSensorReadings.temperaturePri + * @details \b Outputs: none + * @return PRi sensor temperature + *************************************************************************/ S16 getFPGAPRiRawTemperature( void ) { return fpgaSensorReadings.temperaturePri; } +/*********************************************************************//** + * @brief + * The getFPGAPRiReadCount function gets the PRi sensor read count. + * @details \b Inputs: fpgaSensorReadings.readCountPri + * @details \b Outputs: none + * @return PRi sensor read count + *************************************************************************/ U08 getFPGAPRiReadCount( void ) { return fpgaSensorReadings.readCountPri; } +/*********************************************************************//** + * @brief + * The getFPGAPRiErrorCount function gets the PRi sensor error count. + * @details \b Inputs: fpgaSensorReadings.errorCountPri + * @details \b Outputs: none + * @return PRi sensor error count + *************************************************************************/ U08 getFPGAPRiErrorCount( void ) { return fpgaSensorReadings.errorCountPri; } +/*********************************************************************//** + * @brief + * The getFPGAPRoRawPressure function gets the PRo pressure reading. + * @details \b Inputs: fpgaSensorReadings.pressurePro + * @details \b Outputs: none + * @return PRo pressure + *************************************************************************/ S16 getFPGAPRoRawPressure( void ) { - return fpgaSensorReadings.pressurePri; + return fpgaSensorReadings.pressurePro; } +/*********************************************************************//** + * @brief + * The getFPGAPRoRawTemperature function gets the PRo sensor temperature. + * @details \b Inputs: fpgaSensorReadings.temperaturePro + * @details \b Outputs: none + * @return PRo sensor temperature + *************************************************************************/ S16 getFPGAPRoRawTemperature( void ) { - return fpgaSensorReadings.temperaturePri; + return fpgaSensorReadings.temperaturePro; } +/*********************************************************************//** + * @brief + * The getFPGAPRoReadCount function gets the PRo sensor read count. + * @details \b Inputs: fpgaSensorReadings.readCountPro + * @details \b Outputs: none + * @return PRo sensor read count + *************************************************************************/ U08 getFPGAPRoReadCount( void ) { - return fpgaSensorReadings.readCountPri; + return fpgaSensorReadings.readCountPro; } +/*********************************************************************//** + * @brief + * The getFPGAPRoErrorCount function gets the PRo sensor error count. + * @details \b Inputs: fpgaSensorReadings.errorCountPro + * @details \b Outputs: none + * @return PRo sensor error count + *************************************************************************/ U08 getFPGAPRoErrorCount( void ) { - return fpgaSensorReadings.errorCountPri; + return fpgaSensorReadings.errorCountPro; } +/*********************************************************************//** + * @brief + * The getFPGAPC2oRawPressure function gets the PC2o pressure reading. + * @details \b Inputs: fpgaSensorReadings.pressurePc2o + * @details \b Outputs: none + * @return PC2o pressure + *************************************************************************/ S16 getFPGAPC2oRawPressure( void ) { - return fpgaSensorReadings.pressurePri; + return fpgaSensorReadings.pressurePc2o; } +/*********************************************************************//** + * @brief + * The getFPGAPC2oRawTemperature function gets the PC2o sensor temperature. + * @details \b Inputs: fpgaSensorReadings.temperaturePc2o + * @details \b Outputs: none + * @return PC2o sensor temperature + *************************************************************************/ S16 getFPGAPC2oRawTemperature( void ) { - return fpgaSensorReadings.temperaturePri; + return fpgaSensorReadings.temperaturePc2o; } +/*********************************************************************//** + * @brief + * The getFPGAPC2oReadCount function gets the PC2o sensor read count. + * @details \b Inputs: fpgaSensorReadings.readCountPc2o + * @details \b Outputs: none + * @return PC2o sensor read count + *************************************************************************/ U08 getFPGAPC2oReadCount( void ) { - return fpgaSensorReadings.readCountPri; + return fpgaSensorReadings.readCountPc2o; } +/*********************************************************************//** + * @brief + * The getFPGAPC2oErrorCount function gets the PC2o sensor error count. + * @details \b Inputs: fpgaSensorReadings.errorCountPc2o + * @details \b Outputs: none + * @return PC2o sensor error count + *************************************************************************/ U08 getFPGAPC2oErrorCount( void ) { - return fpgaSensorReadings.errorCountPri; + return fpgaSensorReadings.errorCountPc2o; } +/*********************************************************************//** + * @brief + * The getFPGAPPoRawPressure function gets the PPo pressure reading. + * @details \b Inputs: fpgaSensorReadings.pressurePpo + * @details \b Outputs: none + * @return PPo pressure + *************************************************************************/ S16 getFPGAPPoRawPressure( void ) { - return fpgaSensorReadings.pressurePri; + return fpgaSensorReadings.pressurePpo; } +/*********************************************************************//** + * @brief + * The getFPGAPPoRawTemperature function gets the PPo sensor temperature. + * @details \b Inputs: fpgaSensorReadings.temperaturePpo + * @details \b Outputs: none + * @return PPo sensor temperature + *************************************************************************/ S16 getFPGAPPoRawTemperature( void ) { - return fpgaSensorReadings.temperaturePri; + return fpgaSensorReadings.temperaturePpo; } +/*********************************************************************//** + * @brief + * The getFPGAPPoReadCount function gets the PPo sensor read count. + * @details \b Inputs: fpgaSensorReadings.readCountPpo + * @details \b Outputs: none + * @return PPo sensor read count + *************************************************************************/ U08 getFPGAPPoReadCount( void ) { - return fpgaSensorReadings.readCountPri; + return fpgaSensorReadings.readCountPpo; } +/*********************************************************************//** + * @brief + * The getFPGAPPoErrorCount function gets the PPo sensor error count. + * @details \b Inputs: fpgaSensorReadings.errorCountPpo + * @details \b Outputs: none + * @return PPo sensor error count + *************************************************************************/ U08 getFPGAPPoErrorCount( void ) { - return fpgaSensorReadings.errorCountPri; + return fpgaSensorReadings.errorCountPpo; } +/*********************************************************************//** + * @brief + * The getFPGAPMpRawPressure function gets the PMp pressure reading. + * @details \b Inputs: fpgaSensorReadings.pressurePmp + * @details \b Outputs: none + * @return PMp pressure + *************************************************************************/ S16 getFPGAPMpRawPressure( void ) { - return fpgaSensorReadings.pressurePri; + return fpgaSensorReadings.pressurePmp; } +/*********************************************************************//** + * @brief + * The getFPGAPMpRawTemperature function gets the PMp sensor temperature. + * @details \b Inputs: fpgaSensorReadings.temperaturePmp + * @details \b Outputs: none + * @return PMp sensor temperature + *************************************************************************/ S16 getFPGAPMpRawTemperature( void ) { - return fpgaSensorReadings.temperaturePri; + return fpgaSensorReadings.temperaturePmp; } +/*********************************************************************//** + * @brief + * The getFPGAPMpReadCount function gets the PMp sensor read count. + * @details \b Inputs: fpgaSensorReadings.readCountPmp + * @details \b Outputs: none + * @return PMp sensor read count + *************************************************************************/ U08 getFPGAPMpReadCount( void ) { - return fpgaSensorReadings.readCountPri; + return fpgaSensorReadings.readCountPmp; } +/*********************************************************************//** + * @brief + * The getFPGAPMpErrorCount function gets the PMp sensor error count. + * @details \b Inputs: fpgaSensorReadings.errorCountPmp + * @details \b Outputs: none + * @return PMp sensor error count + *************************************************************************/ U08 getFPGAPMpErrorCount( void ) { - return fpgaSensorReadings.errorCountPri; + return fpgaSensorReadings.errorCountPmp; } +/*********************************************************************//** + * @brief + * The getFPGAFloaterState function gets the floater level state. + * @details \b Inputs: fpgaSensorReadings.levelSwitch + * @details \b Outputs: none + * @return floater level state + *************************************************************************/ U08 getFPGAFloaterState( void ) { return fpgaSensorReadings.levelSwitch; Index: firmware/App/Services/FpgaRO.h =================================================================== diff -u -rc9aa3971be05f25a7b0d7124e57cc60617c90ad7 -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda --- firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision c9aa3971be05f25a7b0d7124e57cc60617c90ad7) +++ firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) @@ -32,11 +32,11 @@ // ********** public definitions ********** -#define MAX_RO_PUMP_PWM 100U ///< Maximum RO pump PWM duty cycle percentage. // ********** public function prototypes ********** void initFPGARO( void ); +SELF_TEST_STATUS_T execFPGATest( void ); void checkFPGACommFailure( void ); BOOL checkFPGAFEOEFailure( void );