Index: firmware/App/Services/DrySelfTests.c =================================================================== diff -u -r517b50e8915764d862fc9d38930c345c8f609196 -rf47837d7c20f6ebe4950758aa4f153ac79d5ae57 --- firmware/App/Services/DrySelfTests.c (.../DrySelfTests.c) (revision 517b50e8915764d862fc9d38930c345c8f609196) +++ firmware/App/Services/DrySelfTests.c (.../DrySelfTests.c) (revision f47837d7c20f6ebe4950758aa4f153ac79d5ae57) @@ -79,13 +79,6 @@ U32 modalityMatch; } UI_TUBING_SET_AUTH_RESPONSE_PAYLOAD_T; -/// Payload record structure for dry self-test authentication response -typedef struct -{ - U32 accepted; - U32 modality; -} TD_TUBING_SET_AUTH_RESPONSE_PAYLOAD_T; - // ********** private data ********** static DRY_SELF_TESTS_STATE_T currentDrySelfTestsState; ///< Current state of Dry Self-Test state machine @@ -452,7 +445,7 @@ * The handleDrySelfTestTubingSetLoadedCheckState function handles barcode * scan result and transitions to authentication state if scan succeeded. * @details \b Inputs: barcodeScanResponseReceived, barcodeScanSuccessful -* @details \b Outputs: none +* @details \b Outputs: authenticationStartTime * @return the next state of dry self-tests state machine *************************************************************************/ static DRY_SELF_TESTS_STATE_T handleDrySelfTestTubingSetLoadedCheckState( void ) @@ -482,7 +475,7 @@ * authentication and processes the authentication response. * @details \b Inputs: authResponseReceived, authResponseValidTubingSet, * authResponseModalityAccepted -* @details \b Outputs: none +* @details \b Outputs: pressureSelfTestPreNormalStartTime * @return the next state of dry self-tests state machine *************************************************************************/ static DRY_SELF_TESTS_STATE_T handleDrySelfTestTubingSetAuthenticationState( void ) @@ -854,12 +847,13 @@ /*********************************************************************//** * @brief -* The drySelfTestHandleBarcodeScanResponse function handles the UI +* The drySelfTestHandleTubingSetAuthResponse function handles the UI * barcode scan response. * @details \b Message \b Received: MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK * @details \b Message \b Sent: MSG_ID_TD_TUBE_SET_AUTHENTICATION_ACK * @details \b Inputs: message containing barcode scan success status -* @details \b Outputs: barcodeScanSuccessful, barcodeScanResponseReceived +* @details \b Outputs: authResponseValidTubingSet, authResponseModalityAccepted, +* authResponseReceived * @return TRUE if request is valid, FALSE otherwise *************************************************************************/ BOOL drySelfTestHandleTubingSetAuthResponse( MESSAGE_T *message ) @@ -873,9 +867,9 @@ memcpy( &payload, message->payload, sizeof( payload ) ); authResponseValidTubingSet = (BOOL)payload.validTubingSet; - authResponseModalityAccepted = (BOOL)payload.modalityMatch; - authResponseReceived = TRUE; - result = TRUE; + authResponseModalityAccepted = (BOOL)payload.modalityMatch; + authResponseReceived = TRUE; + result = TRUE; } return result;