Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -rae44d1d2bd41782980f0accb46e6150a0f202ede -r9ac7866cce73b5281c34626ab5903409778e2b19 --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision ae44d1d2bd41782980f0accb46e6150a0f202ede) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 9ac7866cce73b5281c34626ab5903409778e2b19) @@ -91,7 +91,7 @@ #define FIVE_PCT_OVER_ALLOWANCE 1.05 ///< Allow 5 percent over target before alarming on over travel. /// Expected position of empty in relation to home postion. -#define SYRINGE_PUMP_EMPTY_POS ( SYRINGE_ENCODER_COUNTS_PER_ML * 11.0 ) // TODO - get syringe volume from home to empty (11 mL is placeholder) +#define SYRINGE_PUMP_EMPTY_POS ( SYRINGE_ENCODER_COUNTS_PER_ML * 10.84 ) /// Margin of error for empty position determination. #define SYRINGE_PUMP_EMPTY_POS_MARGIN ( SYRINGE_ENCODER_COUNTS_PER_ML * 0.5 ) /// Minimum retract position. @@ -1556,6 +1556,7 @@ { S32 pos = getSyringePumpPosition(); + // If near empty position, assume syringe is empty if ( fabs( pos - SYRINGE_PUMP_EMPTY_POS ) < SYRINGE_PUMP_EMPTY_POS_MARGIN ) { heparinDeliveryState = HEPARIN_STATE_EMPTY; Index: firmware/App/Drivers/Comm.c =================================================================== diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r9ac7866cce73b5281c34626ab5903409778e2b19 --- firmware/App/Drivers/Comm.c (.../Comm.c) (revision ccfd15568f1e3d304320c2babb2fd4bcf0413304) +++ firmware/App/Drivers/Comm.c (.../Comm.c) (revision 9ac7866cce73b5281c34626ab5903409778e2b19) @@ -33,9 +33,6 @@ // ********** private data ********** static volatile BOOL canXmitsInProgress = FALSE; ///< Flag indicates a CAN frame transmit is in progress. -#ifdef DEBUG_ENABLED - static volatile BOOL uartXmitsInProgress = FALSE; -#endif /*********************************************************************//** * @brief @@ -65,96 +62,6 @@ /*********************************************************************//** * @brief - * The signalSCI1XmitsInitiated function sets the SCI1 transmits in - * progress flag. - * @details Inputs: none - * @details Outputs: uartXmitsInProgress - * @return none - *************************************************************************/ -#ifdef DEBUG_ENABLED -void signalSCI1XmitsInitiated( void ) -{ - uartXmitsInProgress = TRUE; -} -#endif - -/*********************************************************************//** - * @brief - * The signalSCI1XmitsCompleted function resets the SCI1 transmits in - * progress flag. - * @details Inputs: none - * @details Outputs: uartXmitsInProgress - * @return none - *************************************************************************/ -#ifdef DEBUG_ENABLED -void signalSCI1XmitsCompleted( void ) -{ - uartXmitsInProgress = FALSE; -} -#endif - -/*********************************************************************//** - * @brief - * The setSCI1DMAReceiveInterrupt function enables DMA receive interrupts - * for the SCI1 peripheral. - * @details Inputs: none - * @details Outputs: DMA receive interrupt is enabled. - * @return none - *************************************************************************/ -#ifdef DEBUG_ENABLED -void setSCI1DMAReceiveInterrupt( void ) -{ - sciREG->SETINT = SCI_DMA_RECEIVE_INT; -} -#endif - -/*********************************************************************//** - * @brief - * The setSCI1DMATransmitInterrupt function enables DMA transmit interrupts - * for the SCI1 peripheral. - * @details Inputs: none - * @details Outputs: DMA transmit interrupt is enabled. - * @return none - *************************************************************************/ -#ifdef DEBUG_ENABLED -void setSCI1DMATransmitInterrupt( void ) -{ - sciREG->SETINT = SCI_DMA_TRANSMIT_INT; -} -#endif - -/*********************************************************************//** - * @brief - * The clearSCI1DMAReceiveInterrupt function disables DMA receive interrupts - * for the SCI1 peripheral. - * @details Inputs: none - * @details Outputs: DMA receive interrupt is disabled. - * @return none - *************************************************************************/ -#ifdef DEBUG_ENABLED -void clearSCI1DMAReceiveInterrupt( void ) -{ - sciREG->CLEARINT = SCI_DMA_RECEIVE_INT; -} -#endif - -/*********************************************************************//** - * @brief - * The clearSCI1DMATransmitInterrupt function disables DMA transmit interrupts - * for the SCI1 peripheral. - * @details Inputs: none - * @details Outputs: DMA transmit interrupt is disabled. - * @return none - *************************************************************************/ -#ifdef DEBUG_ENABLED -void clearSCI1DMATransmitInterrupt( void ) -{ - sciREG->CLEARINT = SCI_DMA_TRANSMIT_INT; -} -#endif - -/*********************************************************************//** - * @brief * The setSCI2DMAReceiveInterrupt function enables DMA receive interrupts * for the SCI2 peripheral. * @details Inputs: none @@ -236,25 +143,6 @@ /*********************************************************************//** * @brief * The isSCI2DMATransmitInProgress function determines whether a DMA transmit - * is in progress on the SCI1 peripheral. - * @details Inputs: status registers - * @details Outputs: none - * @return TRUE if a transmit is in progress, FALSE if not - *************************************************************************/ -#ifdef DEBUG_ENABLED -BOOL isSCI1DMATransmitInProgress( void ) -{ - BOOL transmitterBusy = ( ( sciREG->FLR & (U32)SCI_TX_INT ) == 0U ? TRUE : FALSE ); - BOOL dmaTransmitterBusy = ( ( dmaREG->PEND & DMA_CH_STATUS_BIT(DMA_CH3) ) != 0U ? TRUE : FALSE ); - - - return ( ( TRUE == uartXmitsInProgress ) || ( transmitterBusy == TRUE ) || ( dmaTransmitterBusy == TRUE ) ? TRUE : FALSE ); -} -#endif - -/*********************************************************************//** - * @brief - * The isSCI2DMATransmitInProgress function determines whether a DMA transmit * is in progress on the SCI2 peripheral. * @details Inputs: status registers * @details Outputs: none Index: firmware/App/Drivers/Comm.h =================================================================== diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r9ac7866cce73b5281c34626ab5903409778e2b19 --- firmware/App/Drivers/Comm.h (.../Comm.h) (revision ccfd15568f1e3d304320c2babb2fd4bcf0413304) +++ firmware/App/Drivers/Comm.h (.../Comm.h) (revision 9ac7866cce73b5281c34626ab5903409778e2b19) @@ -39,16 +39,6 @@ void signalCANXmitsInitiated( void ); void signalCANXmitsCompleted( void ); -#ifdef DEBUG_ENABLED - void signalSCI1XmitsInitiated( void ); - void signalSCI1XmitsCompleted( void ); - void setSCI1DMAReceiveInterrupt( void ); - void setSCI1DMATransmitInterrupt( void ); - void clearSCI1DMAReceiveInterrupt( void ); - void clearSCI1DMATransmitInterrupt( void ); - void clearSCI1CommErrors( void ); - BOOL isSCI1DMATransmitInProgress( void ); -#endif void setSCI2DMAReceiveInterrupt( void ); void setSCI2DMATransmitInterrupt( void ); void clearSCI2DMAReceiveInterrupt( void ); Index: firmware/App/Services/CommBuffers.h =================================================================== diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r9ac7866cce73b5281c34626ab5903409778e2b19 --- firmware/App/Services/CommBuffers.h (.../CommBuffers.h) (revision ccfd15568f1e3d304320c2babb2fd4bcf0413304) +++ firmware/App/Services/CommBuffers.h (.../CommBuffers.h) (revision 9ac7866cce73b5281c34626ab5903409778e2b19) @@ -49,10 +49,6 @@ COMM_BUFFER_IN_CAN_PC, ///< Buffer for incoming PC to HD messages COMM_BUFFER_OUT_CAN_PC, ///< Buffer for outgoing HD to PC messages COMM_BUFFER_LAST_CAN_BUFFER = COMM_BUFFER_OUT_CAN_PC, ///< Last CAN buffer -#ifdef DEBUG_ENABLED - COMM_BUFFER_IN_UART_PC, - COMM_BUFFER_OUT_UART_PC, -#endif NUM_OF_COMM_BUFFERS ///< Number of CAN communication buffers } COMM_BUFFER_T; Index: firmware/App/Services/Interrupts.c =================================================================== diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r9ac7866cce73b5281c34626ab5903409778e2b19 --- firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision ccfd15568f1e3d304320c2babb2fd4bcf0413304) +++ firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision 9ac7866cce73b5281c34626ab5903409778e2b19) @@ -240,25 +240,11 @@ signalFPGAReceiptCompleted(); break; -#ifdef DEBUG_ENABLED - case DMA_CH1: // PC receive channel - clearSCI1DMAReceiveInterrupt(); - // Handle received packet from PC - handleUARTMsgRecvPacketInterrupt(); - break; -#endif case DMA_CH2: // FPGA transmit channel clearSCI2DMATransmitInterrupt(); signalFPGATransmitCompleted(); break; -#ifdef DEBUG_ENABLED - case DMA_CH3: // PC transmit channel - clearSCI1DMATransmitInterrupt(); - // Send next pending packet to PC (if any) - handleUARTMsgXmitPacketInterrupt(); - break; -#endif default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT, channel ) break; Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r9a45dcbdfae33fc06479d99b8d52bada8f682194 -r9ac7866cce73b5281c34626ab5903409778e2b19 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 9a45dcbdfae33fc06479d99b8d52bada8f682194) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 9ac7866cce73b5281c34626ab5903409778e2b19) @@ -37,15 +37,8 @@ #define NUM_OF_CAN_OUT_BUFFERS 5 ///< Number of CAN buffers for transmit #define NUM_OF_CAN_IN_BUFFERS 7 ///< Number of CAN buffers for receiving -#ifndef DEBUG_ENABLED - #define NUM_OF_MSG_IN_BUFFERS 7 ///< Number of Msg buffers for receiving -#else - #define NUM_OF_MSG_IN_BUFFERS 8 - #define SCI1_RECEIVE_DMA_REQUEST 30 - #define SCI1_TRANSMIT_DMA_REQUEST 31 -#endif +#define NUM_OF_MSG_IN_BUFFERS 7 ///< Number of Msg buffers for receiving - #define CAN_XMIT_PACKET_TIMEOUT_MS 200 ///< If transmitted CAN frame does not cause a transmit complete interrupt within this time, re-send or move on #define MAX_XMIT_RETRIES 5 ///< Maximum number of retries on no transmit complete interrupt timeout @@ -97,9 +90,6 @@ COMM_BUFFER_IN_CAN_UI_2_HD, COMM_BUFFER_IN_CAN_UI_BROADCAST, COMM_BUFFER_IN_CAN_PC, -#ifdef DEBUG_ENABLED - COMM_BUFFER_IN_UART_PC -#endif }; static U08 lastCANPacketSent[ CAN_MESSAGE_PAYLOAD_SIZE ]; ///< Keep last packet sent on CAN bus in case we need to re-send. @@ -120,16 +110,6 @@ static U32 badCANCount; // Test code in support of EMC testing #endif -#ifdef DEBUG_ENABLED - // Debug buffers - static U08 pcXmitPacket[ 1024 ]; - static U08 pcRecvPacket[ PC_MESSAGE_PACKET_SIZE ] = { 0, 0, 0, 0, 0, 0, 0, 0 }; - - // DMA control records - static g_dmaCTRL pcDMAXmitControlRecord; - static g_dmaCTRL pcDMARecvControlRecord; -#endif - // ********** private function prototypes ********** static void clearCANXmitBuffers( void ); @@ -149,11 +129,6 @@ static BOOL matchACKtoPendingACKList( S16 seqNo ); static void checkPendingACKList( void ); -#ifdef DEBUG_ENABLED - static void initUARTAndDMA( void ); - static U32 transmitNextUARTPacket( void ); -#endif - /*********************************************************************//** * @brief * The initSystemComm function initializes the SystemComm module. @@ -165,11 +140,6 @@ { U32 i; -#ifdef DEBUG_ENABLED - // Initialize UART and DMA for PC communication - initUARTAndDMA(); -#endif - // Initialize bad message CRC time windowed count initTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC, MAX_COMM_CRC_FAILURES, MAX_COMM_CRC_FAILURE_WINDOW_MS ); @@ -339,14 +309,6 @@ } } } - -#ifdef DEBUG_ENABLED - // If UART transmitter is idle, start transmitting any pending packets - if ( FALSE == isSCI1DMATransmitInProgress() ) - { - transmitNextUARTPacket(); - } -#endif } /*********************************************************************//** @@ -399,113 +361,8 @@ } } -/*********************************************************************//*** - * @brief - * The handleUARTMsgRecvPacketInterrupt function handles a DMA UART receive - * packet completed interrupt. - * @details Inputs: none - * @details Outputs: UART received packet interrupt handled. - * @return none - *************************************************************************/ -#ifdef DEBUG_ENABLED -void handleUARTMsgRecvPacketInterrupt( void ) -{ - // Buffer received packet - addToCommBuffer( COMM_BUFFER_IN_UART_PC, pcRecvPacket, PC_MESSAGE_PACKET_SIZE ); - // Prepare to receive next packet - dmaSetCtrlPacket( DMA_CH1, pcDMARecvControlRecord ); - dmaSetChEnable( DMA_CH1, DMA_HW ); - setSCI1DMAReceiveInterrupt(); -} -#endif - /*********************************************************************//** * @brief - * The handleUARTMsgXmitPacketInterrupt function handles a DMA UART transmit - * packet completed interrupt. - * @details Inputs: none - * @details Outputs: UART transmit packet interrupt handled. - * @return none - *************************************************************************/ -#ifdef DEBUG_ENABLED -void handleUARTMsgXmitPacketInterrupt( void ) -{ - U32 bytesXmitted = transmitNextUARTPacket(); - - if ( 0 == bytesXmitted ) - { - signalSCI1XmitsCompleted(); - } -} -#endif - -/*********************************************************************//** - * @brief - * The initUARTAndDMA function initializes the SCI1 peripheral and the DMA - * to go with it for PC communication. - * @details Inputs: none - * @details Outputs: SCI1 and DMA initialized - * @return none - *************************************************************************/ -#ifdef DEBUG_ENABLED -static void initUARTAndDMA( void ) -{ - // Enable DMA block transfer complete interrupts - dmaEnableInterrupt( DMA_CH1, BTC ); - dmaEnableInterrupt( DMA_CH3, BTC ); - - // Assign DMA channels to h/w DMA requests - dmaReqAssign( DMA_CH1, SCI1_RECEIVE_DMA_REQUEST ); - dmaReqAssign( DMA_CH3, SCI1_TRANSMIT_DMA_REQUEST ); - // Set DMA channel priorities - dmaSetPriority( DMA_CH1, HIGHPRIORITY ); - dmaSetPriority( DMA_CH3, LOWPRIORITY ); - - // Initialize PC DMA Transmit Control Record - pcDMAXmitControlRecord.PORTASGN = 4; // Port B (only choice per datasheet) - pcDMAXmitControlRecord.DADD = (U32)(&(sciREG->TD)); // Dest. is SCI2 xmit register - pcDMAXmitControlRecord.SADD = (U32)pcXmitPacket; // Source - pcDMAXmitControlRecord.CHCTRL = 0; // No chaining - pcDMAXmitControlRecord.ELCNT = 1; // Frame is 1 element - pcDMAXmitControlRecord.FRCNT = PC_MESSAGE_PACKET_SIZE; // Block is 8 frames - pcDMAXmitControlRecord.RDSIZE = ACCESS_8_BIT; // Element size is 1 byte - pcDMAXmitControlRecord.WRSIZE = ACCESS_8_BIT; // - pcDMAXmitControlRecord.TTYPE = FRAME_TRANSFER; // Transfer type is block transfer - pcDMAXmitControlRecord.ADDMODEWR = ADDR_FIXED; // Dest. addressing mode is fixed - pcDMAXmitControlRecord.ADDMODERD = ADDR_INC1; // Source addressing mode is post-increment - pcDMAXmitControlRecord.AUTOINIT = AUTOINIT_OFF; // Auto-init off - pcDMAXmitControlRecord.ELSOFFSET = 0; // Not used - pcDMAXmitControlRecord.ELDOFFSET = 0; // Not used - pcDMAXmitControlRecord.FRSOFFSET = 0; // Not used - pcDMAXmitControlRecord.FRDOFFSET = 0; // Not used - - // Initialize PC DMA Receipt Control Record - pcDMARecvControlRecord.PORTASGN = 4; // Port B (only choice per datasheet) - pcDMARecvControlRecord.SADD = (U32)(&(sciREG->RD)); // Source is SCI2 recv register - pcDMARecvControlRecord.DADD = (U32)pcRecvPacket; // Transfer destination address - pcDMARecvControlRecord.CHCTRL = 0; // No chaining - pcDMARecvControlRecord.ELCNT = 1; // Frame is 1 element - pcDMARecvControlRecord.FRCNT = PC_MESSAGE_PACKET_SIZE; // Block is 8 frames - pcDMARecvControlRecord.RDSIZE = ACCESS_8_BIT; // Element size is 1 byte - pcDMARecvControlRecord.WRSIZE = ACCESS_8_BIT; // - pcDMARecvControlRecord.TTYPE = FRAME_TRANSFER; // Transfer type is block transfer - pcDMARecvControlRecord.ADDMODERD = ADDR_FIXED; // Source addressing mode is fixed - pcDMARecvControlRecord.ADDMODEWR = ADDR_INC1; // Dest. addressing mode is post-increment - pcDMARecvControlRecord.AUTOINIT = AUTOINIT_OFF; // Auto-init off - pcDMARecvControlRecord.ELDOFFSET = 0; // Not used - pcDMARecvControlRecord.ELSOFFSET = 0; // Not used - pcDMARecvControlRecord.FRDOFFSET = 0; // Not used - pcDMARecvControlRecord.FRSOFFSET = 0; // Not used - - // Initiate PC packet receiving readiness via DMA - dmaSetCtrlPacket( DMA_CH1, pcDMARecvControlRecord ); - dmaSetChEnable( DMA_CH1, DMA_HW ); - setSCI1DMAReceiveInterrupt(); -} -#endif - -/*********************************************************************//** - * @brief * The isCANBoxForXmit function determines whether a given CAN message box * is configured for transmit. * @details Inputs: CAN_OUT_BUFFERS[] @@ -654,39 +511,7 @@ return result; } -/*********************************************************************//** - * @brief - * The transmitNextUARTPacket function sets up and initiates a DMA transmit - * of the next packet pending transmit (if any) via UART. - * @details Inputs: Output UART Comm Buffer(s) - * @details Outputs: UART DMA transmit initiated. - * @return number of bytes transmitted - *************************************************************************/ -#ifdef DEBUG_ENABLED -static U32 transmitNextUARTPacket( void ) -{ - U32 result = 0; - U32 dataPend = numberOfBytesInCommBuffer( COMM_BUFFER_OUT_UART_PC ); - if ( dataPend > 0 ) - { - result = getFromCommBuffer( COMM_BUFFER_OUT_UART_PC, pcXmitPacket, dataPend ); - - // If there is data to transmit, transmit it - if ( result > 0 ) - { - signalSCI1XmitsInitiated(); - pcDMAXmitControlRecord.FRCNT = result; // Set DMA transfer size - dmaSetCtrlPacket( DMA_CH3, pcDMAXmitControlRecord ); - dmaSetChEnable( DMA_CH3, DMA_HW ); - setSCI1DMATransmitInterrupt(); - } - } - - return result; -} -#endif - /************************************************************************* ********************** RECEIVE SUPPORT FUNCTIONS ************************* *************************************************************************/ Index: firmware/App/Services/SystemComm.h =================================================================== diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r9ac7866cce73b5281c34626ab5903409778e2b19 --- firmware/App/Services/SystemComm.h (.../SystemComm.h) (revision ccfd15568f1e3d304320c2babb2fd4bcf0413304) +++ firmware/App/Services/SystemComm.h (.../SystemComm.h) (revision 9ac7866cce73b5281c34626ab5903409778e2b19) @@ -35,9 +35,6 @@ #define MESSAGE_SYNC_BYTE 0xA5 ///< Denali message syncronization byte. #define CAN_MESSAGE_PAYLOAD_SIZE 8 ///< CAN frame payload size (in bytes). -#ifdef DEBUG_ENABLED - #define PC_MESSAGE_PACKET_SIZE 8 -#endif #define MSG_ACK_BIT 0x8000 ///< ACK bit in sequence number that indicates an ACK is required. #define MAX_MSG_SEQ_NO 0x7FFF ///< Maximum sequence number for Denali message (then wraps to 1). @@ -52,10 +49,6 @@ void execSystemCommRx( void ); void execSystemCommTx( void ); void handleCANMsgInterrupt( CAN_MESSAGE_BOX_T srcCANBox ); -#ifdef DEBUG_ENABLED -void handleUARTMsgRecvPacketInterrupt( void ); -void handleUARTMsgXmitPacketInterrupt( void ); -#endif BOOL isCANBoxForXmit( CAN_MESSAGE_BOX_T srcCANBox ); BOOL isCANBoxForRecv( CAN_MESSAGE_BOX_T srcCANBox ); void checkInFromDG( void ); Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r2cf600cbe730fbecec037566d75c9fc6a6f8b391 -r9ac7866cce73b5281c34626ab5903409778e2b19 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 2cf600cbe730fbecec037566d75c9fc6a6f8b391) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 9ac7866cce73b5281c34626ab5903409778e2b19) @@ -49,10 +49,6 @@ // ********** private definitions ********** -#ifdef DEBUG_ENABLED - #define DEBUG_EVENT_MAX_TEXT_LEN 40 -#endif - #define MAX_MSGS_BLOCKED_FOR_XMIT 8 ///< Maximum number of messages to block transmission for. #pragma pack(push,1) @@ -3207,55 +3203,6 @@ *************************************************************************/ -#ifdef DEBUG_ENABLED - /*********************************************************************//** - * @brief - * The sendDebugData function sends debug data out to the PC port. - * @details - * @details Inputs: none - * @details Outputs: PC serial port - * @param dbgData Pointer to debug data - * @param len number of bytes of debug data - * @return TRUE if debug data was successfully queued for transmit, FALSE if not - *************************************************************************/ - BOOL sendDebugData( U08 *dbgData, U32 len ) - { - BOOL result; - - // Add serialized message data to appropriate comm buffer - result = addToCommBuffer( COMM_BUFFER_OUT_UART_PC, dbgData, len ); - - return result; - } - - /*********************************************************************//** - * @brief - * The sendDebugDataToUI function sends debug string to the UI for logging. - * @details Inputs: none - * @details Outputs: Message constructed and queued for transmit - * @param str Pointer to debug string - * @return none - *************************************************************************/ - void sendDebugDataToUI( U08 *str ) - { - MESSAGE_T msg; - U32 txtLen = strlen( (char*)str ); - U08 *payloadPtr = msg.payload; - - // Create a message record - blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_HD_DEBUG_EVENT; - msg.hdr.payloadLen = DEBUG_EVENT_MAX_TEXT_LEN + 1; // Add 1 byte for null terminator - if ( txtLen <= DEBUG_EVENT_MAX_TEXT_LEN ) - { - memcpy( payloadPtr, str, txtLen + 1 ); - - // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED ); - } - } -#endif - /*********************************************************************//** * @brief * The isTestingActivated function determines whether a tester has successfully Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r182a81ed78f66f05ef286e2456c6c86f5e4f3e28 -r9ac7866cce73b5281c34626ab5903409778e2b19 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 182a81ed78f66f05ef286e2456c6c86f5e4f3e28) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 9ac7866cce73b5281c34626ab5903409778e2b19) @@ -416,14 +416,6 @@ // *********** public test support message functions ********** -#ifdef DEBUG_ENABLED -// DEBUG OUTPUT to debug UART -BOOL sendDebugData( U08 *dbgData, U32 len ); - -// Debug message to UI for logging -void sendDebugDataToUI( U08 *str ); -#endif - // MSG_TESTER_LOG_IN void handleTesterLogInRequest( MESSAGE_T *message ); BOOL isTestingActivated( void );