Index: Common.h =================================================================== diff -u -r6d80d69a210f45c733e5307859351f2cd820a8e7 -r6734e9d64e231d58fbb359435399868f939cc84e --- Common.h (.../Common.h) (revision 6d80d69a210f45c733e5307859351f2cd820a8e7) +++ Common.h (.../Common.h) (revision 6734e9d64e231d58fbb359435399868f939cc84e) @@ -306,181 +306,6 @@ sendEvent( e, dat1, dat2 ); \ } -// **** Common Data **** - -#ifndef _RELEASE_ -/// Hardware configuration -typedef enum Hardware_Configurations -{ - HW_CONFIG_BETA = 1, ///< Hardware configuration beta - HW_CONFIG_DVT, ///< Hardware configuration DVT - NUM_OF_HW_CONFIGS, ///< Number of hardware configurations -} HARDWARE_CONFIG_T; -#endif - -/// Heaters data structure. -typedef struct -{ - F32 mainPrimayHeaterDC; ///< Main primary heater DC - F32 smallPrimaryHeaterDC; ///< Small primary heater DC - F32 trimmerHeaterDC; ///< Trimmer heater DC - F32 primaryTargetTemp; ///< Primary heater target temperature - F32 trimmerTargetTemp; ///< Trimmer heater target temperature - U32 primaryHeaterState; ///< Primary heater state - U32 trimmerHeaterState; ///< Trimmer heater state - F32 primaryEfficiency; ///< Primary heater efficiency - F32 primaryCalcTargetTemp; ///< Primary heater calculated target temperature - F32 trimmerCalcCurrentTemp; ///< Trimmer heater calculated current temperature - U32 trimmerUseLastDC; ///< Trimmer heater use last duty cycle - F32 previsouFlow; ///< Trimmer heater previous flow L/min - U32 controlCounter; ///< Trimmer heater control count -} HEATERS_DATA_T; - -/// Temperature sensors data structure. -typedef struct -{ - F32 inletPrimaryHeater; ///< Inlet primary heater temperature sensor - F32 heatDisinfect; ///< Heat Disinfect temperature sensor - F32 outletPrimaryHeater; ///< Outlet primary heater temperature sensor - F32 conductivitySensor1; ///< Conductivity sensor 1 temperature sensor - F32 conductivitySensor2; ///< Conductivity sensor 2 temperature sensor - F32 outletRedundant; ///< Outlet redundant temperature sensor - F32 inletDialysate; ///< Inlet dialysate temperature sensor - F32 primaryHeaterThermocouple; ///< Primary heaters thermocouple sensor - F32 trimmerHeaterThermocouple; ///< Trimmer heater thermocouple sensor - F32 priamyHeaterColdjunction; ///< Primary heaters cold junction temperature sensor - F32 trimmerHeaterColdjunction; ///< Trimmer heater cold junction temperature sensor - F32 primaryHeaterInternal; ///< Primary heaters internal temperature (calculated from thermocouple and cold junction) - F32 trimmerHeaterInternal; ///< Trimmer heater internal temperature (calculated from thermocouple and cold junction) - F32 fpgaBoard; ///< FPGA board temperature sensor - F32 loadCellA1B1; ///< Load cell A1/B1 temperature sensor - F32 loadCellA2B2; ///< Load cell A2/B2 temperature sensor - F32 internalTHDORTD; ///< THDo RTD channel temperature sensor - F32 internalTDIRTD; ///< TDI RTD channel temperature sensor - F32 interalTHDRTD; ///< THd RTD channel temperature sensor - F32 internalCondSnsrTemp; ///< Conductivity Sensor internal temperature sensor - F32 baroTempSensor; ///< Barometric temperature sensor - F32 dialysateInletMovingAvg; ///< Dialysate inlet moving average - F32 redundantOutletMovingAvg; ///< Redundant outlet moving average -} TEMPERATURE_SENSORS_DATA_T; - -/// Dialysate heating parameters -typedef struct -{ - F32 trimmerTargetTemperature; ///< Trimmer Target temperature. - U32 timeReservoirCycleMS; ///< Reservoir cycle time in milliseconds. - F32 timeReservoirFillMS; ///< Reservoir fill time in milliseconds. - U32 timeReservoirWait2SwitchMS; ///< Wait to switch active reservoir time in milliseconds. - F32 dialysateFlowLPM; ///< Dialysate flow rate in L/min. - BOOL usePriTargetTempEquation; ///< Use primary heater target temperature estimation equation or not. -} DG_CMD_DIALYSATE_HEATING_PARAMS_T; - -/// Loadcell measurements struct. -typedef struct -{ - F32 loadCellA1inGram; ///< Loadcell A1 measurement in gram - F32 loadCellA2inGram; ///< Loadcell A2 measurement in gram - F32 loadCellB1inGram; ///< Loadcell B1 measurement in gram - F32 loadCellB2inGram; ///< Loadcell B2 measurement in gram -} LOAD_CELL_DATA_T; - -/// Flow meters data struct. -typedef struct -{ - F32 ROFlowRateLPM; ///< RO flow rate in L/min. - F32 ROFlowRateWithCPsLPM; ///< RO flow rate with concentrate pumps in L/min. - F32 dialysateFlowRateLPM; ///< Dialysate flow rate L/min. - F32 RORawFlowRateLPM; ///< Raw RO flow rate in L/min. - F32 dialysateRawFlowRateLPM; ///< Raw dialysate flow rate in L/min. -} FLOW_SENSORS_DATA_T; - -/// DG switch reservoirs command structure -typedef struct -{ - U32 reservoirID; ///< DG reservoir ID. - BOOL useLastTrimmerHeaterDC; ///< Use last trimmer heater duty cycle flag. -} DG_SWITCH_RSRVRS_CMD_T; - -/// DG change valve settings command structure -typedef struct -{ - U32 valveSettingCmd; ///< DG valve setting command. -} DG_VALVE_SETTING_CMD_REQUEST_T; - -/// DG fill command structure -typedef struct -{ - U32 fillToVolMl; ///< fill to volume in mL. - U32 cmd; ///< DG cmd. - F32 targetFlowRateLPM; ///< target flow rate in LPM. -} DG_FILL_CMD_T; - -/// DG start stop command structure -typedef struct -{ - BOOL start; ///< DG start stop cmd. - U32 acidType; ///< Acid type. - U32 bicarbType; ///< Bicarb type. -} DG_START_STOP_TX_CMD_REQUEST_T; - -/// DG start stop trimmer heater command structure -typedef struct -{ - BOOL start; ///< DG start stop trimmer heater. -} DG_START_STOP_TRIMMER_HEATER_CMD_T; - -/// DG flush mode start stop command structure -typedef struct -{ - BOOL start; ///< DG start stop flush mode. -} DG_FLUSH_MODE_CMD_T; - -/// DG heat disinfect mode start stop command structure -typedef struct -{ - BOOL start; ///< DG start stop heat disinfection mode. -} DG_HEAT_DISINFECTION_MODE_CMD_T; - -/// DG chemical disinfect mode start stop command structure -typedef struct -{ - BOOL start; ///< DG start stop chem disinfection mode. -} DG_CHEM_DISINFECTION_MODE_CMD_T; - -/// DG sample water command structure. -typedef struct -{ - U32 cmd; ///< DG sample water command. -} DG_SAMPLE_WATER_CMD_REQUEST_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 lastHeatActiveCoolCompleteDateEpoch; ///< Last heat disinfect active cool 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_