Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -rf416391a93d78ea154b43afd09a8764e2573fd9a -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision f416391a93d78ea154b43afd09a8764e2573fd9a) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -421,7 +421,6 @@ #ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) ) -#endif { if ( ARTERIAL_PRESSURE_NORMAL_OP == artPresStatus ) { @@ -450,6 +449,9 @@ } // Convert arterial pressure to mmHg if no fault else if ( 0 == artPresAlarm ) +#else + if ( 0 == artPresAlarm ) +#endif { U08 artReadCtr = getFPGAArterialPressureReadCounter(); U08 artErrorCtr = getFPGAArterialPressureErrorCounter(); @@ -498,13 +500,13 @@ // If venous pressure sensor status is not normal, fault #ifndef _RELEASE_ else if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) -#endif { if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT, TRUE ) ) { SET_ALARM_WITH_1_U32_DATA( ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT, (U32)venPresStatus ) } } +#endif else { resetPersistentAlarmTimer( ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT ); Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -rf416391a93d78ea154b43afd09a8764e2573fd9a -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision f416391a93d78ea154b43afd09a8764e2573fd9a) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -955,6 +955,7 @@ calcSafetyVolumeDelivered(); // Calculate measured rate (mL/hr) calcMeasRate(); + #ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE ) #endif Index: firmware/App/Modes/ConsumableSelfTest.c =================================================================== diff -u -r7c8b6b72e4c5152e3a9c213bc1dacd85c081ab14 -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Modes/ConsumableSelfTest.c (.../ConsumableSelfTest.c) (revision 7c8b6b72e4c5152e3a9c213bc1dacd85c081ab14) +++ firmware/App/Modes/ConsumableSelfTest.c (.../ConsumableSelfTest.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -77,19 +77,23 @@ { case CONSUMABLE_SELF_TESTS_INSTALL_STATE: +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) ) +#endif { consumableInstallConfirmed = TRUE; } // TODO: Check for DG straw door status to be open once DG door driver implemented if ( TRUE == consumableInstallConfirmed ) { consumableInstallConfirmed = FALSE; +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONSUMABLES_TESTS ) != SW_CONFIG_ENABLE_VALUE ) { currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_FILL_CMD_STATE; } else +#endif { currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE; } Index: firmware/App/Modes/Dialysis.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -952,12 +952,16 @@ result = SALINE_BOLUS_STATE_IDLE; } // Determine if saline bolus is under/over delivering - else if ( ( fabs( expectedSalineBolusVolume_mL - bolusSalineVolumeDelivered_mL ) > maxBolusErrorMl ) && - ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) ) + else if ( fabs( expectedSalineBolusVolume_mL - bolusSalineVolumeDelivered_mL ) > maxBolusErrorMl ) { - activateAlarmNoData( ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE ); - errorFound = TRUE; - result = SALINE_BOLUS_STATE_IDLE; +#ifndef _RELEASE_ + if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) +#endif + { + activateAlarmNoData( ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE ); + errorFound = TRUE; + result = SALINE_BOLUS_STATE_IDLE; + } } } Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -224,14 +224,18 @@ break; case POST_STATE_ALARM_AUDIO: +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE ) +#endif { testStatus = execAlarmAudioSelfTest(); } +#ifndef _RELEASE_ else { testStatus = SELF_TEST_STATUS_PASSED; } +#endif postState = handlePOSTStatus( testStatus ); break; Index: firmware/App/Modes/ModePostTreat.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -366,7 +366,9 @@ if ( STATE_CLOSED == getFPGADoorState() ) { +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) ) +#endif { patientDisconnectionConfirmed = TRUE; } @@ -411,10 +413,12 @@ { HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE; +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) ) { disposableRemovalConfirmed = TRUE; } +#endif if ( TRUE == disposableRemovalConfirmed ) { Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -189,7 +189,9 @@ switch ( currentPreTreatmentState ) { case HD_PRE_TREATMENT_START_STATE: +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE ) +#endif { transitionToSampleWater(); } @@ -346,10 +348,12 @@ BOOL accepted = FALSE; REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM; +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) ) { patientConnectionConfirm = TRUE; } +#endif if ( TRUE == patientConnectionConfirm ) { @@ -536,29 +540,33 @@ execSampleWater(); #ifndef SKIP_SAMPLE_WATER - if ( ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() ) || - ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) ) ) + if ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() ) #endif { - cmdDGSampleWater( SAMPLE_WATER_CMD_END ); - - if ( SELF_TEST_STATUS_PASSED == getSampleWaterResult() ) +#ifndef _RELEASE_ + if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) ) +#endif { - if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) ) + cmdDGSampleWater( SAMPLE_WATER_CMD_END ); + + if ( SELF_TEST_STATUS_PASSED == getSampleWaterResult() ) { - state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE; - cmdStartDG(); - transitionToConsumableSelfTest(); + if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) ) + { + state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE; + cmdStartDG(); + transitionToConsumableSelfTest(); + } + else + { + cmdStopDG(); + } } else { - cmdStopDG(); + requestNewOperationMode( MODE_STAN ); } } - else - { - requestNewOperationMode( MODE_STAN ); - } } return state; @@ -641,10 +649,12 @@ { HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_CART_INSTALL_STATE; +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) ) { confirmInstallRequested = TRUE; } +#endif if ( TRUE == confirmInstallRequested ) { @@ -757,10 +767,12 @@ execPreTreatmentRecirc(); +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) ) { continueToTreatmentRequested = TRUE; } +#endif if ( TRUE == continueToTreatmentRequested ) { @@ -952,21 +964,25 @@ { U32 volume = FILL_RESERVOIR_TO_VOLUME_ML; +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE ) { volume = PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML; } +#endif cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM ); } else { U32 volume = FILL_RESERVOIR_TO_VOLUME_ML; +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE ) { volume = PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML; } +#endif cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM ); } @@ -975,10 +991,12 @@ { U32 volume = FILL_RESERVOIR_TO_VOLUME_ML; +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE ) { volume = PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML; } +#endif cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM ); } @@ -1051,11 +1069,13 @@ if ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] ) { +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) { reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE; } else +#endif { reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE; cmdSetDGActiveReservoir( DG_RESERVOIR_1 ); Index: firmware/App/Modes/Prime.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Modes/Prime.c (.../Prime.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Modes/Prime.c (.../Prime.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -181,11 +181,13 @@ switch ( currentPrimeState ) { case HD_PRIME_START_STATE: +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) { currentPrimeState = HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE; } else +#endif { currentPrimeState = HD_PRIME_WAIT_FOR_USER_START_STATE; } @@ -426,10 +428,12 @@ // Keep updating start time until the user requested priming primeStartTime = getMSTimerCount(); +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) ) { primeStartRequested = TRUE; } +#endif if ( TRUE == primeStartRequested ) { @@ -581,11 +585,13 @@ steadyVolumeSamplingStartTime = getMSTimerCount(); primeDialysateDialyzerStartTime = getMSTimerCount(); +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) { state = HD_PRIME_WET_SELF_TESTS_STATE; } else +#endif { state = HD_PRIME_DIALYSATE_DIALYZER_STATE; } @@ -832,14 +838,21 @@ signalResumeSelfTests(); } +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) +#endif { execWetSelfTests(); } - if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) || ( TRUE == isWetSelfTestsPassed() ) ) + if ( TRUE == isWetSelfTestsPassed() ) { - state = HD_PRIME_COMPLETE; +#ifndef _RELEASE_ + if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) +#endif + { + state = HD_PRIME_COMPLETE; + } } if ( TRUE == doesAlarmStatusIndicateStop() ) Index: firmware/App/Modes/Rinseback.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -402,13 +402,17 @@ result = RINSEBACK_PAUSED_STATE; } // Is rinseback taking too long? - else if ( ( fabs( expectedRinsebackVolume_mL - getRinsebackVolume() ) > MAX_RINSEBACK_VOLUME_ERROR_ML ) && - ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) ) + else if ( fabs( expectedRinsebackVolume_mL - getRinsebackVolume() ) > MAX_RINSEBACK_VOLUME_ERROR_ML ) { - setRinsebackIsCompleted( TRUE ); - setupForRinsebackStopOrPause(); - activateAlarmNoData( ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE ); - result = RINSEBACK_STOP_STATE; +#ifndef _RELEASE_ + if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) +#endif + { + setRinsebackIsCompleted( TRUE ); + setupForRinsebackStopOrPause(); + activateAlarmNoData( ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE ); + result = RINSEBACK_STOP_STATE; + } } // Otherwise, continue rinseback else Index: firmware/App/Modes/SampleWater.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Modes/SampleWater.c (.../SampleWater.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Modes/SampleWater.c (.../SampleWater.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -129,10 +129,12 @@ { SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED; +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) ) { sampleWaterResult = TRUE; } +#endif if ( TRUE == sampleWaterResult ) { Index: firmware/App/Modes/SelfTests.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -235,11 +235,13 @@ F32 const bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ); F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE ); +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE ) { useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE ); } else +#endif { useHeparin = FALSE; } @@ -400,11 +402,13 @@ if ( TRUE == didTimeout( selfTestStartTime, CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS ) ) { setOcclusionInstallLevel(); // Record occlusion pressure level after a new cartridge is installed +#ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) ) { currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE; } else +#endif { currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE; } @@ -1083,11 +1087,13 @@ if ( TRUE == selfTestsResumeRequested ) { selfTestsResumeRequested = FALSE; +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE ) { state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE; } else +#endif { state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE; } @@ -1267,11 +1273,15 @@ { WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE; - if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) || - ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() ) ) + if ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() ) { - settleStartTime = getMSTimerCount(); - state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE; +#ifndef _RELEASE_ + if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) +#endif + { + settleStartTime = getMSTimerCount(); + state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE; + } } if ( TRUE == doesAlarmStatusIndicateStop() ) @@ -1380,6 +1390,8 @@ F32 const resTwoDiffAfterDisplacement = getReservoirWeightLargeFilter( DG_RESERVOIR_2 ) - reservoirVolume[ DG_RESERVOIR_2 ]; F32 const integratedVolumeToTargetPercent = fabs( 1.0 - ( fmdIntegratedVolume / WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML ) ); + // + if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) && ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE ) ) { Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r8948f660dc5440db9e6cb7705457ed71d2b13248 -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 8948f660dc5440db9e6cb7705457ed71d2b13248) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -894,6 +894,7 @@ else { if ( alarmStatus.alarmsState < NUM_OF_ALARM_PRIORITIES ) +#ifndef _RELEASE_ { if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE ) { @@ -903,6 +904,7 @@ } } else +#endif { SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE, alarmStatus.alarmsState ) setAlarmAudioState( ALARM_PRIORITY_HIGH, Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r8948f660dc5440db9e6cb7705457ed71d2b13248 -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 8948f660dc5440db9e6cb7705457ed71d2b13248) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -153,7 +153,9 @@ data[ msgSize++ ] = 0; } +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACK_ERRORS ) != SW_CONFIG_ENABLE_VALUE ) +#endif { // If ACK required, add to pending ACK list if ( TRUE == ackReq ) @@ -5830,6 +5832,7 @@ TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; BOOL result = FALSE; +#ifndef _RELEASE_ // Verify payload length if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen ) { @@ -5843,6 +5846,7 @@ result = testResetValvesCurrentOverride( payload.index ); } } +#endif // Respond to request sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); @@ -5895,6 +5899,7 @@ TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; BOOL result = FALSE; +#ifndef _RELEASE_ // Verify payload length if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen ) { @@ -5908,6 +5913,7 @@ result = testResetValvesPositionCountOverride( payload.index ); } } +#endif // Respond to request sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); Index: firmware/App/Services/WatchdogMgmt.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -184,11 +184,15 @@ watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED; } // Verify backup alarm audio is on when w.d. expired - else if ( ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA ) && - ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE ) ) + else if ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA ) { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 3.0, audioCurrent ); - watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED; +#ifndef _RELEASE_ + if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE ) +#endif + { + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 3.0, audioCurrent ); + watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED; + } } } else @@ -215,11 +219,15 @@ watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED; } // Verify backup alarm audio is on when w.d. recovered - else if ( ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA ) && - ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE ) ) + else if ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA ) { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 5.0, audioCurrent ); - watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED; +#ifndef _RELEASE_ + if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE ) +#endif + { + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 5.0, audioCurrent ); + watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED; + } } else { Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) @@ -76,7 +76,9 @@ // Monitor air trap level sensors execAirTrapMonitor(); +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE ) +#endif { // Control/Monitor syringe pump execSyringePump();