Index: firmware/App/Controllers/BloodLeak.c =================================================================== diff -u -reea2857548dfde4f092983ede2c2bd1d1453fa12 -r4760b847bd262dfc693b3d3458864c05b1c816d7 --- firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision eea2857548dfde4f092983ede2c2bd1d1453fa12) +++ firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision 4760b847bd262dfc693b3d3458864c05b1c816d7) @@ -649,6 +649,7 @@ // Check if the zero command has been requested state = ( TRUE == hasZeroBloodLeakBeenRequested() ? BLOOD_LEAK_PREP_FOR_ZERO_CMD_STATE : state ); + return state; } @@ -740,8 +741,8 @@ * @brief * The handleBloodLeakPrepForSelfTestCmdState function handles the blood leak * prepare for self test command state. - * @details Inputs: bloodLeakCmd - * @details Outputs: bloodLeakCmd + * @details Inputs: bloodLeakGPIOCmd + * @details Outputs: bloodLeakGPIOCmd * @return next state *************************************************************************/ static BLOOD_LEAK_STATE_T handleBloodLeakPrepForSelfTestCmdState( void ) @@ -973,56 +974,56 @@ switch( bloodLeakEmbModeRqstedCmd ) { - case NU_EMB_MODE_CMD: - // Null command do nothing - break; + case NU_EMB_MODE_CMD: + // Null command do nothing + break; - case CS_EMB_MODE_CMD: - case T_EMB_MODE_CMD: - case G_EMB_MODE_CMD: - case I_EMB_MODE_CMD: - case V_EMB_MODE_CMD: - case Z_EMB_MODE_CMD: - case Q_EMB_MODE_CMD: - case D_EMB_MODE_CMD: - case C_EMB_MODE_CMD: - // First clear the buffer from the older data - memset( bloodLeakEmbModeCmdSquence, 0x0, 2 * BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH ); - // Set the command sequence - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = BLOOD_LEAK_EMB_MODE_COMM_RESET; - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = TRUE; - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_LOW; - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = TRUE; - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_CMD_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = command; - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_CMD_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = FALSE; - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_STOP_WRITE_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = BLOOD_LEAK_STOP_WRITE_FIFO_COMMAND; - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_STOP_WRITE_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = FALSE; - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_HIGH; - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = TRUE; - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_LOW; - bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = TRUE; + case CS_EMB_MODE_CMD: + case T_EMB_MODE_CMD: + case G_EMB_MODE_CMD: + case I_EMB_MODE_CMD: + case V_EMB_MODE_CMD: + case Z_EMB_MODE_CMD: + case Q_EMB_MODE_CMD: + case D_EMB_MODE_CMD: + case C_EMB_MODE_CMD: + // First clear the buffer from the older data + memset( bloodLeakEmbModeCmdSquence, 0x0, 2 * BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH ); + // Set the command sequence + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = BLOOD_LEAK_EMB_MODE_COMM_RESET; + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = TRUE; + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_LOW; + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = TRUE; + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_CMD_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = command; + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_CMD_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = FALSE; + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_STOP_WRITE_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = BLOOD_LEAK_STOP_WRITE_FIFO_COMMAND; + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_STOP_WRITE_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = FALSE; + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_HIGH; + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = TRUE; + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ] = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_LOW; + bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = TRUE; - // Set the variables for the next state - bloodLeakUARTCmdIndex = 0; - bloodLeakEmbModeRespIndex = 0; - bloodLeakEmbModeCmdSeqLength = BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH; - bloodLeakEmbModeOpsStartTime = getMSTimerCount(); - state = BLOOD_LEAK_CAL_SEND_COMMAND_STATE; - // Clear the response buffer to able to receive fresh data - memset( bloodLeakEmbModeRespBuffer, 0x0, BLOOD_LEAK_EMB_MODE_RESP_BUFFER_LEN ); - break; + // Set the variables for the next state + bloodLeakUARTCmdIndex = 0; + bloodLeakEmbModeRespIndex = 0; + bloodLeakEmbModeCmdSeqLength = BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH; + bloodLeakEmbModeOpsStartTime = getMSTimerCount(); + state = BLOOD_LEAK_CAL_SEND_COMMAND_STATE; + // Clear the response buffer to able to receive fresh data + memset( bloodLeakEmbModeRespBuffer, 0x0, BLOOD_LEAK_EMB_MODE_RESP_BUFFER_LEN ); + break; - case SP_EMB_MODE_CMD: - prepareSetPointSeq( bloodLeakEmbModeSetPoint ); - bloodLeakEmbModeRespIndex = 0; - bloodLeakEmbModeOpsStartTime = getMSTimerCount(); - state = BLOOD_LEAK_CAL_SEND_COMMAND_STATE; - // Clear the command sequence buffer in case it is needed to send byte read request. The byte - // read requests are sent using this buffer while the set point is set using the set point buffer - memset( bloodLeakEmbModeCmdSquence, 0x0, 2 * BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH ); - // Clear the response buffer to able to receive fresh data - memset( bloodLeakEmbModeRespBuffer, 0x0, BLOOD_LEAK_EMB_MODE_RESP_BUFFER_LEN ); - break; + case SP_EMB_MODE_CMD: + prepareSetPointSeq( bloodLeakEmbModeSetPoint ); + bloodLeakEmbModeRespIndex = 0; + bloodLeakEmbModeOpsStartTime = getMSTimerCount(); + state = BLOOD_LEAK_CAL_SEND_COMMAND_STATE; + // Clear the command sequence buffer in case it is needed to send byte read request. The byte + // read requests are sent using this buffer while the set point is set using the set point buffer + memset( bloodLeakEmbModeCmdSquence, 0x0, 2 * BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH ); + // Clear the response buffer to able to receive fresh data + memset( bloodLeakEmbModeRespBuffer, 0x0, BLOOD_LEAK_EMB_MODE_RESP_BUFFER_LEN ); + break; } return state; Index: firmware/App/Controllers/Fans.c =================================================================== diff -u -r372f524a0baa83b446b7a69bd869cfdea59ce295 -r4760b847bd262dfc693b3d3458864c05b1c816d7 --- firmware/App/Controllers/Fans.c (.../Fans.c) (revision 372f524a0baa83b446b7a69bd869cfdea59ce295) +++ firmware/App/Controllers/Fans.c (.../Fans.c) (revision 4760b847bd262dfc693b3d3458864c05b1c816d7) @@ -507,13 +507,6 @@ broadcastData( MSG_ID_HD_FANS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( FANS_DATA_T ) ); fansPublishCounter = 0; - - // TODO remove this debug output - // Send a comma delimited debug message with drift data - F32 test = 12.2; - char tempCharBuffer[ 64 ]; - sprintf( tempCharBuffer, "Fan_Rpm, %3.2f,temp_sensor, %3.2f", 2500.0, 17.2 ); - broadcastData( MSG_ID_HD_DEBUG_EVENT, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)tempCharBuffer, strlen( tempCharBuffer ) ); } } Index: firmware/App/Controllers/Switches.c =================================================================== diff -u -rcbaa57803fa8359407a799fca0cde6ae2c486bd7 -r4760b847bd262dfc693b3d3458864c05b1c816d7 --- firmware/App/Controllers/Switches.c (.../Switches.c) (revision cbaa57803fa8359407a799fca0cde6ae2c486bd7) +++ firmware/App/Controllers/Switches.c (.../Switches.c) (revision 4760b847bd262dfc693b3d3458864c05b1c816d7) @@ -52,7 +52,6 @@ static BOOL requireDoorClosed; ///< Flag indicates whether door is required to be closed in current state. static BOOL requirePumpTrackLocked; ///< Flag indicates whether pump track is required to be locked in current state. - // ********** private function prototypes ********** static void publishSwitchesData( void ); Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -r372f524a0baa83b446b7a69bd869cfdea59ce295 -r4760b847bd262dfc693b3d3458864c05b1c816d7 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 372f524a0baa83b446b7a69bd869cfdea59ce295) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 4760b847bd262dfc693b3d3458864c05b1c816d7) @@ -400,13 +400,6 @@ data.opMode = (U32)currentMode; data.subMode = currentSubMode; broadcastData( MSG_ID_HD_OP_MODE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( OP_MODE_PAYLOAD_T ) ); - - // TODO remove this debug output - // Send a comma delimited debug message with drift data - F32 test = 12.2; - char tempCharBuffer[ 64 ]; - sprintf( tempCharBuffer, "LoadCellOldDrift, %3.2f,LoadCellNewDrift, %3.2f", test, test ); - broadcastData( MSG_ID_HD_DEBUG_EVENT, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)tempCharBuffer, strlen( tempCharBuffer ) ); } } Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -rbb5280946ac08388b456c7c1848d7797c4a28038 -r4760b847bd262dfc693b3d3458864c05b1c816d7 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision bb5280946ac08388b456c7c1848d7797c4a28038) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 4760b847bd262dfc693b3d3458864c05b1c816d7) @@ -1150,7 +1150,6 @@ handleTesterLogInRequest( message ); break; - // The default cannot be reached in VectorCAST since the cases are run in a for loop default: // Un-recognized or un-handled message ID received - ignore break; @@ -1655,7 +1654,6 @@ handleSetBloodLeakEmbeddedModeCommand( message ); break; - // The default cannot be reached in VectorCAST since the cases are run in a for loop default: // Unrecognized message ID received - ignore break;