Index: firmware/App/Controllers/Pressures.h =================================================================== diff -u -r544e9782a1b8d444224f41efef38a5204c262722 -r34ae229d1508df89630f4dc5fbe9291d135f0686 --- firmware/App/Controllers/Pressures.h (.../Pressures.h) (revision 544e9782a1b8d444224f41efef38a5204c262722) +++ firmware/App/Controllers/Pressures.h (.../Pressures.h) (revision 34ae229d1508df89630f4dc5fbe9291d135f0686) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file Pressures.h * -* @author (last) Dara Navaei -* @date (last) 13-Apr-2022 +* @author (last) Bill Bracken +* @date (last) 17-Jan-2023 * * @author (original) Sean * @date (original) 04-Apr-2020 @@ -35,22 +35,24 @@ /// Pressure data struct. typedef struct { - F32 roPumpInletPressure; ///< RO pump inlet pressure - F32 roPumpOutletPressure; ///< RO pump outlet pressure - F32 drainPumpInletPressure; ///< Drain pump inlet pressure - F32 drainPumpOutletPressure; ///< Drain pump outlet pressure + F32 roPumpInletPressure; ///< RO pump inlet pressure + F32 roPumpOutletPressure; ///< RO pump outlet pressure + F32 drainPumpInletPressure; ///< Drain pump inlet pressure + F32 drainPumpOutletPressure; ///< Drain pump outlet pressure + F32 barometricPressure; ///< Barometric pressure } PRESSURES_DATA_T; #pragma pack(pop) /// Enumeration of pressure sensors monitored by this module. typedef enum PressureSensors { - PRESSURE_SENSOR_RO_PUMP_INLET = 0, ///< RO pump pressure sensor - PRESSURE_SENSOR_RO_PUMP_OUTLET, ///< RO pump pressure sensor - PRESSURE_SENSOR_DRAIN_PUMP_INLET, ///< drain pump inlet pressure - PRESSURE_SENSOR_DRAIN_PUMP_OUTLET, ///< drain pump outlet pressure - PRESSURE_SENSOR_BAROMETRIC, ///< Barometric pressure sensor - NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors + PRESSURE_FIRST = 0, ///< First pressure to scan + PRESSURE_SENSOR_RO_PUMP_INLET = PRESSURE_FIRST, ///< RO pump pressure sensor + PRESSURE_SENSOR_RO_PUMP_OUTLET, ///< RO pump pressure sensor + PRESSURE_SENSOR_DRAIN_PUMP_INLET, ///< drain pump inlet pressure + PRESSURE_SENSOR_DRAIN_PUMP_OUTLET, ///< drain pump outlet pressure + PRESSURE_SENSOR_BAROMETRIC, ///< Barometric pressure sensor + NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors } PRESSURE_SENSORS_T; // ********** public function prototypes **********