Index: firmware/App/Modes/SelfTests.c =================================================================== diff -u -ref6283257df7c1f993d58fb934da57ea3e0a7067 -rddf6c806a996119aee480bad2d7222385880c94a --- firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision ef6283257df7c1f993d58fb934da57ea3e0a7067) +++ firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision ddf6c806a996119aee480bad2d7222385880c94a) @@ -442,6 +442,13 @@ setValveAirTrap( STATE_OPEN ); currentDrySelfTestsState = DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE; } +#ifndef _RELEASE_ + if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE ) ) + { + setValveAirTrap( STATE_CLOSED ); + currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE; + } +#endif break; case DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE: @@ -896,9 +903,8 @@ static DRY_SELF_TESTS_STATE_T handleDrySelfTestUsedCartridgeCheckState( void ) { DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE; - BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV ); + BUBBLE_STATUS_T ADVBubbleStatus = getBubbleStatus( ADV ); - SEND_EVENT_WITH_2_U32_DATA(HD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT,(U32)ADVBubbleStatus,(U32)BUBBLE_DETECTED) if ( ( BUBBLE_DETECTED == ADVBubbleStatus ) && @@ -909,7 +915,12 @@ } else { - activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE ); +#ifndef _RELEASE_ + if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE ) != SW_CONFIG_ENABLE_VALUE ) +#endif + { + activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE ); + } } if ( TRUE == doesAlarmStatusIndicateStop() )