Index: Common.h =================================================================== diff -u -r76ccffbbaf71efeeead896f05c0d800c9367ab73 -r6b43c2eaf10c885e82f33bdb455420e574dc679c --- Common.h (.../Common.h) (revision 76ccffbbaf71efeeead896f05c0d800c9367ab73) +++ Common.h (.../Common.h) (revision 6b43c2eaf10c885e82f33bdb455420e574dc679c) @@ -374,21 +374,33 @@ BOOL useLastTrimmerHeaterDC; ///< Use last trimmer heater duty cycle flag. } DG_SWITCH_RSRVRS_CMD_T; +#pragma pack(push, 1) /// DG usage info structure. typedef struct { - F32 roWaterGenTotalL; ///< Total RO water generated in liters. (Cannot be reset) - F32 roWaterGenSinceLastServiceL; ///< RO water generated since last treatment in liters. - U32 lastBasicFlushCompleteDateEpoch; ///< Last basic flush complete date in epoch. - U32 lastChemDisStartDateEpoch; ///< Last chemical disinfect start date in epoch. - U32 lastChemDisCompleteDateEpoch; ///< Last chemical disinfect complete date in epoch. - U32 lastChemDisFlushCompleteDateEpoch; ///< Last chemical disinfect flush complete date in epoch. - U32 lastHeatDisCompleteDateEpoch; ///< Last heat disinfect complete date in epoch. - U32 lastFilterFlushCompleteDateEpoch; ///< Last filter flush complete date in epoch. - U32 lastResetTimeEpoch; ///< Last time the record was reset in epoch. - U16 crc; ///< CRC for the DG usage info structure. + F32 roWaterGenTotalL; ///< Total RO water generated in liters. (Cannot be reset) + F32 roWaterGenSinceLastServiceL; ///< RO water generated since last treatment in liters. + U32 lastBasicFlushCompleteDateEpoch; ///< Last basic flush complete date in epoch. + U32 lastChemDisStartDateEpoch; ///< Last chemical disinfect start date in epoch. + U32 lastChemDisCompleteDateEpoch; ///< Last chemical disinfect complete date in epoch. + U32 lastChemDisFlushCompleteDateEpoch; ///< Last chemical disinfect flush complete date in epoch. + U32 lastHeatDisCompleteDateEpoch; ///< Last heat disinfect complete date in epoch. + U32 lastFilterFlushCompleteDateEpoch; ///< Last filter flush complete date in epoch. + U32 lastResetTimeEpoch; ///< Last time the record was reset in epoch. + U16 crc; ///< CRC for the DG usage info structure. } DG_USAGE_INFO_RECORD_T; +/// DG service record structure +typedef struct +{ + U08 serviceLoc; ///< DG service location. + U32 lastServiceEpochDate; ///< DG last service date in epoch. + U32 serviceIntervalSeconds; ///< DG service interval in seconds. + U32 lastResetTimeEpoch; ///< Last time the record was reset in epoch. + U16 crc; ///< CRC for the DG service record structure. +} DG_SERVICE_RECORD_T; +#pragma pack(pop) + // **** VectorCAST Definitions **** #ifdef _VECTORCAST_