Index: firmware/App/Services/NVRecordsDD.h =================================================================== diff -u -r63c3a65e681810f037718377c6ed5a28c897d0ca -re17e1dc97bf8878056f1f7e4aa861c2448db52bc --- firmware/App/Services/NVRecordsDD.h (.../NVRecordsDD.h) (revision 63c3a65e681810f037718377c6ed5a28c897d0ca) +++ firmware/App/Services/NVRecordsDD.h (.../NVRecordsDD.h) (revision e17e1dc97bf8878056f1f7e4aa861c2448db52bc) @@ -49,14 +49,14 @@ #define GENERIC_VOL_RESERVED_SPACE_COUNT 4 ///< Generic volumes reserved space count. #define MAX_EEPROM_WRITE_BUFFER_BYTES 16U ///< Max allowed bytes for an EEPROM write (16 bytes). -/// NVDataMgmt self-test states enumeration. -typedef enum NVDataMgmt_Self_Test_States +/// NVM self-test states enumeration. +typedef enum NVM_Self_Test_States { - NVDATAMGMT_SELF_TEST_STATE_READ_RECORDS = 0, ///< Self test read records. - NVDATAMGMT_SELF_TEST_STATE_CHECK_CRC, ///< Self test check CRC. - NVDATAMGMT_SELF_TEST_STATE_COMPLETE, ///< Self test complete. - NUM_OF_NVDATAMGMT_SELF_TEST_STATES ///< Total number of self-test states. -} NVDATAMGMT_SELF_TEST_STATE_T; + NVM_SELF_TEST_STATE_READ_RECORDS = 0, ///< Self test read records. + NVM_SELF_TEST_STATE_CHECK_CRC, ///< Self test check CRC. + NVM_SELF_TEST_STATE_COMPLETE, ///< Self test complete. + NUM_OF_NVM_SELF_TEST_STATES ///< Total number of self-test states. +} NVM_SELF_TEST_STATE_T; /// Process records specifications structure typedef struct @@ -74,14 +74,15 @@ 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_DIALYSATE_PUMPS_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_DIALYSATE_PUMPS_RECORD, ///< Get dialysate pumps 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_FILL_CONDUCTIVITIES_RECORD, ///< Get fill conductivities record. GET_CAL_BLOOD_LEAK_SENSOR, - GET_SYS_RECORD, ///< Get system record. - GET_SRV_RECORD, ///< Get service record. + GET_SYSTEM_RECORD, ///< Get system record. + GET_SERVICE_RECORD, ///< Get service record. GET_INSTITUTIONAL_RECORD, ///< Get institutional record. GET_USAGE_RECORD, ///< Get usage record. NUM_OF_NV_DD_DATA ///< Number of non-volatile data. @@ -128,15 +129,6 @@ NUM_OF_USAGE_INFO_ITEMS ///< Number of usage info items. } DD_USAGE_INFO_ITEMS_T; -/// DD fill conductivity tests -typedef enum DD_conductivity_ops -{ - FILL_COND_NORMAL_OP = 0, ///< Fill conductivity normal operation. - FILL_COND_ACID_TEST, ///< Fill conductivity acid test. - FILL_COND_BICARB_TEST, ///< Fill conductivity bicarb test. - NUM_OF_FILL_COND_TEST ///< Number of fill conductivity test. -} DD_FILL_COND_OPS_T; - #pragma pack(push, 1) /// Polynomial calibration structure typedef struct @@ -168,19 +160,19 @@ POLYNOMIAL_CAL_PAYLOAD_T concentratePumps[ NUM_OF_CONCENTRATE_PUMPS ]; ///< DD concentrate pumps calibration data. } DD_CONC_PUMPS_CAL_RECORD_T; -/// DD dialysate pump calibration structure +/// DD D12 dialysate pump calibration structure typedef struct { - float targetPumpSpeed[ NUM_OF_DIALYSATE_PUMPS ]; ///< Target Pump Speed + F32 targetPumpSpeed; ///< Target Pump Speed U32 calibrationTime; ///< Calibration time. U16 crc; ///< CRC for the polynomial calibration payload. -} DD_DIALYSATE_PUMP_DATA_T; +} DD_D12_DIALYSATE_PUMP_RECORD_T; /// DD dialysate pumps calibration record typedef struct { - DD_DIALYSATE_PUMP_DATA_T dialysatePump[ NUM_OF_DIALYSATE_PUMPS ]; ///< DD dialysate pumps calibration data. -} DD_DIALYSATE_PUMPS_CAL_RECORD_T; + POLYNOMIAL_CAL_PAYLOAD_T d48DialysatePump; ///< DD dialysate pump d48 calibration data. +} DD_D48_DIALYSATE_PUMP_RECORD_T; /// DD acid concentrate typedef struct @@ -226,21 +218,6 @@ U16 crc; ///< CRC for the DD accelerometer sensor. } DD_ACCEL_SENSOR_CAL_RECORD_T; -/// DD acid and bicarb fill conductivity values -typedef struct -{ - F32 acidConduSPerCM; ///< Acid conductivity uS/cm. - F32 bicarbConduSPerCM; ///< Bicarb conductivity uS/cm. - U32 calibrationTime; ///< Calibration time. - U16 crc; ///< CRC for the acid/bicarb fill conductivity values. -} DD_ACID_BICARB_FILL_COND_VALUES_T; - -/// DD acid and bicarb fill conductivity record -typedef struct -{ - DD_ACID_BICARB_FILL_COND_VALUES_T fillCondValues[ NUM_OF_ACID_TYPE ][ NUM_OF_FILL_COND_TEST ]; ///< Acid and bicarb fill conductivity values. -} DD_CONCENTRATES_COND_CAL_RECORD_T; - /// DD blood leak calibration structure typedef struct { @@ -318,16 +295,16 @@ // ********** public function prototypes ********** void initNVRecordsDD( void ); -SELF_TEST_STATUS_T execNVDataMgmtSelfTest ( void ); -PROCESS_RECORD_SPECS_T getProcessRecord( RECORD_JOBS_STATE_T job ); -PROCESS_RECORD_SPECS_T getTemporaryRxRecord( RECORD_JOBS_STATE_T job ); +SELF_TEST_STATUS_T execNVMSelfTest ( void ); +PROCESS_RECORD_SPECS_T getProcessRecord( NVM_RECORD_TYPE_T job ); +PROCESS_RECORD_SPECS_T getTemporaryRxRecord( NVM_RECORD_TYPE_T job ); void benignPolynomialCalRecord( POLYNOMIAL_CAL_PAYLOAD_T* record ); BOOL setLastDisinfectDate( DD_USAGE_INFO_ITEMS_T disinfect, U32 epochTime ); BOOL setServiceTime( void ); BOOL getNVRecord2Driver( NV_DATA_T nvData, U08* bufferAddress, U32 bufferLength, U08 numOfSnsrs2Check, ALARM_ID_T nvAlarm ); void updateNVSelfTestResult( SELF_TEST_STATUS_T result ); -void updateNVSelfTestState( NVDATAMGMT_SELF_TEST_STATE_T state ); +void updateNVSelfTestState( NVM_SELF_TEST_STATE_T state ); void updateSelfTestReadRecordsFlag ( BOOL value ); BOOL testSetNVRecordCRCOverride( U32 job, U16 crc ); /**@}*/