Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -140,8 +140,8 @@ } // Initialize the conductivity sensor FPGA alarms -// initFPGAPersistentAlarm( FPGA_PERS_ERROR_CPI_COND_SENSOR, ALARM_ID_RO_CPI_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); -// initFPGAPersistentAlarm( FPGA_PERS_ERROR_CPO_COND_SENSOR, ALARM_ID_RO_CPO_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); +// initFPGAPersistentAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, ALARM_ID_RO_P9_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); +// initFPGAPersistentAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, ALARM_ID_RO_P18_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); } /*********************************************************************//** @@ -182,29 +182,18 @@ * @brief * The checkConductivitySensors function checks the read and error counters for * each conductivity sensor. - * @details \b Alarm: ALARM_ID_DD_CD1_SENSOR_FPGA_FAULT if the - * CD1 conductivity sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT if the - * CD2 conductivity sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT if the - * CD3 conductivity sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT if the - * CD4 conductivity sensor is not able to be read. + * @details \b Alarm: TBD * @details \b Inputs: lastConductivityReadCounter, lastConductivityErrorCounter * @details \b Outputs: none * @return none *************************************************************************/ //static void checkConductivitySensors( void ) //{ -// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD1_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD1_SENSOR) ); -// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD2_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD2_SENSOR) ); -// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD3_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD3_SENSOR) ); -// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD4_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD4_SENSOR) ); +// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_P9_COND_SENSOR, getConductivitySensorReadCount(P9_COND) ); +// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_P18_COND_SENSOR, getConductivitySensorReadCount(P18_COND) ); // -// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD1_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD1_SENSOR ) ); -// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD2_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD2_SENSOR ) ); -// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD3_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD3_SENSOR ) ); -// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD4_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD4_SENSOR ) ); +// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, getConductivitySensorErrorCount( P9_COND ) ); +// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_P18_COND_SENSOR, getConductivitySensorErrorCount( P18_COND ) ); //} /*********************************************************************//** Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -141,37 +141,18 @@ * @brief * The checkPressureSensors function checks the read and error counters for * each pressure sensor. - * @details \b Alarm: ALARM_ID_DD_HYD_OUTLET_PRES_TIMEOUT_FAULT if the - * hydraulics outlet pressure sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_BIBAG_PRES_TIMEOUT_FAULT if the - * BiBag pressure sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_SPENT_DIALYSATE_PRES_TIMEOUT_FAULT if the - * spent dialysate pressure sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_FRESH_DIALYSATE_PRES_TIMEOUT_FAULT if the - * fresh dialysate pressure sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_TRANSMEMB_PRES_TIMEOUT_FAULT if the - * Transmembrane pressure sensor is not able to be read. + * @details \b Alarm: TBD * @details \b Inputs: lastPressureReadCounter, lastPressureErrorCounter * @details \b Outputs: none * @return none *************************************************************************/ //static void checkPressureSensors( void ) //{ -// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_WATER_INLET_INPUT_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_WATER_INLET_INPUT ) ); -// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_WATER_INLET_OUTPUT_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_WATER_INLET_OUTPUT ) ); -// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_HYDRAULICS_OUTLET_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_HYDRAULICS_OUTLET ) ); -// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_BIBAG_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_BIBAG ) ); -// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_SPENT_DIALYSATE_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_SPENT_DIALYSATE ) ); -// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_FRESH_DIALYSATE_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_FRESH_DIALYSATE ) ); -// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TRANSMEMBRANE_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_TRANSMEMBRANE ) ); +// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_WATER_INLET_INPUT_PRESSURE, getPressureSensorReadCount( M1_PRES ) ); +// checkFPGAPersistentAlarms( FPGA_PERS_ERROR_WATER_INLET_OUTPUT_PRESSURE, getPressureSensorReadCount( M3_PRES ) ); // -// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_WATER_INLET_INPUT_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_WATER_INLET_INPUT ) ); -// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_WATER_INLET_OUTPUT_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_WATER_INLET_OUTPUT ) ); -// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_HYDRAULICS_OUTLET_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_HYDRAULICS_OUTLET ) ); -// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_BIBAG_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_BIBAG ) ); -// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_SPENT_DIALYSATE_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_SPENT_DIALYSATE ) ); -// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_FRESH_DIALYSATE_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_FRESH_DIALYSATE ) ); -// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_TRANSMEMBRANE_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_TRANSMEMBRANE ) ); +// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_WATER_INLET_INPUT_PRESSURE, getPressureSensorErrorCount( M1_PRES ) ); +// checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_WATER_INLET_OUTPUT_PRESSURE, getPressureSensorErrorCount( M3_PRES ) ); //} /*********************************************************************//** Index: firmware/App/Drivers/TemperatureSensors.c =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -19,7 +19,6 @@ #include // For memset() #include "Conductivity.h" -#include "Flow.h" #include "FpgaRO.h" #include "MessageSupport.h" #include "Messaging.h" @@ -329,14 +328,6 @@ temperature = getConductivityTemperatureValue( P18_COND ); break; - case P7_TEMP: - temperature = getFilteredFlowSensorTemperature( P7_FLOW ); - break; - - case P16_TEMP: - temperature = getFilteredFlowSensorTemperature( P16_FLOW ); - break; - // case TEMPSENSORS_BOARD_TEMPERATURE: // //TODO : Need details on calculations. // break; @@ -412,12 +403,12 @@ // // switch( sesnorIndex ) // { -// case TEMP_SENSOR_TRO1: -// //calId = CAL_DATA_TRO1_TEMP; +// case P23_TEMP: +// //calId = CAL_DATA_P23_TEMP; // break; // -// case TEMP_SENSOR_TRO2: -// //calId = CAL_DATA_TRO2_TEMP; +// case P22_TEMP: +// //calId = CAL_DATA_P22_TEMP; // break; // // default: Index: firmware/App/Drivers/TemperatureSensors.h =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -40,8 +40,6 @@ P22_TEMP, ///< Pre-tank temperature sensor at coldest point. P10_TEMP, ///< Inlet conductivity sensor temperature. P19_TEMP, ///< Outlet conductivity sensor temperature. - P7_TEMP, ///< Inlet flow sensor temperature. - P16_TEMP, ///< Outlet flow sensor temperature. NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors } TEMPERATURE_SENSOR_T; Index: firmware/App/Monitors/Flow.c =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Monitors/Flow.c (.../Flow.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Monitors/Flow.c (.../Flow.c) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -368,8 +368,10 @@ { FLOW_TEMP_DATA_T data; - data.FlowP7 = getFilteredFlow( P7_FLOW ); - data.FlowP16 = getFilteredFlow( P16_FLOW ); + data.p7Flow = getFilteredFlow( P7_FLOW ); + data.p16Flow = getFilteredFlow( P16_FLOW ); + data.p7Temp = getFilteredFlowSensorTemperature( P7_FLOW ); + data.p16Temp = getFilteredFlowSensorTemperature( P16_FLOW ); broadcastData( MSG_ID_RO_FLOW_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( FLOW_TEMP_DATA_T ) ); flowsDataPublicationTimerCounter = 0; Index: firmware/App/Monitors/Flow.h =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Monitors/Flow.h (.../Flow.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Monitors/Flow.h (.../Flow.h) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -35,8 +35,10 @@ /// Flow data record. typedef struct { - F32 FlowP7; ///< Flow rate at water inlet (P7) - F32 FlowP16; ///< Flow rate at RO filter outlet (P16) + F32 p7Flow; ///< P7 flow rate at water inlet. + F32 p16Flow; ///< P16 flow rate at RO filter outlet. + F32 p7Temp; ///< P7 temperature from inlet flow sensor. + F32 p16Temp; ///< P16 temperature from outlet flow sensor. } FLOW_TEMP_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Monitors/Level.h =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Monitors/Level.h (.../Level.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Monitors/Level.h (.../Level.h) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -41,7 +41,7 @@ NUM_OF_LEVELS_STATES ///< Number of level states } LEVEL_STATE_T; -/// DD floater and level sensor data publish structure +/// RO floater and level sensor data publish structure typedef struct { U32 p25Level; ///< P25 level from floater sensor. Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -232,19 +232,19 @@ * and triggers an alarm when pressure value is out of allowed range. * @details \b Inputs: RO pump inlet pressure sensor value * @details \b Outputs: Triggers low pressure persistent alarm - * @details \b Alarms: ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE when + * @details \b Alarms: ALARM_ID_RO_INLET_WATER_PRESSURE_IN_LOW_RANGE when * the inlet water pressure is less than the low limit. - * @details \b Alarms: ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE when + * @details \b Alarms: ALARM_ID_RO_INLET_WATER_PRESSURE_IN_HIGH_RANGE when * the inlet water pressure is greater than the high limit. * @return none *************************************************************************/ //void checkInletWaterPressure( void ) //{ -// F32 pressureIn = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_INPUT ); -// F32 PressureOut = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_OUTPUT ); +// F32 pressureIn = getFilteredPressure( M1_PRES ); +// F32 PressureOut = getFilteredPressure( M3_PRES ); // // //Check Water Inlet Input pressure range -// if ( VALVE_STATE_OPEN == getValveStateName( VWI ) ) +// if ( VALVE_STATE_OPEN == getValveStateName( M4_VALV ) ) // { // BOOL isPressureTooLow; // BOOL isPressureTooHigh; @@ -254,27 +254,27 @@ // isPressureTooLow = ( pressureIn < maxInletWaterPressureWarningLow ? TRUE : FALSE ); // isPressureTooHigh = ( pressureIn > MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ? TRUE : FALSE ); // -// if ( TRUE == isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE ) ) +// if ( TRUE == isAlarmActive( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_LOW_RANGE ) ) // { // isPressureTooLow = ( pressureIn >= minInletWaterPressureWarningLow ? FALSE : TRUE ); // } -// checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE, isPressureTooLow, pressureIn, maxInletWaterPressureWarningLow ); +// checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_LOW_RANGE, isPressureTooLow, pressureIn, maxInletWaterPressureWarningLow ); // -// if ( TRUE == isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) ) +// if ( TRUE == isAlarmActive( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) ) // { // isPressureTooHigh = ( pressureIn <= MIN_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ? FALSE : TRUE ); // } -// checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE, isPressureTooHigh, pressureIn, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ); +// checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_HIGH_RANGE, isPressureTooHigh, pressureIn, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ); // } // else // { -// // VWI is closed - clear all alarms -// checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE, FALSE, pressureIn, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ); -// checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE, FALSE, pressureIn, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ); +// // M4 valve is closed - clear all alarms +// checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_LOW_RANGE, FALSE, pressureIn, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ); +// checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_HIGH_RANGE, FALSE, pressureIn, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ); // } // // //Check Water Inlet Output pressure range -// if ( VALVE_STATE_OPEN == getValveStateName( VWI ) ) +// if ( VALVE_STATE_OPEN == getValveStateName( M4_VALV ) ) // { // BOOL isPressureTooLow; // BOOL isPressureTooHigh; @@ -284,23 +284,23 @@ // isPressureTooLow = ( PressureOut < maxInletWaterPressureWarningLow ? TRUE : FALSE ); // isPressureTooHigh = ( PressureOut > MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG ? TRUE : FALSE ); // -// if ( TRUE == isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE ) ) +// if ( TRUE == isAlarmActive( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_LOW_RANGE ) ) // { // isPressureTooLow = ( PressureOut >= minInletWaterPressureWarningLow ? FALSE : TRUE ); // } -// checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE, isPressureTooLow, PressureOut, maxInletWaterPressureWarningLow ); +// checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_LOW_RANGE, isPressureTooLow, PressureOut, maxInletWaterPressureWarningLow ); // -// if ( TRUE == isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE ) ) +// if ( TRUE == isAlarmActive( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_HIGH_RANGE ) ) // { // isPressureTooHigh = ( PressureOut <= MIN_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG ? FALSE : TRUE ); // } -// checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE, isPressureTooHigh, PressureOut, MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG ); +// checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_HIGH_RANGE, isPressureTooHigh, PressureOut, MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG ); // } // else // { -// // VWI is closed - clear all alarms -// checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE, FALSE, PressureOut, MIN_INLET_WATER_PRES_OUT_WARNING_LOW_PSIG ); -// checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE, FALSE, PressureOut, MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG ); +// // M4 valve is closed - clear all alarms +// checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_LOW_RANGE, FALSE, PressureOut, MIN_INLET_WATER_PRES_OUT_WARNING_LOW_PSIG ); +// checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_HIGH_RANGE, FALSE, PressureOut, MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG ); // } //} @@ -480,19 +480,19 @@ { PRESSURE_TEMP_DATA_T data; - data.PressureM1 = getFilteredPressure( M1_PRES ); - data.PressureM3 = getFilteredPressure( M3_PRES ); - data.PressureP8 = getFilteredPressure( P8_PRES ); - data.PressureP13 = getFilteredPressure( P13_PRES ); - data.PressureP17 = getFilteredPressure( P17_PRES ); - data.PressureX1 = getFilteredPressure( X1_PRES ); + data.m1Pressure = getFilteredPressure( M1_PRES ); + data.m3Pressure = getFilteredPressure( M3_PRES ); + data.p8Pressure = getFilteredPressure( P8_PRES ); + data.p13Pressure = getFilteredPressure( P13_PRES ); + data.p17Pressure = getFilteredPressure( P17_PRES ); + data.x1Pressure = getFilteredPressure( X1_PRES ); - data.TempM1 = getFilteredPressureSensorTemperature( M1_PRES ); - data.TempM3 = getFilteredPressureSensorTemperature( M3_PRES ); - data.TempP8 = getFilteredPressureSensorTemperature( P8_PRES ); - data.TempP13 = getFilteredPressureSensorTemperature( P13_PRES ); - data.TempP17 = getFilteredPressureSensorTemperature( P17_PRES ); - data.TempX1 = getFilteredPressureSensorTemperature( X1_PRES ); + data.m1Temp = getFilteredPressureSensorTemperature( M1_PRES ); + data.m3Temp = getFilteredPressureSensorTemperature( M3_PRES ); + data.p8Temp = getFilteredPressureSensorTemperature( P8_PRES ); + data.p13Temp = getFilteredPressureSensorTemperature( P13_PRES ); + data.p17Temp = getFilteredPressureSensorTemperature( P17_PRES ); + data.x1Temp = getFilteredPressureSensorTemperature( X1_PRES ); broadcastData( MSG_ID_RO_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DATA_T ) ); pressuresDataPublicationTimerCounter = 0; Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -35,18 +35,18 @@ /// Pressure data struct. typedef struct { - F32 PressureM1; ///< Pressure before pressure regulator (M1) - F32 PressureM3; ///< Pressure after pressure regulator (M3) - F32 PressureP8; ///< Pressure before inlet conductivity sensor (P8) - F32 PressureP13; ///< Pressure before RO filter (P13) - F32 PressureP17; ///< Pressure after RO filter (P17) - F32 PressureX1; ///< Pressure before RO pump (X1) - F32 TempM1; ///< Temperature before pressure regulator (M1) - F32 TempM3; ///< Temperature after pressure regulator (M3) - F32 TempP8; ///< Temperature before inlet conductivity sensor (P8) - F32 TempP13; ///< Temperature before RO filter (P13) - F32 TempP17; ///< Temperature after RO filter (P17) - F32 TempX1; ///< Temperature before RO pump (X1) + F32 m1Pressure; ///< Pressure before pressure regulator (M1) + F32 m3Pressure; ///< Pressure after pressure regulator (M3) + F32 p8Pressure; ///< Pressure before inlet conductivity sensor (P8) + F32 p13Pressure; ///< Pressure before RO filter (P13) + F32 p17Pressure; ///< Pressure after RO filter (P17) + F32 x1Pressure; ///< Pressure before RO pump (X1) + F32 m1Temp; ///< Temperature before pressure regulator (M1) + F32 m3Temp; ///< Temperature after pressure regulator (M3) + F32 p8Temp; ///< Temperature before inlet conductivity sensor (P8) + F32 p13Temp; ///< Temperature before RO filter (P13) + F32 p17Temp; ///< Temperature after RO filter (P17) + F32 x1Temp; ///< Temperature before RO pump (X1) } PRESSURE_TEMP_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -209,13 +209,11 @@ { TEMPERATURE_SENSORS_DATA_T data; - data.tempP23 = getTemperatureValue( P23_TEMP ); - data.tempP23 = getTemperatureValue( P22_TEMP ); - data.tempP10 = getTemperatureValue( P10_TEMP ); - data.tempP19 = getTemperatureValue( P19_TEMP ); - data.tempP7 = getTemperatureValue( P7_TEMP ); - data.tempP16 = getTemperatureValue( P16_TEMP ); - data.tempBoard = 0.0F; // TODO + data.p23Temp = getTemperatureValue( P23_TEMP ); + data.p23Temp = getTemperatureValue( P22_TEMP ); + data.p10Temp = getTemperatureValue( P10_TEMP ); + data.p19Temp = getTemperatureValue( P19_TEMP ); + data.boardTemp = 0.0F; // TODO broadcastData( MSG_ID_RO_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) ); dataPublicationTimerCounter = 0; Index: firmware/App/Monitors/Temperature.h =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -35,13 +35,11 @@ /// Temperature sensors data structure. typedef struct { - F32 tempP23; ///< P23 temperature sensor. - F32 tempP22; ///< P22 temperature sensor. - F32 tempP10; ///< P10 temperature from inlet conductivity sensor. - F32 tempP19; ///< P19 temperature from outlet conductivity sensor. - F32 tempP7; ///< P7 temperature from inlet flow sensor. - F32 tempP16; ///< P16 temperature from outlet flow sensor. - F32 tempBoard; ///< Board temperature sensor + F32 p23Temp; ///< P23 temperature sensor. + F32 p22Temp; ///< P22 temperature sensor. + F32 p10Temp; ///< P10 temperature from inlet conductivity sensor. + F32 p19Temp; ///< P19 temperature from outlet conductivity sensor. + F32 boardTemp; ///< Board temperature sensor } TEMPERATURE_SENSORS_DATA_T; // ********** public function prototypes **********