Index: firmware/App/Monitors/Conductivity.h =================================================================== diff -u -rb04db69f541f245e543df343257bcbdb73fbbc3d -r5e77ff3ec89af3b613788694bacfcbd874682396 --- firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision b04db69f541f245e543df343257bcbdb73fbbc3d) +++ firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision 5e77ff3ec89af3b613788694bacfcbd874682396) @@ -41,29 +41,48 @@ /// Conductivity data struct. typedef struct { - F32 d17Cond; ///< CD1 conductivity sensor value - F32 d27Cond; ///< CD2 conductivity sensor value - F32 d29Cond; ///< CD3 conductivity sensor value - F32 d43Cond; ///< CD4 conductivity sensor value - F32 d74Cond; ///< CD5 conductivity sensor value + F32 d17Cond; ///< D17 conductivity sensor value + F32 d27Cond; ///< D27 conductivity sensor value + F32 d29Cond; ///< D29 conductivity sensor value + F32 d43Cond; ///< D43 conductivity sensor value + F32 d74Cond; ///< D74 conductivity sensor value } DD_CONDUCTIVITY_DATA_T; /// Conductivity data struct. typedef struct { - F32 p9Conductivity; ///< (P9) conductivity sensor value - F32 p18Conductivity; ///< (P18) conductivity sensor value + F32 p9Conductivity; ///< P9 conductivity sensor value + F32 p18Conductivity; ///< P18 conductivity sensor value } FP_CONDUCTIVITY_DATA_T; /// RO rejection ratio data struct. typedef struct { - F32 rawRORejectionRatio; ///< RO rejection ratio during tank full and fill state - F32 rawRORejectionRatioTankFill; ///< RO rejection ratio during tank fill state - F32 avgRORejectionRatio; ///< RO rejection ratio average during tank full and fill state - F32 avgRORejectionRatioTankFill; ///< RO rejection ratio average during tank fill state - U32 genPermeateState; ///< Permeate tank state + F32 rawRORejectionRatio; ///< RO rejection ratio during tank full and fill state + F32 rawRORejectionRatioTankFill; ///< RO rejection ratio during tank fill state + F32 avgRORejectionRatio; ///< RO rejection ratio average during tank full and fill state + F32 avgRORejectionRatioTankFill; ///< RO rejection ratio average during tank fill state + U32 genPermeateState; ///< Permeate tank state } RO_REJECTION_RATIO_DATA_T; + +typedef struct +{ + F32 d17CondResist; ///< D17 raw resistance value from conductivity + F32 d27CondResist; ///< D27 raw resistance value from conductivity + F32 d29CondResist; ///< D29 raw resistance value from conductivity + F32 d43CondResist; ///< D43 raw resistance value from conductivity + F32 d74CondResist; ///< D74 raw resistance value from conductivity + F32 p9CondResist; ///< P9 raw resistance value from conductivity + F32 p18CondResist; ///< P18 raw resistance value from conductivity + F32 d17RTDResist; ///< D17 raw resistance value from RTD + F32 d27RTDResist; ///< D27 raw resistance value from RTD + F32 d29RTDResist; ///< D29 raw resistance value from RTD + F32 d43RTDResist; ///< D43 raw resistance value from RTD + F32 d74RTDResist; ///< D74 raw resistance value from RTD + F32 p9RTDResist; ///< P9 raw resistance value from RTD + F32 p18RTDResist; ///< P18 raw resistance value from RTD +} CONDUCTIVITY_RESISTANCE_DATA_T; + #pragma pack(pop) // ********** public function prototypes **********