Index: firmware/App/Controllers/ConductivitySensors.c =================================================================== diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -rad6b3443575d3f6bbac52237866e19a212d36bc1 --- firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) +++ firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision ad6b3443575d3f6bbac52237866e19a212d36bc1) @@ -78,6 +78,7 @@ #define DATA_PUBLISH_COUNTER_START_COUNT 40 ///< Data publish counter start count. #define COND_SENSOR_BAD_STATUS_PERSISTENCE_PERIOD ( 1 * MS_PER_SECOND ) ///< Conductivity sensor bad status persistence period. +#define COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< Conductivity sensors FPGA error timeout in milliseconds. #pragma pack(push,1) /// Emstat pico measurement data package structure @@ -146,7 +147,7 @@ static U32 prefixStrToSIFactor( U08 prefix ); static void processEmstatBoard( EMSTAT_BOARD_T board ); -static void processEmstatSensorRead( EMSTAT_READ_T* readPackage, U08 emstatByte, U16 fpgaReadCount, U08 fpgaErrorCount ); +static void processEmstatSensorRead( EMSTAT_READ_T* readPackage, U08 emstatByte ); static void processEmstatMeasurementDataPackets( U08 boardSensorIndex, EMSTAT_READ_T* readPackage, EMSTAT_VARIABLE_T* receivedPackets ); static F32 getCalibrationAppliedConductivityValue( U32 sensorId, F32 compensatedValue ); @@ -197,6 +198,10 @@ initPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, RO_REJECTION_RATIO_PERSISTENCE_PERIOD, RO_REJECTION_RATIO_PERSISTENCE_PERIOD ); initPersistentAlarm( ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS, COND_SENSOR_BAD_STATUS_PERSISTENCE_PERIOD, COND_SENSOR_BAD_STATUS_PERSISTENCE_PERIOD ); initPersistentAlarm( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD ); + + // Initialize the conductivity sensors' FPGA alarms + initFPGAPersistentAlarm( FPGA_PERS_ERROR_CPI_CPO_COND_SENSORS, ALARM_ID_DG_CPI_CPO_SENSORS_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD1_CD2_COND_SENSORS, ALARM_ID_DG_CD1_CD2_SENSORS_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); } /*********************************************************************//** @@ -454,7 +459,7 @@ } else { - if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) ) // TODO remove time windowed + if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) ) { #ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_COND_SENSOR_CHECK ) != SW_CONFIG_ENABLE_VALUE ) @@ -508,22 +513,23 @@ { U08 emstatByte = 0; U08 fpgaErrorCount = 0; - U16 fpgaReadCount = 0; switch ( board ) { case EMSTAT_CPI_CPO_BOARD: emstatByte = getFPGAEmstatCPiCPoByteOut(); fpgaErrorCount = getFPGAEmstatCPiCPoRxErrCount(); - fpgaReadCount = getFPGAEmstatCPiCPoRxFifoCount(); - processEmstatSensorRead( &emstatBoardRead[ EMSTAT_CPI_CPO_BOARD ], emstatByte, fpgaReadCount, fpgaErrorCount ); + + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CPI_CPO_COND_SENSORS, fpgaErrorCount ); + processEmstatSensorRead( &emstatBoardRead[ EMSTAT_CPI_CPO_BOARD ], emstatByte ); break; case EMSTAT_CD1_CD2_BOARD: emstatByte = getFPGAEmstatCD1CD2OutByte(); fpgaErrorCount = getFPGAEmstatCD1CD2RxErrCount(); - fpgaReadCount = getFPGAEmstatCD1CD2RxFifoCount(); - processEmstatSensorRead( &emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ], emstatByte, fpgaReadCount, fpgaErrorCount ); + + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD1_CD2_COND_SENSORS, fpgaErrorCount ); + processEmstatSensorRead( &emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ], emstatByte ); break; default: @@ -540,11 +546,9 @@ * @details Outputs: none * @param read package the structure of each Emstat board * @param emstatByte the received byte from the sensor - * @param fpgaReadCount the FPGA read count - * @param fpgaErrorCount the FGPA error count * @return none *************************************************************************/ -static void processEmstatSensorRead( EMSTAT_READ_T* readPackage, U08 emstatByte, U16 fpgaReadCount, U08 fpgaErrorCount ) +static void processEmstatSensorRead( EMSTAT_READ_T* readPackage, U08 emstatByte ) { switch ( emstatByte ) { @@ -576,28 +580,6 @@ } break; } - -#ifndef DISABLE_FPGA_ALARMS_UNTIL_THE_NEW_PERSISTENT - // Only process the FPGA error and count values if the DG Software is not in the POST mode - if ( getCurrentOperationMode() != DG_MODE_INIT ) - { - if ( ( fpgaReadCount != readPackage->fpgaPreviousCount ) && ( 0 == ( fpgaReadCount & EMSTAT_PICO_FIFO_EMPTY_MASK ) ) && - ( fpgaErrorCount != readPackage->fpgaPreviousErrorCount ) ) - { - // Everything is fine update the previous read with the current read - readPackage->fpgaPreviousCount = fpgaReadCount; - } - else if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) ) // TODO remove time windowed - { -#ifndef _RELEASE_ - if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_COND_SENSOR_CHECK ) != SW_CONFIG_ENABLE_VALUE ) -#endif - { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, CONDUCTIVITYSENSORS_CD1_SENSOR, CONDUCTIVITYSENSORS_CD2_SENSOR ); - } - } - } -#endif } /*********************************************************************//** Index: firmware/App/Controllers/Fans.c =================================================================== diff -u -r2e21405574597474db0ebae86cdd7fa2d517f71c -rad6b3443575d3f6bbac52237866e19a212d36bc1 --- firmware/App/Controllers/Fans.c (.../Fans.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) +++ firmware/App/Controllers/Fans.c (.../Fans.c) (revision ad6b3443575d3f6bbac52237866e19a212d36bc1) @@ -62,7 +62,7 @@ /// Fans exec states typedef enum fans_Exec_States { - FANS_EXEC_STATE_WAIT_FOR_POST_STATE = 0, ///< Fans exec state start state. + FANS_EXEC_STATE_START = 0, ///< Fans exec state start state. FANS_EXEC_STATE_RUN_STATE, ///< Fans exec state run state. NUM_OF_FANS_EXEC_STATES, ///< Number of fans exec states. } FANS_EXEC_STATES_T; @@ -78,13 +78,12 @@ // ********** private data ********** static FAN_STATUS_T fansStatus; ///< Fans status. -static FANS_EXEC_STATES_T fansExecState = FANS_EXEC_STATE_WAIT_FOR_POST_STATE; ///< Fans exec state. -static U32 fansControlCounter = 0; ///< Fans control interval counter. +static FANS_EXEC_STATES_T fansExecState; ///< Fans exec state. +static U32 fansControlCounter; ///< Fans control interval counter. static U32 fansPublishCounter; ///< Fans data publish interval counter. -static BOOL isPOSTComplete = FALSE; ///< Flag that indicates whether POST is complete or not. -static BOOL hasAlarmBeenRaised = FALSE; ///< Flag that indicates whether the RPM out of range alarm been raise. +static BOOL hasAlarmBeenRaised; ///< Flag that indicates whether the RPM out of range alarm been raise. static U32 rpmAlarmStartTimeOffset; ///< RPM out of range alarm start time offset. -static U32 rpmAlarmStartTime = 0; ///< RPM alarm start time. +static U32 rpmAlarmStartTime; ///< RPM alarm start time. static DG_FANS_CAL_RECORD_T fansCalReocrd; ///< Fans calibration record. /// Temperature to duty cycle conversion slope (duty cycle not in percent) @@ -97,7 +96,7 @@ // ********** private function prototypes ********** -static FANS_EXEC_STATES_T handleExecStateWaitForPOST( void ); +static FANS_EXEC_STATES_T handleExecStateStart( void ); static FANS_EXEC_STATES_T handleExecStateRun( void ); static void setInletFansDutyCycle( F32 pwm ); @@ -112,7 +111,7 @@ * The initFans function initializes the fans module. * @details Inputs: none * @details Outputs: fansExecState, fansControlCounter, fansPublishCounter, - * isPOSTComplete, hasAlarmBeenRaised, rpmAlarmStartTime, + * hasAlarmBeenRaised, rpmAlarmStartTime, * fansStatus, rpmAlarmStartTimeOffset * @return none *************************************************************************/ @@ -121,10 +120,9 @@ FAN_NAMES_T fan; // Initialize the variables - fansExecState = FANS_EXEC_STATE_WAIT_FOR_POST_STATE; + fansExecState = FANS_EXEC_STATE_START; fansControlCounter = 0; fansPublishCounter = DATA_PUBLISH_COUNTER_START_COUNT; - isPOSTComplete = FALSE; hasAlarmBeenRaised = FALSE; rpmAlarmStartTime = 0; rpmAlarmStartTimeOffset = 0; @@ -160,8 +158,6 @@ BOOL calStatus = getNVRecord2Driver( GET_CAL_FANS_RECORD, (U08*)&fansCalReocrd, sizeof( DG_FANS_CAL_RECORD_T ), NUM_OF_CAL_DATA_FANS, ALARM_ID_NO_ALARM ); - // Signal POST is completed - isPOSTComplete = TRUE; if ( TRUE == calStatus ) { @@ -186,8 +182,8 @@ { switch ( fansExecState ) { - case FANS_EXEC_STATE_WAIT_FOR_POST_STATE: - fansExecState = handleExecStateWaitForPOST(); + case FANS_EXEC_STATE_START: + fansExecState = handleExecStateStart(); break; case FANS_EXEC_STATE_RUN_STATE: @@ -248,18 +244,13 @@ * @details Outputs: none * @return the next state of the exec state machine *************************************************************************/ -static FANS_EXEC_STATES_T handleExecStateWaitForPOST( void ) +static FANS_EXEC_STATES_T handleExecStateStart( void ) { - FANS_EXEC_STATES_T state = FANS_EXEC_STATE_WAIT_FOR_POST_STATE; + FANS_EXEC_STATES_T state = FANS_EXEC_STATE_RUN_STATE; - // Wait for the self test to finish before starting the fans - if ( TRUE == isPOSTComplete ) - { - // Start the fans with minimum PWM. The control will decide the next PWM automatically. - setInletFansDutyCycle( FANS_MIN_DUTY_CYCLE ); - setOutletFansDutyCycle( FANS_MIN_DUTY_CYCLE ); - state = FANS_EXEC_STATE_RUN_STATE; - } + // Start the fans with minimum PWM. The control will decide the next PWM automatically. + setInletFansDutyCycle( FANS_MIN_DUTY_CYCLE ); + setOutletFansDutyCycle( FANS_MIN_DUTY_CYCLE ); return state; } Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -re6c4c61c793a91f9ed9dfe969e01bdeee565347d -rad6b3443575d3f6bbac52237866e19a212d36bc1 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision e6c4c61c793a91f9ed9dfe969e01bdeee565347d) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision ad6b3443575d3f6bbac52237866e19a212d36bc1) @@ -156,7 +156,7 @@ initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS ); // Initialize the FPGA persistent alarm - initFPGAPersistentAlarm( MAIN_PRIMARY_HEATER_VOLTAGE_ADC, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT, + initFPGAPersistentAlarm( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT, MAIN_PIMARY_HEATER_VOLTAGE_ADC_FPGA_ERROR_TIMEOUT_MS, MAIN_PIMARY_HEATER_VOLTAGE_ADC_FPGA_ERROR_TIMEOUT_MS ); } @@ -888,7 +888,7 @@ #endif { // If the system is DVT, check the FPGA persistent alarm of the main primary heater's voltage ADC - checkFPGAPersistentAlarms( MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCErrorCount(), getFPGAHeaterGateADCReadCount() ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCErrorCount(), getFPGAHeaterGateADCReadCount() ); } F32 smallPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_SMALL_PRIM_HTR_V ); Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -r2e21405574597474db0ebae86cdd7fa2d517f71c -rad6b3443575d3f6bbac52237866e19a212d36bc1 --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision ad6b3443575d3f6bbac52237866e19a212d36bc1) @@ -144,8 +144,8 @@ LOAD_CELL_PRIMARY_BACKUP_MAX_DRIFT_PERSISTENT_PERIOD_MS ); // Initialize the FPGA persistent alarms - initFPGAPersistentAlarm( LOAD_CELL_A1_B1_SENSORS, ALARM_ID_DG_LOAD_CELL_A1_B1_FPGA_FAULT, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS ); - initFPGAPersistentAlarm( LOAD_CELL_A2_B2_SENSORS, ALARM_ID_DG_LOAD_CELL_A2_B2_FPGA_FAULT, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_LOAD_CELL_A1_B1_SENSORS, ALARM_ID_DG_LOAD_CELL_A1_B1_FPGA_FAULT, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_LOAD_CELL_A2_B2_SENSORS, ALARM_ID_DG_LOAD_CELL_A2_B2_FPGA_FAULT, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS ); } /*********************************************************************//** @@ -186,8 +186,8 @@ SET_ALARM_WITH_1_U32_DATA( ALARM_ID__AVAILABLE_13, ( a1 | a2 | b1 | b2 ) ) }*/ - checkFPGAPersistentAlarms( LOAD_CELL_A1_B1_SENSORS, getFPGAADC1ErrorCount(), getFPGAADC1ReadCount() ); - checkFPGAPersistentAlarms( LOAD_CELL_A2_B2_SENSORS, getFPGAADC2ErrorCount(), getFPGAADC2ReadCount() ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_LOAD_CELL_A1_B1_SENSORS, getFPGAADC1ErrorCount(), getFPGAADC1ReadCount() ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_LOAD_CELL_A2_B2_SENSORS, getFPGAADC2ErrorCount(), getFPGAADC2ReadCount() ); // Check if a new calibration is available if ( TRUE == isNewCalibrationRecordAvailable() ) Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -re6c4c61c793a91f9ed9dfe969e01bdeee565347d -rad6b3443575d3f6bbac52237866e19a212d36bc1 --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision e6c4c61c793a91f9ed9dfe969e01bdeee565347d) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision ad6b3443575d3f6bbac52237866e19a212d36bc1) @@ -40,9 +40,8 @@ F32 roPumpTgtPressure; ///< RO pump target pressure. F32 roPumpDutyCycle; ///< RO pump duty cycle. U32 roPumpState; ///< RO pump current state. - F32 roPumpTgtFlowRateLM; ///< RO pump target flow rate in L/min + F32 roPumpTgtFlowRateLM; ///< RO pump target flow rate in L/min. F32 roPumpFBDutyCycle; ///< RO pump feedback duty cycle. - F32 roPumpMeasFlowWithConcPumps; ///< RO pump measured flow with the concentrate pumps. } RO_PUMP_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -r2e21405574597474db0ebae86cdd7fa2d517f71c -rad6b3443575d3f6bbac52237866e19a212d36bc1 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision ad6b3443575d3f6bbac52237866e19a212d36bc1) @@ -330,11 +330,11 @@ initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS ); // Initialize the FPGA persistent alarms - initFPGAPersistentAlarm( TWO_WIRE_ADC_TEMP_SENSORS, ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); - initFPGAPersistentAlarm( THD_ADC_TEMP_SENSORS, ALARM_ID_DG_THD_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); - initFPGAPersistentAlarm( TDI_ADC_TEMP_SENSORS, ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); - initFPGAPersistentAlarm( TRO_ADC_TEMP_SENSORS, ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); - initFPGAPersistentAlarm( BARO_SENSOR, ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_TWO_WIRE_ADC_TEMP_SENSORS, ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_THD_ADC_TEMP_SENSORS, ALARM_ID_DG_THD_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_TDI_ADC_TEMP_SENSORS, ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_TRO_ADC_TEMP_SENSORS, ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_BARO_SENSOR, ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); } /*********************************************************************//** @@ -455,7 +455,7 @@ *************************************************************************/ F32 getTemperatureValue( U32 sensorIndex ) { - F32 temperature = 0.0; + F32 temperature = 0.0F; if ( sensorIndex < NUM_OF_TEMPERATURE_SENSORS ) { @@ -515,7 +515,7 @@ *************************************************************************/ static F32 getADC2TempConversion( F32 avgADC, U32 gain, U32 refResistance, U32 zeroDegResistance, F32 adcConversionCoeff ) { - F32 temperature = 0.0; + F32 temperature = 0.0F; if ( fabs( adcConversionCoeff ) <= NEARLY_ZERO ) { @@ -823,7 +823,7 @@ errorCount = (U32)getFPGARTDErrorCount(); readCount = (U32)getFPGARTDReadCount(); - checkFPGAPersistentAlarms( TWO_WIRE_ADC_TEMP_SENSORS, errorCount, readCount ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TWO_WIRE_ADC_TEMP_SENSORS, errorCount, readCount ); processTempSnsrsADCRead( TEMPSENSORS_INLET_PRIMARY_HEATER, getFPGATPiTemp() ); processTempSnsrsADCRead( TEMPSENSORS_OUTLET_PRIMARY_HEATER, getFPGATPoTemp() ); processTempSnsrsADCRead( TEMPSENSORS_CONDUCTIVITY_SENSOR_1, getFPGACD1Temp() ); @@ -837,7 +837,7 @@ errorCount = (U32)getFPGATHdErrorCount(); readCount = (U32)getFPGATHdReadCount(); - checkFPGAPersistentAlarms( THD_ADC_TEMP_SENSORS, errorCount, readCount ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_THD_ADC_TEMP_SENSORS, errorCount, readCount ); processTempSnsrsADCRead( TEMPSENSORS_HEAT_DISINFECT, getFPGATHdTemp() ); processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_THD_RTD, getFPGATHdInternalTemp() ); @@ -849,21 +849,21 @@ errorCount = getFPGABaroErrorCount(); readCount = getFPGABaroReadCount(); - checkFPGAPersistentAlarms( BARO_SENSOR, errorCount, readCount ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_BARO_SENSOR, errorCount, readCount ); processTempSnsrsADCRead( TEMPSENSORS_BAROMETRIC_TEMP_SENSOR, getFPGABaroTemperature() ); } errorCount = (U32)getFPGATRoErrorCount(); readCount = (U32)getFPGATRoReadCount(); - checkFPGAPersistentAlarms( TRO_ADC_TEMP_SENSORS, errorCount, readCount ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TRO_ADC_TEMP_SENSORS, errorCount, readCount ); processTempSnsrsADCRead( TEMPSENSORS_OUTLET_REDUNDANT, getFPGATRoTemp() ); processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_TRO_RTD, getFPGATRoInternalTemp() ); errorCount = (U32)getFPGATDiErrorCount(); readCount = (U32)getFPGATDiReadCount(); - checkFPGAPersistentAlarms( TDI_ADC_TEMP_SENSORS, errorCount, readCount ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TDI_ADC_TEMP_SENSORS, errorCount, readCount ); processTempSnsrsADCRead( TEMPSENSORS_INLET_DIALYSATE, getFPGATDiTemp() ); processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_TDI_RTD, getFPGATDiInternalTemp() ); @@ -1100,7 +1100,7 @@ { if ( TRUE == isTestingActivated() ) { - result = TRUE; + result = TRUE; tempSensors[ sensorIndex ].temperatureValues.ovData = temperature; tempSensors[ sensorIndex ].temperatureValues.override = OVERRIDE_KEY; } @@ -1126,7 +1126,7 @@ { if ( TRUE == isTestingActivated() ) { - result = TRUE; + result = TRUE; tempSensors[ sensorIndex ].temperatureValues.override = OVERRIDE_RESET; tempSensors[ sensorIndex ].temperatureValues.ovData = tempSensors[ sensorIndex ].temperatureValues.ovInitData; } Index: firmware/App/DGCommon.h =================================================================== diff -u -r2e21405574597474db0ebae86cdd7fa2d517f71c -rad6b3443575d3f6bbac52237866e19a212d36bc1 --- firmware/App/DGCommon.h (.../DGCommon.h) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) +++ firmware/App/DGCommon.h (.../DGCommon.h) (revision ad6b3443575d3f6bbac52237866e19a212d36bc1) @@ -35,8 +35,6 @@ // #define TASK_TIMING_OUTPUT_ENABLED 1 // Build switch // re-purposes drain pump enable pin for task timing #define DISABLE_ACK_ALARM 1 // Build switch - #define DISABLE_FPGA_ALARMS_UNTIL_THE_NEW_PERSISTENT - #include #include #endif