Index: firmware/App/Services/NVRecordsDD.c =================================================================== diff -u -r0599bd5494eb64416999de0487a9882c557b6044 -r9b306db98cfce6e9a750b971e1a34c688618aeae --- firmware/App/Services/NVRecordsDD.c (.../NVRecordsDD.c) (revision 0599bd5494eb64416999de0487a9882c557b6044) +++ firmware/App/Services/NVRecordsDD.c (.../NVRecordsDD.c) (revision 9b306db98cfce6e9a750b971e1a34c688618aeae) @@ -233,7 +233,6 @@ static void initDDServiceRecord( void ); static void initDDInstitutionalRecord( void ); static void initDDUsageRecord( void ); -//static void initDDCalibrationRecord( void ); static void updateRecordPadding( NVM_RECORD_TYPE_T recType ); @@ -967,82 +966,6 @@ /*********************************************************************//** * @brief - * The initDDCalibrationRecord function initializes the DD calibration record with - * default values. - * @details \b Inputs: none - * @details \b Outputs: ddCalibrationGroup.ddCalibrationRecord - * @return none - *************************************************************************/ -//static void initDDCalibrationRecord( void ) -//{ -// U32 i; -// POLYNOMIAL_CAL_PAYLOAD_T* record; -// -// DD_PRES_SENSORS_CAL_RECORD_T* pressure = &ddCalibrationGroup.ddCalibrationRecord.presSensorsCalRecord; -// for ( i = 0; i < NUM_OF_PRESSURE_SENSORS; i++ ) -// { -// record = (POLYNOMIAL_CAL_PAYLOAD_T*)&pressure->pressureSensors[ i ]; -// benignPolynomialCalRecord( record ); -// } -// -// DD_TEMP_SENSORS_CAL_RECORD_T* temperature = &ddCalibrationGroup.ddCalibrationRecord.tempSensorsCalRecord; -// for ( i = 0; i < NUM_OF_TEMPERATURE_SENSORS; i++ ) -// { -// record = (POLYNOMIAL_CAL_PAYLOAD_T*)&temperature->tempSensors[ i ]; -// benignPolynomialCalRecord( record ); -// } -// -// DD_CONC_PUMPS_CAL_RECORD_T* concPump = &ddCalibrationGroup.ddCalibrationRecord.concentratePumpsRecord; -// for ( i = 0; i < NUM_OF_CONCENTRATE_PUMPS; i++ ) -// { -// record = (POLYNOMIAL_CAL_PAYLOAD_T*)&concPump->concentratePumps[ i ]; -// benignPolynomialCalRecord( record ); -// } -// -// ddCalibrationGroup.ddCalibrationRecord.d12DialysatePumpRecord.targetPumpSpeed = DEFAULT_D12_PUMP_TARGET_SPEED; -// ddCalibrationGroup.ddCalibrationRecord.d12DialysatePumpRecord.calibrationTime = RECORD_DEFAULT_TIME; -// ddCalibrationGroup.ddCalibrationRecord.d12DialysatePumpRecord.crc = crc16 ( (U08*)record, -// sizeof( DD_D12_DIALYSATE_PUMP_RECORD_T ) - sizeof( U16 ) ); -// -// DD_D48_DIALYSATE_PUMP_RECORD_T* d48Pump = &ddCalibrationGroup.ddCalibrationRecord.d48DialysatePumpRecord; -// record = (POLYNOMIAL_CAL_PAYLOAD_T*)&d48Pump->d48DialysatePump; -// benignPolynomialCalRecord( record ); -// -// DD_ACID_CONCENTRATES_RECORD_T* acidConc = &ddCalibrationGroup.ddCalibrationRecord.acidConcentratesRecord; -// for ( i = 0; i < NUM_OF_ACID_TYPE; i++ ) -// { -// acidConc->acidConcentrate[ i ].acidConcMixRatio = DEFAULT_ACID_CONC_MIXING_RATIO; -// acidConc->acidConcentrate[ i ].acidFullBottleVolumeML = DEFAULT_ACID_BOTTLE_VOL_ML; -// acidConc->acidConcentrate[ i ].acidConductivityUSPerCM = DEFAULT_ACID_COND_US_PER_CM; -// acidConc->acidConcentrate[ i ].acidBottleTemperature = DEFAULT_ACID_BOTTLE_TEMP_C; -// acidConc->acidConcentrate[ i ].calibrationTime = RECORD_DEFAULT_TIME; -// acidConc->acidConcentrate[ i ].crc = crc16 ( (U08*)record, sizeof( DD_ACID_CONCENTRATE_T ) - sizeof( U16 ) ); -// } -// -// DD_BICARB_CONCENTRATES_RECORD_T* bicarbConc = &ddCalibrationGroup.ddCalibrationRecord.bicarbConcentratesRecord; -// for ( i = 0; i < NUM_OF_BICARB_TYPE; i++ ) -// { -// bicarbConc->bicarbConcentrate[ i ].bicarbConcMixRatio = DEFAULT_BICARB_CONC_MIXING_RATIO; -// bicarbConc->bicarbConcentrate[ i ].bicarbStartVolumeML = DEFAULT_BICARB_BOTTLE_VOL_ML; -// bicarbConc->bicarbConcentrate[ i ].bicarbConductivityUSPerCM = DEFAULT_BICARB_COND_US_PER_CM; -// bicarbConc->bicarbConcentrate[ i ].bicarbBottleTemperature = DEFAULT_BICARB_BOTTLE_TEMP_C; -// bicarbConc->bicarbConcentrate[ i ].calibrationTime = RECORD_DEFAULT_TIME; -// bicarbConc->bicarbConcentrate[ i ].crc = crc16 ( (U08*)record, sizeof( DD_BICARB_CONCENTRATE_T ) - sizeof( U16 ) ); -// } -// -// ddCalibrationGroup.ddCalibrationRecord.accelerometerSensorCalRecord.accelXOffset = RECORD_DEFAULT_OFFSET; -// ddCalibrationGroup.ddCalibrationRecord.accelerometerSensorCalRecord.accelYOffset = RECORD_DEFAULT_OFFSET; -// ddCalibrationGroup.ddCalibrationRecord.accelerometerSensorCalRecord.accelZOffset = RECORD_DEFAULT_OFFSET; -// ddCalibrationGroup.ddCalibrationRecord.accelerometerSensorCalRecord.calibrationTime = RECORD_DEFAULT_TIME; -// ddCalibrationGroup.ddCalibrationRecord.accelerometerSensorCalRecord.crc = crc16 ( (U08*)record, sizeof(DD_ACCEL_SENSOR_CAL_RECORD_T) - sizeof(U16) ); -// -// ddCalibrationGroup.ddCalibrationRecord.bloodLeakSensorCalRecord.setPoint = DEFAULT_BLOOD_LEAK_SET_POINT; -// ddCalibrationGroup.ddCalibrationRecord.bloodLeakSensorCalRecord.calibrationTime = RECORD_DEFAULT_TIME; -// ddCalibrationGroup.ddCalibrationRecord.bloodLeakSensorCalRecord.crc = crc16 ( (U08*)record, sizeof( DD_BLOOD_LEAK_SENSOR_CAL_RECORD_T ) - sizeof( U16 ) ); -//} - -/*********************************************************************//** - * @brief * The updateRecordPadding function updates the padding bytes of the * specified NV record. It clears all padding bytes to ensure * consistent CRC calculation and record storage. @@ -1475,7 +1398,6 @@ return ( ddCalibrationGroup.ddCalibrationRecord.bloodLeakSensorCalRecord ); } - /*********************************************************************//** * @brief * The getNVMRecord function copies the requested non-volatile