Index: firmware/App/Services/NVRecordsDD.h =================================================================== diff -u -r6a30402a7d47d1c77c04845a1c880935f00c6551 -rb50ce33669efe6dfcf5f8a211c78a6c2c309adf3 --- firmware/App/Services/NVRecordsDD.h (.../NVRecordsDD.h) (revision 6a30402a7d47d1c77c04845a1c880935f00c6551) +++ firmware/App/Services/NVRecordsDD.h (.../NVRecordsDD.h) (revision b50ce33669efe6dfcf5f8a211c78a6c2c309adf3) @@ -72,45 +72,25 @@ /// DD available NV data to get typedef enum DD_nv_commands { - GET_CAL_PRESSURE_SENOSRS = 0, ///< Get pressure sensors calibration data. - GET_CAL_TEMP_SENSORS, ///< Get temperature sensors calibration data. - GET_CAL_CONCENTRATE_PUMPS_RECORD, ///< Get concentrate pumps calibration record. - GET_CAL_D12_PUMP_RECORD, ///< Get D12 dialysate pump calibration record. - GET_CAL_D48_PUMP_RECORD, ///< Get D48 dialysate pump calibration record. - GET_CAL_ACID_CONCENTREATES, ///< Get acid concentrates calibration data. - GET_CAL_BICARB_CONCENTRATES, ///< Get bicarb concentrates calibration data. - GET_CAL_ACCEL_SENSORS, ///< Get accelerometers calibration data. - GET_CAL_BLOOD_LEAK_SENSOR, ///< Get blood leak sensor calibration data. - GET_CAL_CONDUCTIVITY_SENSOR, ///< Get blood leak sensor calibration data. - GET_SYSTEM_RECORD, ///< Get system record. - GET_SERVICE_RECORD, ///< Get service record. - GET_INSTITUTIONAL_RECORD, ///< Get institutional record. - GET_USAGE_RECORD, ///< Get usage record. + NV_DD_DATA_SYSTEM_RECORD = 0, ///< System record. + NV_DD_DATA_SERVICE_RECORD, ///< Service record + NV_DD_DATA_CAL_PRESSURE_SENOSRS, ///< Pressure sensors calibration data. + NV_DD_DATA_CAL_TEMPERATURE_SENSORS, ///< Temperature sensors calibration data. + NV_DD_DATA_CAL_CONCENTRATE_PUMPS_RECORD, ///< Concentrate pumps calibration record. + NV_DD_DATA_CAL_D12_PUMP_RECORD, ///< D12 dialysate pump calibration record. + NV_DD_DATA_CAL_D48_PUMP_RECORD, ///< D48 dialysate pump calibration record. + NV_DD_DATA_CAL_ACID_CONCENTREATES, ///< Acid concentrates calibration data. + NV_DD_DATA_CAL_BICARB_CONCENTRATES, ///< Bicarb concentrates calibration data. + NV_DD_DATA_CAL_ACCEL_SENSOR, //< Accelerometers calibration data. + NV_DD_DATA_CAL_BLOOD_LEAK_SENSOR, ///< Blood leak sensor calibration data. + NV_DD_DATA_CAL_CONDUCTIVITY_SENSORS, ///< Conductivity sensor calibration data. + NV_DD_DATA_INSTIT_BASIC_RECORD, ///< Basic institutional record. + NV_DD_DATA_INSTIT_ADVANCED_RECORD, ///< Advanced institutional record. + NV_DD_DATA_INSTIT_ADDITIONAL_RECORD, ///< Additional institutional record. + NV_DD_DATA_USAGE_INFO_RECORD, ///< Usage record. NUM_OF_NV_DD_DATA ///< Number of non-volatile data. } NV_DATA_T; -/// DD available NV data to get -typedef enum DD_nv_rec_items -{ - NVM_REC_TYPE_SYSTEM = 0, ///< NVM system record. - NVM_REC_TYPE_SERVICE, ///< NVM service record. - NVM_REC_TYPE_USAGE_INFO, ///< NVM usage record. - NVM_REC_TYPE_INSTIT_BASIC, ///< NVM basic institutional record. - NVM_REC_TYPE_INSTIT_ADVANCED, ///< NVM advanced institutional record. - NVM_REC_TYPE_INSTIT_ADDITIONAL, ///< NVM additional institutional record. - NVM_REC_TYPE_CAL_PRESSURE_SENSORS, ///< NVM pressure sensors calibration data. - NVM_REC_TYPE_CAL_TEMPERATURE_SENSORS, ///< NVM temperature sensors calibration data. - NVM_REC_TYPE_CAL_CONC_PUMPS, ///< NVM concentrate pumps calibration record. - NVM_REC_TYPE_CAL_D12_PUMP, ///< NVM D12 dialysate pump calibration record. - NVM_REC_TYPE_CAL_D48_PUMP, ///< NVM D48 dialysate pump calibration record. - NVM_REC_TYPE_CAL_ACID_CONCENTREATES, ///< NVM acid concentrates calibration data. - NVM_REC_TYPE_CAL_BICARB_CONCENTRATES, ///< NVM bicarb concentrates calibration data. - NVM_REC_TYPE_CAL_ACCEL_SENSOR, ///< NVM accelerometers calibration data. - NVM_REC_TYPE_CAL_BLOOD_LEAK_SENSOR, ///< NVM blood leak sensor calibration data. - NVM_REC_TYPE_CAL_CONDUCTIVITY_SENSORS, ///< NVM blood leak sensor calibration data. - NUM_OF_NVM_REC_ITEMS ///< Number of non-volatile data record type -} NVM_RECORD_ITEMS_T; - /// DD scheduled runs enumeration. typedef enum DD_scheduled_runs { @@ -140,13 +120,13 @@ INSTIT_PARAM_DRY_BICARB_CART_SIZE, ///< Bicarbonate Cartridge Size INSTIT_PARAM_SODIUM, ///< Sodium INSTIT_PARAM_BICARBONATE, ///< Bicarbonate - NUM_OF_INSTIT_BASIC = INSTIT_PARAM_BICARBONATE, ///< Total number of Institutional basic parameters + NUM_OF_INSTIT_BASIC, ///< Total number of Institutional basic parameters }DD_INSTIT_BASIC_ITEMS_T; /// DD Institutional advanced items typedef enum DD_instit_advanced_items { - INSTIT_PARAM_RO_REJECTION_RATIO_ALRAM, ///< RO Rejection Ratio Alarm Threshold + INSTIT_PARAM_RO_REJECTION_RATIO_ALRAM = 0, ///< RO Rejection Ratio Alarm Threshold FIRST_INSTIT_ADVANCED_PARAM = INSTIT_PARAM_RO_REJECTION_RATIO_ALRAM, ///< First Institutional advanced parameter INSTIT_PARAM_DISINFECTION_FREQUENCY, ///< Disinfection Frequency INSTIT_PARAM_DISINFECTION_CYCLE_TIME, ///< Disinfection Parameters, Cycle Time @@ -157,13 +137,15 @@ INSTIT_PARAM_LOW_BICARB_ALARM, ///< Low Bicarb Alarm Threshold INSTIT_PARAM_DIALYSATE_POST_TREAT_DRAIN_OPTION, ///< Dialysate Post Treatment Drain Option  INSTIT_PARAM_BICARB_POST_TREAT_DRAIN_OPTION, ///< Dry Bicarbonate Post Treatment Option  - NUM_OF_INSTIT_ADVANCED = INSTIT_PARAM_BICARB_POST_TREAT_DRAIN_OPTION, ///< Total number of Institutional advanced parameters + NUM_OF_INSTIT_ADVANCED, ///< Total number of Institutional advanced parameters } DD_INSTIT_ADVANCED_ITEMS_T; /// DD Institutional additional items typedef enum DD_instit_additional_items -{  - NUM_OF_INSTIT_ADDITIONAL, +{ + INSTIT_ADDITIONAL_PARAM = 0, ///< Institutional additional param  + FIRST_INSTIT_ADDITIONAL_PARAM = INSTIT_ADDITIONAL_PARAM, ///< First Institutional additional parameter + NUM_OF_INSTIT_ADDITIONAL, ///< Total number of Institutional additional parameters } DD_INSTIT_ADDITIONAL_ITEMS_T; #pragma pack(push, 1) @@ -372,67 +354,10 @@ U32 getMinRORejectionRatioInInstitRecordPCT( void ); F32 getMinInletWaterConductivityLimitInstitRecordUSPCM( void ); - -DD_SYSTEM_RECORD_T getSystemRecord( void ); -void setSystemRecord( DD_SYSTEM_RECORD_T record ); - -DD_SERVICE_RECORD_T getServiceRecord( void ); -void setServiceRecord( DD_SERVICE_RECORD_T record ); - -LINEAR_CAL_PAYLOAD_T getPressureSensorCalRecord( U08 snsrIdx ); -void setPressureSensorCalRecord( U08 snsrIdx, LINEAR_CAL_PAYLOAD_T record ); - -LINEAR_CAL_PAYLOAD_T getTemperatureSensorCalRecord( U08 snsrIdx ); -void setTemperatureSensorCalRecord( U08 snsrIdx, LINEAR_CAL_PAYLOAD_T record ); - -LINEAR_CAL_PAYLOAD_T getConcPumpCalRecord( U08 pumpIdx ); -void setConcPumpCalRecord( U08 snsrIdx, LINEAR_CAL_PAYLOAD_T record ); - -DD_D12_DIALYSATE_PUMP_RECORD_T getD12PumpCalRecord( void ); -void setD12PumpCalRecord( DD_D12_DIALYSATE_PUMP_RECORD_T record ); - -DD_D48_DIALYSATE_PUMP_RECORD_T getD48PumpCalRecord( void ); -void setD48PumpCalRecord( DD_D48_DIALYSATE_PUMP_RECORD_T record ); - -DD_ACID_CONCENTRATE_T getAcidConcentrateCalRecord( U08 acidIdx ); -void setAcidConcentrateCalRecord( U08 acidIdx, DD_ACID_CONCENTRATE_T record ); - -DD_BICARB_CONCENTRATE_T getBicarbConcentrateCalRecord( U08 bicarbIdx ); -void setBicarbConcentrateCalRecord( U08 bicarbIdx, DD_BICARB_CONCENTRATE_T record ); - -DD_ACCEL_SENSOR_CAL_RECORD_T getAccelSensorCalRecord( void ); -void setAccelSensorCalRecord( DD_ACCEL_SENSOR_CAL_RECORD_T record ); - -DD_BLOOD_LEAK_SENSOR_CAL_RECORD_T getBloodLeakSensorCalRecord( void ); -void setBloodLeakSensorCalRecord( DD_BLOOD_LEAK_SENSOR_CAL_RECORD_T record ); - -DD_CONDUCTIVITY_SENSOR_T getConductivitySensorCalRecord( U08 snsrIdx ); -void setConductivitySensorCalRecord( U08 snsrIdx, DD_CONDUCTIVITY_SENSOR_T record ); - -DD_INSTIT_BASIC_RECORD_T getInstitBasicRecord( void ); -void setInstitBasicRecord( DD_INSTIT_BASIC_RECORD_T record ); - -DD_INSTIT_ADVANCED_RECORD_T getInstitAdvancedRecord( void ); -void setInstitAdvancedRecord( DD_INSTIT_ADVANCED_RECORD_T record ); - -DD_INSTIT_ADDITIONAL_RECORD_T getInstitAdditionalRecord( void ); -void setInstitAdditionalRecord( DD_INSTIT_ADDITIONAL_RECORD_T record ); - -DD_USAGE_INFO_RECORD_T getUsageInfoRecord( void ); -void setUsageInfoRecord( DD_USAGE_INFO_RECORD_T record ); - BOOL getNVMRecord( NV_DATA_T nvData, U08* bufferAddress, U32 bufferLength, U08 numOfSnsrs2Check, ALARM_ID_T nvAlarm ); -BOOL setNVMRecord( NVM_RECORD_TYPE_T recType, U08* bufferAddress ); -BOOL setNVMCalReco rd(DD_CAL_REC_TYPE calRecType, U08* bufferAddress, U08 idx); -BOOL getNVMInstitRecord( DD_INSTIT_REC_TYPE institRecType, U08 *valuePtr ); -BOOL setNVMInstitRecord(DD_INSTIT_REC_TYPE institRecType, U08 *valuePtr); +BOOL setNVMMRecord(NV_DATA_T recType, U08* bufferAddress, U08 idx); -DD_INSTIT_BASIC_RECORD_T getNVMInstitBasicRecord( void ); -void setNVMInstitBasicRecord( DD_INSTIT_BASIC_RECORD_T record ); -DD_INSTIT_ADVANCED_RECORD_T getNVMInstitAdvancedRecord( void ); -void setNVMInstitAdvancedRecord( DD_INSTIT_ADVANCED_RECORD_T record ); - void sendNVEvent( NVM_RECORD_TYPE_T recType, U32 d1, U32 d2 ); void updateRecordCRC( NVM_RECORD_TYPE_T recType ); void updateNVSelfTestResult( SELF_TEST_STATUS_T result );