Index: firmware/App/Services/AlarmMgmtTD.c =================================================================== diff -u -r027a8c7ac2a20cae3304dd6d72d54a1edbc19820 -r7e00f12bd328748031b4ed86ee7189ff38ac4816 --- firmware/App/Services/AlarmMgmtTD.c (.../AlarmMgmtTD.c) (revision 027a8c7ac2a20cae3304dd6d72d54a1edbc19820) +++ firmware/App/Services/AlarmMgmtTD.c (.../AlarmMgmtTD.c) (revision 7e00f12bd328748031b4ed86ee7189ff38ac4816) @@ -245,6 +245,7 @@ { requestNewOperationMode( MODE_FAUL ); } + // If alarm has stop property, signal stop now if ( TRUE == props.alarmStops ) { Index: firmware/App/Services/StateServices/TubeSetInstall.h =================================================================== diff -u -r027a8c7ac2a20cae3304dd6d72d54a1edbc19820 -r7e00f12bd328748031b4ed86ee7189ff38ac4816 --- firmware/App/Services/StateServices/TubeSetInstall.h (.../TubeSetInstall.h) (revision 027a8c7ac2a20cae3304dd6d72d54a1edbc19820) +++ firmware/App/Services/StateServices/TubeSetInstall.h (.../TubeSetInstall.h) (revision 7e00f12bd328748031b4ed86ee7189ff38ac4816) @@ -55,9 +55,9 @@ BOOL handleAutoLoadRequest( MESSAGE_T *message ); // Handle UI auto-load confirmation request BOOL handleSetupTubingSetConnectionConfirmRequest( MESSAGE_T *message ); // Handle UI setup tubing set connection confirmation request -void setTubeSetType( TUBE_SET_TYPE_T type ); // Set the current installed tube set type TODO: Call this after implementing bar code logic -TUBE_SET_TYPE_T getTubeSetType( void ); // Get the current installed tube set type -void validateTubeSetType( void ); // Validate tube set type with the modality TODO: call this after implementing bar code logic and setting the tube set type +void setTubeSetType( TUBE_SET_TYPE_T type ); // Set the current installed tube set type TODO: Call this after implementing bar code logic +TUBE_SET_TYPE_T getTubeSetType( void ); // Get the current installed tube set type +void validateTubeSetType( void ); // Validate tube set type with the modality TODO: call this after implementing bar code logic and setting the tube set type /**@}*/