Index: firmware/App/Controllers/BloodFlow.c =================================================================== diff -u -r0dae1be6e134cb4f1290a900f17e47258614fcaa -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 0dae1be6e134cb4f1290a900f17e47258614fcaa) +++ firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -192,6 +192,7 @@ static U16 bpLastMotorHallSensorCounts[ BP_SPEED_CALC_BUFFER_LEN ]; ///< Last hall sensor readings for the blood pump motor static U32 bpMotorSpeedCalcIdx = 0; ///< Index into 1 second buffer of motor speed hall sensor counts static U32 bpMotorSpeedCalcTimerCtr = 0; ///< Counter determines interval for calculating blood pump motor speed from hall sensor count. +static HD_PUMPS_CAL_RECORD_T bloodPumpCalRecord; ///< Blood pump calibration record. // ********** private function prototypes ********** @@ -1206,15 +1207,25 @@ * @brief * The execBloodFlowTest function executes the state machine for the * BloodFlow self-test. - * @details Inputs: none + * @details Inputs: bloodPumpCalRecord * @details Outputs: none * @return the current state of the BloodFlow self-test. *************************************************************************/ SELF_TEST_STATUS_T execBloodFlowTest( void ) { SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED; - // TODO - anything to test here? + BOOL calStatus = getNVRecord2Driver( GET_CAL_PUMPS, (U08*)&bloodPumpCalRecord, sizeof( HD_PUMPS_CAL_RECORD_T ), + NUM_OF_CAL_DATA_HD_PUMPS, ALARM_ID_NO_ALARM ); + + if ( TRUE == calStatus ) + { + result = SELF_TEST_STATUS_PASSED; + } + else + { + result = SELF_TEST_STATUS_FAILED; + } return result; } Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -rcf0f5e54c1a7af4d8a739cbd677d899d95e4019b -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision cf0f5e54c1a7af4d8a739cbd677d899d95e4019b) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -189,7 +189,8 @@ static F64 flowReadingsTotal = 0.0; ///< Rolling total - used to calc average. static U32 flowReadingsCount = 0; ///< Number of samples in flow rolling average buffer. -static U32 dipCurrErrorDurationCtr = 0; ///< Used for tracking persistence of dip current errors. +static U32 dipCurrErrorDurationCtr = 0; ///< Used for tracking persistence of dip current errors. +static HD_PUMPS_CAL_RECORD_T dialInPumpCalRecord; ///< Dialysate inlet calibration record. // ********** private function prototypes ********** @@ -1234,13 +1235,25 @@ * The execDialInFlowTest function executes the state machine for the * DialInFlow self-test. * @details Inputs: none - * @details Outputs: none + * @details Outputs: dialInPumpCalRecord * @return the current state of the DialInFlow self-test. *************************************************************************/ SELF_TEST_STATUS_T execDialInFlowTest( void ) { SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED; + BOOL calStatus = getNVRecord2Driver( GET_CAL_PUMPS, (U08*)&dialInPumpCalRecord, sizeof( HD_PUMPS_CAL_RECORD_T ), + NUM_OF_CAL_DATA_HD_PUMPS, ALARM_ID_NO_ALARM ); + + if ( TRUE == calStatus ) + { + result = SELF_TEST_STATUS_PASSED; + } + else + { + result = SELF_TEST_STATUS_FAILED; + } + return result; } Index: firmware/App/Controllers/DialOutFlow.c =================================================================== diff -u -rcf0f5e54c1a7af4d8a739cbd677d899d95e4019b -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision cf0f5e54c1a7af4d8a739cbd677d899d95e4019b) +++ firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -25,6 +25,7 @@ #include "FPGA.h" #include "InternalADC.h" #include "ModeTreatment.h" +#include "NVDataMgmt.h" #include "OperationModes.h" #include "PIControllers.h" #include "SafetyShutdown.h" @@ -185,7 +186,8 @@ static U32 errorDialOutRotorSpeedPersistTimerCtr = 0; ///< Persistence timer counter for rotor speed error condition. static U32 errorDialOutPumpDirectionPersistTimerCtr = 0; ///< Persistence timer counter for pump direction error condition. -static U08 lastDialOutPumpDirectionCount = 0; ///< Previous pump direction error count reported by FPGA +static U08 lastDialOutPumpDirectionCount = 0; ///< Previous pump direction error count reported by FPGA. +static HD_PUMPS_CAL_RECORD_T dialOutPumpCalRecord; ///< Dialysate outlet calibration record. // ********** private function prototypes ********** @@ -476,6 +478,33 @@ /*********************************************************************//** * @brief + * The execDialOutFlowTest function executes the state machine for the + * DialOutFlow self-test. + * @details Inputs: none + * @details Outputs: dialOutPumpCalRecord + * @return the current state of the DialOutFlow self-test. + *************************************************************************/ +SELF_TEST_STATUS_T execDialOutFlowTest( void ) +{ + SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED; + + BOOL calStatus = getNVRecord2Driver( GET_CAL_PUMPS, (U08*)&dialOutPumpCalRecord, sizeof( HD_PUMPS_CAL_RECORD_T ), + NUM_OF_CAL_DATA_HD_PUMPS, ALARM_ID_NO_ALARM ); + + if ( TRUE == calStatus ) + { + result = SELF_TEST_STATUS_PASSED; + } + else + { + result = SELF_TEST_STATUS_FAILED; + } + + return result; +} + +/*********************************************************************//** + * @brief * The execDialOutFlowMonitor function executes the dialysate outlet pump * and load cell sensor monitor. Checks are performed. Data is published * at appropriate interval. Index: firmware/App/Controllers/DialOutFlow.h =================================================================== diff -u -rcf0f5e54c1a7af4d8a739cbd677d899d95e4019b -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Controllers/DialOutFlow.h (.../DialOutFlow.h) (revision cf0f5e54c1a7af4d8a739cbd677d899d95e4019b) +++ firmware/App/Controllers/DialOutFlow.h (.../DialOutFlow.h) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -76,7 +76,7 @@ BOOL isDialOutPumpRunning( void ); BOOL isDialOutPumpRampComplete( void ); -// SELF_TEST_STATUS_T execDialOutFlowTest( void ); // TODO - implement later +SELF_TEST_STATUS_T execDialOutFlowTest( void ); F32 getTotalTargetDialOutUFVolumeInMl( void ); F32 getTotalMeasuredUFVolumeInMl( void ); Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -rf17da591ff546ff00dd52299b73c5edaad92c65a -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision f17da591ff546ff00dd52299b73c5edaad92c65a) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -18,7 +18,8 @@ #include "PresOccl.h" #include "AlarmMgmt.h" #include "FPGA.h" -#include "ModeTreatmentParams.h" +#include "ModeTreatmentParams.h" +#include "NVDataMgmt.h" #include "OperationModes.h" #include "PersistentAlarm.h" #include "SystemCommMessages.h" @@ -145,6 +146,8 @@ static U32 venPressureReadingsShortIdx = 0; ///< Index for next sample in rolling average array. static F32 venPressureReadingsShortTotal = 0.0; ///< Rolling total - used to calc average. static U32 venPressureReadingsShortCount = 0; ///< Number of samples in flow rolling average buffer. +static HD_PRESSURE_SENSORS_CAL_RECORD_T pressureSensorsCalRecord; ///< Pressure sensors calibration record. +static HD_OCCLUSION_SENSORS_CAL_RECORD_T occlusionSensorsCalRecord; ///< Occlusion sensors calibration record. // ********** private function prototypes ********** @@ -818,6 +821,37 @@ #endif return result; +} + +/*********************************************************************//** + * @brief + * The execPresOcclSelfTest function executes the PresOccl self-test. + * @details Inputs: none + * @details Outputs: pressureSensorsCalRecord, occlusionSensorsCalRecord + * @return the result of the PresOccl self-test. + *************************************************************************/ +SELF_TEST_STATUS_T execPresOcclSelfTest( void ) +{ + SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED; + BOOL calStatus = FALSE; + + // Get the pressure sensors and occlusion sensors calibration records + calStatus |= getNVRecord2Driver( GET_CAL_PRESSURE_SENSORS, (U08*)&pressureSensorsCalRecord, sizeof( HD_PRESSURE_SENSORS_CAL_RECORD_T ), + NUM_OF_CAL_DATA_HD_PRESSURE_SESNSORS, ALARM_ID_NO_ALARM ); + + calStatus |= getNVRecord2Driver( GET_CAL_OCCLUSION_SESNSORS, (U08*)&occlusionSensorsCalRecord, sizeof( HD_OCCLUSION_SENSORS_CAL_RECORD_T ), + NUM_OF_CAL_DATA_OCCLUSION_SENSORS, ALARM_ID_NO_ALARM ); + + if ( TRUE == calStatus ) + { + result = SELF_TEST_STATUS_PASSED; + } + else + { + result = SELF_TEST_STATUS_FAILED; + } + + return result; } /************************************************************************* Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 24b2fe72608344e67ef37234085d15ad5e4fcc37) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -65,7 +65,8 @@ void execPresOccl( void ); void execPresOcclTest( void ); -SELF_TEST_STATUS_T execPresOcclDryTest( void ); +SELF_TEST_STATUS_T execPresOcclDryTest( void ); +SELF_TEST_STATUS_T execPresOcclSelfTest( void ); F32 getMeasuredArterialPressure( void ); F32 getFilteredArterialPressure( void ); Index: firmware/App/Controllers/Temperatures.c =================================================================== diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Controllers/Temperatures.c (.../Temperatures.c) (revision 24b2fe72608344e67ef37234085d15ad5e4fcc37) +++ firmware/App/Controllers/Temperatures.c (.../Temperatures.c) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -19,6 +19,7 @@ #include "FPGA.h" #include "InternalADC.h" +#include "NVDataMgmt.h" #include "PersistentAlarm.h" #include "SystemCommMessages.h" #include "Temperatures.h" @@ -69,6 +70,7 @@ TEMPERATURES_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Temperatures publish time interval override. static U32 dataPublishCounter; ///< Temperatures data publish timer counter. static U32 adcReadCounter; ///< Temperatures ADC read counter. +static HD_TEMP_SENSORS_CAL_RECORD_T temperaturesCalRecord; ///< Temperatures calibration record. static const F32 THERMISTOR_VOLTAGE_CONV_COEFF = THERMISTOR_REFERENCE_VOLTAGE / (F32)TWELVE_BIT_RESOLUTION; ///< On board thermistor ADC to voltage conversion coefficient. @@ -122,13 +124,21 @@ *************************************************************************/ SELF_TEST_STATUS_T execTemperaturesSelfTest( void ) { - SELF_TEST_STATUS_T status = SELF_TEST_STATUS_IN_PROGRESS; + SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS; - // TODO implement the calibration processing function. - // It returns a pass for now - status = SELF_TEST_STATUS_PASSED; + BOOL calStatus = getNVRecord2Driver( GET_CAL_TEMPERATURE_SESNORS, (U08*)&temperaturesCalRecord, sizeof( HD_TEMP_SENSORS_CAL_RECORD_T ), + NUM_OF_CAL_DATA_HD_TEMP_SENSORS, ALARM_ID_NO_ALARM ); - return status; + if ( TRUE == calStatus ) + { + result = SELF_TEST_STATUS_PASSED; + } + else + { + result = SELF_TEST_STATUS_FAILED; + } + + return result; } /*********************************************************************//** @@ -140,6 +150,13 @@ *************************************************************************/ void execTemperatures( void ) { + // Check if a new calibration is available + if ( TRUE == isNewCalibrationRecordAvailable() ) + { + getNVRecord2Driver( GET_CAL_TEMPERATURE_SESNORS, (U08*)&temperaturesCalRecord, sizeof( HD_TEMP_SENSORS_CAL_RECORD_T ), + NUM_OF_CAL_DATA_HD_TEMP_SENSORS, ALARM_ID_NO_ALARM ); + } + // Read the sensors all the time switch ( temperaturesExecState ) { @@ -338,7 +355,13 @@ break; } - temperaturesStatus[ sensor ].temperatureValue.data = temperature; + // Apply the calibration record the temperature values prior to updating the structures + temperaturesStatus[ sensor ].temperatureValue.data = + pow(sensor, 4) * temperaturesCalRecord.hdTemperatureSensors[ (CAL_DATA_HD_TEMEPERATURE_SENSORS_T)sensor ].fourthOrderCoeff + + pow(sensor, 3) * temperaturesCalRecord.hdTemperatureSensors[ (CAL_DATA_HD_TEMEPERATURE_SENSORS_T)sensor ].thirdOrderCoeff + + pow(sensor, 3) * temperaturesCalRecord.hdTemperatureSensors[ (CAL_DATA_HD_TEMEPERATURE_SENSORS_T)sensor ].secondOrderCoeff + + sensor * temperaturesCalRecord.hdTemperatureSensors[ (CAL_DATA_HD_TEMEPERATURE_SENSORS_T)sensor ].gain + + temperaturesCalRecord.hdTemperatureSensors[ (CAL_DATA_HD_TEMEPERATURE_SENSORS_T)sensor ].offset; } } Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 24b2fe72608344e67ef37234085d15ad5e4fcc37) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -21,6 +21,7 @@ #include "FPGA.h" #include "MessageSupport.h" +#include "NVDataMgmt.h" #include "SafetyShutdown.h" #include "SystemCommMessages.h" #include "TaskPriority.h" @@ -225,6 +226,7 @@ static U16 valvesControlSetBits = 0x0000; ///< Valves control set bit static OPN_CLS_STATE_T valveAirTrapStatus; ///< Air trap valve status (open/close) +static HD_VALVES_CAL_RECORD_T valvesCalibrationRecord; ///< Valves calibration record. // Self test function prototypes static VALVE_SELF_TEST_STATE_T handleValveSelfTestEnableValves( void ); @@ -567,7 +569,10 @@ { VALVE_SELF_TEST_STATE_T state = VALVE_SELF_TEST_COMPLETE; - if ( TRUE == areValvesFunctional() ) + BOOL calStatus = getNVRecord2Driver( GET_CAL_VALVES, (U08*)&valvesCalibrationRecord, sizeof( HD_VALVES_CAL_RECORD_T ), + NUM_OF_CAL_DATA_HD_VALVES, ALARM_ID_NO_ALARM ); + + if ( ( TRUE == areValvesFunctional() ) && ( TRUE == calStatus ) ) { valvesSelfTestResult = SELF_TEST_STATUS_PASSED; } Index: firmware/App/HDCommon.h =================================================================== diff -u -r40f46e196349e3dd730048a354df8bbb2e40407d -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 40f46e196349e3dd730048a354df8bbb2e40407d) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -88,7 +88,7 @@ #define SKIP_RESERVOIR_ALARMS 1 // Skip reservoir management alarms // #define IGNORE_BLOOD_LEAK_SELF_TEST 1 // Ignore blood leak self test // TODO New config implemented // #define IGNORE_BLOOD_LEAK_ALARM 1 // Ignore blood leak alarm // TODO New config implemented - #define DISABLE_SERVICE_RECORD 1 +// #define DISABLE_SERVICE_RECORD 1 // Skip Pre-Treatment and get to treatment as soon as possible #define SKIP_UI_INTERACTION 1 // Skip UI interaction. // TODO New config implemented Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r9c785a779da348df1c066ae0da2d0f53de7ea936 -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 9c785a779da348df1c066ae0da2d0f53de7ea936) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -26,11 +26,13 @@ #include "Compatible.h" #include "CPLD.h" #include "DialInFlow.h" +#include "DialOutFlow.h" #include "FPGA.h" #include "Integrity.h" #include "ModeInitPOST.h" #include "NVDataMgmt.h" #include "OperationModes.h" +#include "PresOccl.h" #include "RTC.h" #include "SafetyShutdown.h" #include "SyringePump.h" @@ -188,11 +190,16 @@ postState = handlePOSTStatus( testStatus ); break; - case POST_STATE_DIALYSATE_FLOW: + case POST_STATE_DIALYSATE_INLET_FLOW: testStatus = execDialInFlowTest(); postState = handlePOSTStatus( testStatus ); break; + case POST_STATE_DIALYSATE_OUTLET_FLOW: + testStatus = execDialOutFlowTest(); + postState = handlePOSTStatus( testStatus ); + break; + case POST_STATE_BLOOD_LEAK: testStatus = execBloodLeakSelfTest(); postState = handlePOSTStatus( testStatus ); @@ -208,6 +215,11 @@ postState = handlePOSTStatus( testStatus ); break; + case POST_STATE_PRES_OCCL: + testStatus = execPresOcclSelfTest(); + postState = handlePOSTStatus( testStatus ); + break; + case POST_STATE_ALARM_AUDIO: #ifndef DISABLE_ALARM_AUDIO testStatus = execAlarmAudioSelfTest(); Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -r40f46e196349e3dd730048a354df8bbb2e40407d -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 40f46e196349e3dd730048a354df8bbb2e40407d) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -548,8 +548,8 @@ execSampleWater(); #ifndef SKIP_SAMPLE_WATER - if ( ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() ) || - ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE ) ) + if ( ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() ) /*|| + ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )*/ ) // DEBUG_DENALI #endif { cmdDGSampleWater( SAMPLE_WATER_CMD_END ); Index: firmware/App/Modes/SelfTests.c =================================================================== diff -u -r40f46e196349e3dd730048a354df8bbb2e40407d -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision 40f46e196349e3dd730048a354df8bbb2e40407d) +++ firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -267,7 +267,7 @@ break; case NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE: - execDialInFlowTest(); + // TODO as of now, the dialysate flow self test only gets the calibration record so it is only called in POST currentNoCartSelfTestsState = NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE; break; @@ -384,7 +384,7 @@ // TODO: Remove once dry self-test is ready to use currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE; } - else +#else { currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE; } Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r40f46e196349e3dd730048a354df8bbb2e40407d -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 40f46e196349e3dd730048a354df8bbb2e40407d) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -5480,7 +5480,7 @@ memcpy(&payloadLength, payloadPtr, sizeof(U32)); payloadPtr += sizeof(U32); - status = setCalibrationRecord( currentMessage, totalMessages, payloadLength, payloadPtr ); + status = receiveRecordFromDialin( NVDATAMGMT_CALIBRATION_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr ); // Respond to request sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status ); @@ -5505,7 +5505,7 @@ // Tester must be logged in if ( TRUE == isTestingActivated() ) { - result = getCalibrationRecord(); + result = sendRecordToDialin( NVDATAMGMT_CALIBRATION_RECORD ); } } @@ -5628,7 +5628,7 @@ memcpy(&payloadLength, payloadPtr, sizeof(U32)); payloadPtr += sizeof(U32); - status = setSystemRecord( currentMessage, totalMessages, payloadLength, payloadPtr ); + status = receiveRecordFromDialin( NVDATAMGMT_SYSTEM_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr ); // Respond to request sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status ); @@ -5653,7 +5653,7 @@ // Tester must be logged in if ( TRUE == isTestingActivated() ) { - result = getSystemRecord(); + result = sendRecordToDialin( NVDATAMGMT_SYSTEM_RECORD ); } } @@ -5744,7 +5744,7 @@ // Tester must be logged in if ( TRUE == isTestingActivated() ) { - result = getServiceRecord(); + result = sendRecordToDialin( NVDATAMGMT_SERVICE_RECORD ); } } @@ -5810,7 +5810,7 @@ memcpy(&payloadLength, payloadPtr, sizeof(U32)); payloadPtr += sizeof(U32); - status = setServiceRecord( currentMessage, totalMessages, payloadLength, payloadPtr ); + status = receiveRecordFromDialin( NVDATAMGMT_SERVICE_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr ); // Respond to request sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status ); Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r687dc2717d2f6b128b73526791f08d7176e447e8 -r2acaf549519854f7e6de1511d541582267f4d1e8 --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 687dc2717d2f6b128b73526791f08d7176e447e8) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 2acaf549519854f7e6de1511d541582267f4d1e8) @@ -110,12 +110,6 @@ #endif #endif #endif - -#ifndef IGNORE_BLOOD_LEAK_ALARM - // Monitor blood leak detector for testing on a fixture only - execBloodLeak(); -#endif - // 2nd pass for FPGA execFPGAOut(); }