Index: firmware/App/Modes/SelfTests.c =================================================================== diff -u -r1938d786d91940cec928e47a321b06e037b351b9 -r97a2c1e5f702a7d70d5a6fa46fac333b296aa5b3 --- firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision 1938d786d91940cec928e47a321b06e037b351b9) +++ firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision 97a2c1e5f702a7d70d5a6fa46fac333b296aa5b3) @@ -900,6 +900,9 @@ DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE; BUBBLE_STATUS_T const 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 ) && ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) && ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) ) @@ -1432,6 +1435,10 @@ F32 averageDisp = ( resOneDiffAfterDisplacement + resTwoDiffAfterDisplacement ) / 2.0; F32 integratedVolumeToTargetPercent = fabs( 1.0 - ( fmdIntegratedVolume / averageDisp ) ); + + SEND_EVENT_WITH_2_F32_DATA(HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT,resOneDiffAfterDisplacement,resOneDiffAfterDisplacement) + SEND_EVENT_WITH_2_F32_DATA(HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT,integratedVolumeDiff,WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE) + if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) && ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE ) ) { @@ -1558,6 +1565,9 @@ F32 avgDisp = ( resOneDiffAfterDisplacement + resTwoDiffAfterDisplacement ) / 2.0; F32 integratedVolumeToTargetPercent = fabs( 1.0 - ( fmdIntegratedVolume / avgDisp ) ); + SEND_EVENT_WITH_2_F32_DATA(HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT,resOneDiffAfterDisplacement,resOneDiffAfterDisplacement) + SEND_EVENT_WITH_2_F32_DATA(HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT,integratedVolumeToTargetPercent,WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE) + if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) && ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE ) ) {