Index: firmware/App/Controllers/SensorProcess.c =================================================================== diff -u -rdbca3a7326a8c18f0bd52514eb15c1ed16077ff2 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Controllers/SensorProcess.c (.../SensorProcess.c) (revision dbca3a7326a8c18f0bd52514eb15c1ed16077ff2) +++ firmware/App/Controllers/SensorProcess.c (.../SensorProcess.c) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -16,6 +16,7 @@ #include "SensorProcess.h" #include "Common.h" +#include "LoadCell.h" #include "SystemCommMessages.h" #include "FPGA.h" Index: firmware/App/Drivers/Comm.c =================================================================== diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Drivers/Comm.c (.../Comm.c) (revision f068446fdb7889d320ddb6ffbd58f347ce0501e7) +++ firmware/App/Drivers/Comm.c (.../Comm.c) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -27,7 +27,9 @@ // ********** private data ********** static volatile BOOL canXmitsInProgress = FALSE; -static volatile BOOL uartXmitsInProgress = FALSE; +#ifdef DEBUG_ENABLED + static volatile BOOL uartXmitsInProgress = FALSE; +#endif /************************************************************************* * @brief signalCANXmitsInitiated @@ -69,10 +71,12 @@ * @param none * @return none *************************************************************************/ +#ifdef DEBUG_ENABLED void signalSCI1XmitsInitiated( void ) { uartXmitsInProgress = TRUE; } +#endif /************************************************************************* * @brief signalSCI1XmitsCompleted @@ -84,10 +88,12 @@ * @param none * @return none *************************************************************************/ +#ifdef DEBUG_ENABLED void signalSCI1XmitsCompleted( void ) { uartXmitsInProgress = FALSE; } +#endif /************************************************************************* * @brief setSCI1DMAReceiveInterrupt @@ -99,10 +105,12 @@ * @param none * @return none *************************************************************************/ +#ifdef DEBUG_ENABLED void setSCI1DMAReceiveInterrupt( void ) { sciREG->SETINT = SCI_DMA_RECEIVE_INT; } +#endif /************************************************************************* * @brief setSCI1DMATransmitInterrupt @@ -114,10 +122,12 @@ * @param none * @return none *************************************************************************/ +#ifdef DEBUG_ENABLED void setSCI1DMATransmitInterrupt( void ) { sciREG->SETINT = SCI_DMA_TRANSMIT_INT; } +#endif /************************************************************************* * @brief clearSCI1DMAReceiveInterrupt @@ -129,10 +139,12 @@ * @param none * @return none *************************************************************************/ +#ifdef DEBUG_ENABLED void clearSCI1DMAReceiveInterrupt( void ) { sciREG->CLEARINT = SCI_DMA_RECEIVE_INT; } +#endif /************************************************************************* * @brief clearSCI1DMATransmitInterrupt @@ -144,10 +156,12 @@ * @param none * @return none *************************************************************************/ +#ifdef DEBUG_ENABLED void clearSCI1DMATransmitInterrupt( void ) { sciREG->CLEARINT = SCI_DMA_TRANSMIT_INT; } +#endif /************************************************************************* * @brief setSCI2DMAReceiveInterrupt @@ -219,11 +233,13 @@ * @param none * @return none *************************************************************************/ +#ifdef DEBUG_ENABLED void clearSCI1CommErrors( void ) { sciReceiveByte( sciREG ); sciREG->FLR |= ( SCI_FE_INT | SCI_OE_INT ); } +#endif /************************************************************************* * @brief clearSCI2CommErrors @@ -251,6 +267,7 @@ * @param 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 ); @@ -259,6 +276,7 @@ return ( ( TRUE == uartXmitsInProgress ) || ( transmitterBusy == TRUE ) || ( dmaTransmitterBusy == TRUE ) ? TRUE : FALSE ); } +#endif /************************************************************************* * @brief isSCI2DMATransmitInProgress Index: firmware/App/Drivers/Comm.h =================================================================== diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Drivers/Comm.h (.../Comm.h) (revision f068446fdb7889d320ddb6ffbd58f347ce0501e7) +++ firmware/App/Drivers/Comm.h (.../Comm.h) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -28,24 +28,24 @@ void signalCANXmitsInitiated( void ); void signalCANXmitsCompleted( void ); -void signalSCI1XmitsInitiated( void ); -void signalSCI1XmitsCompleted( void ); +BOOL isCAN1TransmitInProgress( void ); -void setSCI1DMAReceiveInterrupt( void ); -void setSCI1DMATransmitInterrupt( void ); -void clearSCI1DMAReceiveInterrupt( void ); -void clearSCI1DMATransmitInterrupt( 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 ); void clearSCI2DMATransmitInterrupt( void ); - -void clearSCI1CommErrors( void ); void clearSCI2CommErrors( void ); - -BOOL isSCI1DMATransmitInProgress( void ); BOOL isSCI2DMATransmitInProgress( void ); -BOOL isCAN1TransmitInProgress( void ); - #endif Index: firmware/App/Services/CommBuffers.c =================================================================== diff -u -r677cc9e7b67ea71140271aff307043abbf964764 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Services/CommBuffers.c (.../CommBuffers.c) (revision 677cc9e7b67ea71140271aff307043abbf964764) +++ firmware/App/Services/CommBuffers.c (.../CommBuffers.c) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -97,7 +97,6 @@ // add requires brief thread protection because there may be multiple sources for transmits trying to add data to a buffer. _disable_IRQ(); -// _disable_FIQ(); bufferGetLock[ buffer ] = TRUE; activeBuffer = activeDoubleBuffer[ buffer ]; @@ -116,7 +115,6 @@ commBufferByteCount[ buffer ][ activeBuffer ] += len; // release thread protection bufferGetLock[ buffer ] = FALSE; -// _enable_FIQ(); _enable_IRQ(); // data successfully added to buffer result = TRUE; @@ -125,7 +123,6 @@ { // release thread protection bufferGetLock[ buffer ] = FALSE; -// _enable_FIQ(); _enable_IRQ(); SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA, len ) } Index: firmware/App/Services/CommBuffers.h =================================================================== diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Services/CommBuffers.h (.../CommBuffers.h) (revision f068446fdb7889d320ddb6ffbd58f347ce0501e7) +++ firmware/App/Services/CommBuffers.h (.../CommBuffers.h) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -34,8 +34,10 @@ COMM_BUFFER_IN_CAN_UI_BROADCAST, COMM_BUFFER_IN_CAN_PC, COMM_BUFFER_OUT_CAN_PC, +#ifdef DEBUG_ENABLED COMM_BUFFER_IN_UART_PC, COMM_BUFFER_OUT_UART_PC, +#endif NUM_OF_COMM_BUFFERS } COMM_BUFFER_T; Index: firmware/App/Services/Interrupts.c =================================================================== diff -u -r07ae59288d41511e9c28460ced5c46fb870cc627 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision 07ae59288d41511e9c28460ced5c46fb870cc627) +++ firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -34,8 +34,10 @@ // ********** private data ********** -static U32 sci1FrameErrorCnt = 0; -static U32 sci1OverrunErrorCnt = 0; +#ifdef DEBUG_ENABLED + static U32 sci1FrameErrorCnt = 0; + static U32 sci1OverrunErrorCnt = 0; +#endif static U32 sci2FrameErrorCnt = 0; static U32 sci2OverrunErrorCnt = 0; @@ -160,60 +162,55 @@ // TODO - temporary debug code - remove later char debugStr[ 256 ]; #endif - if ( sci == sciREG ) + + if ( sci == scilinREG ) { if ( ( flags & SCI_FE_INT ) != 0 ) { - sci1FrameErrorCnt++; - clearSCI1CommErrors(); + sci2FrameErrorCnt++; + clearSCI2CommErrors(); // TODO - try to do something to recover (+ max retries = comm fault) #ifdef DEBUG_ENABLED // TODO - temporary debug code - remove later - sprintf( debugStr, "Debug UART frame error:%5d \n", sci1FrameErrorCnt ); + sprintf( debugStr, "FPGA UART frame error:%5d \n", sci2FrameErrorCnt ); sendDebugData( (U08*)debugStr, strlen(debugStr) ); #endif } if ( ( flags & SCI_OE_INT ) != 0 ) { - sci1OverrunErrorCnt++; - clearSCI1CommErrors(); + sci2OverrunErrorCnt++; + clearSCI2CommErrors(); // TODO - try to do something to recover (+ max retries = comm fault) #ifdef DEBUG_ENABLED // TODO - temporary debug code - remove later - sprintf( debugStr, "Debug UART overrun error:%5d \n", sci1OverrunErrorCnt ); + sprintf( debugStr, "FPGA UART overrun error:%5d \n", sci2OverrunErrorCnt ); sendDebugData( (U08*)debugStr, strlen(debugStr) ); #endif } } - else if ( sci == scilinREG ) +#ifdef DEBUG_ENABLED + else if ( sci == sciREG ) { if ( ( flags & SCI_FE_INT ) != 0 ) { - sci2FrameErrorCnt++; - clearSCI2CommErrors(); + sci1FrameErrorCnt++; + clearSCI1CommErrors(); // TODO - try to do something to recover (+ max retries = comm fault) -#ifdef DEBUG_ENABLED // TODO - temporary debug code - remove later - sprintf( debugStr, "FPGA UART frame error:%5d \n", sci2FrameErrorCnt ); + sprintf( debugStr, "Debug UART frame error:%5d \n", sci1FrameErrorCnt ); sendDebugData( (U08*)debugStr, strlen(debugStr) ); -#endif } if ( ( flags & SCI_OE_INT ) != 0 ) { - sci2OverrunErrorCnt++; - clearSCI2CommErrors(); + sci1OverrunErrorCnt++; + clearSCI1CommErrors(); // TODO - try to do something to recover (+ max retries = comm fault) -#ifdef DEBUG_ENABLED // TODO - temporary debug code - remove later - sprintf( debugStr, "FPGA UART overrun error:%5d \n", sci2OverrunErrorCnt ); + sprintf( debugStr, "Debug UART overrun error:%5d \n", sci1OverrunErrorCnt ); sendDebugData( (U08*)debugStr, strlen(debugStr) ); -#endif } } - else - { - // TODO - ignore? - should not be any other SCI peripherals - } +#endif } /************************************************************************* @@ -237,23 +234,25 @@ 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: // TODO - ignore? break; Index: firmware/App/Services/MsgQueues.h =================================================================== diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Services/MsgQueues.h (.../MsgQueues.h) (revision f068446fdb7889d320ddb6ffbd58f347ce0501e7) +++ firmware/App/Services/MsgQueues.h (.../MsgQueues.h) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -32,9 +32,7 @@ #pragma pack(push,1) typedef struct { -#ifndef ACK_NOT_IMPLEMENTED S16 seqNo; // sequence # (and ACK required bit) of message -#endif U16 msgID; // ID of message U08 payloadLen; // length of payload in bytes } MESSAGE_HEADER_T; Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r677cc9e7b67ea71140271aff307043abbf964764 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 677cc9e7b67ea71140271aff307043abbf964764) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -37,11 +37,14 @@ #define NUM_OF_CAN_OUT_BUFFERS 4 // # of CAN buffers for transmit #define NUM_OF_CAN_IN_BUFFERS 6 // # of CAN buffers for receiving -#define NUM_OF_MSG_IN_BUFFERS 7 // # of Msg buffers for receiving - 1 is UART +#ifndef DEBUG_ENABLED + #define NUM_OF_MSG_IN_BUFFERS 6 // # of Msg buffers for receiving +#else + #define NUM_OF_MSG_IN_BUFFERS 7 // # of Msg buffers for receiving - 1 is UART + #define SCI1_RECEIVE_DMA_REQUEST 30 + #define SCI1_TRANSMIT_DMA_REQUEST 31 +#endif -#define SCI1_RECEIVE_DMA_REQUEST 30 -#define SCI1_TRANSMIT_DMA_REQUEST 31 - #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 HD_COMM_TIMEOUT_IN_MS 2000 @@ -86,19 +89,21 @@ COMM_BUFFER_IN_CAN_HD_BROADCAST, 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 ]; -static CAN_MESSAGE_BOX_T lastCANPacketSentChannel = 0; +static CAN_MESSAGE_BOX_T lastCANPacketSentChannel = (CAN_MESSAGE_BOX_T)0; static U32 lastCANPacketSentTimeStamp = 0; +#ifdef DEBUG_ENABLED static U08 pcXmitPacket[ PC_MESSAGE_PACKET_SIZE ] = { 0, 0, 0, 0, 0, 0, 0, 0 }; static U08 pcRecvPacket[ PC_MESSAGE_PACKET_SIZE ] = { 0, 0, 0, 0, 0, 0, 0, 0 }; +#endif -#ifndef ACK_NOT_IMPLEMENTED static PENDING_ACK_RECORD_T pendingAckList[ PENDING_ACK_LIST_SIZE ]; // list of outgoing messages that are awaiting an ACK -#endif // DMA control records static g_dmaCTRL pcDMAXmitControlRecord; // DMA transmit control record (UART-debug) @@ -122,13 +127,16 @@ // ********** private function prototypes ********** -static void initUARTAndDMA( void ); +#ifdef DEBUG_ENABLED + static void initUARTAndDMA( void ); + static U32 transmitNextUARTPacket( void ); +#endif + static BOOL isCANBoxForXmit( CAN_MESSAGE_BOX_T srcCANBox ); static BOOL isCANBoxForRecv( CAN_MESSAGE_BOX_T srcCANBox ); static COMM_BUFFER_T findNextHighestPriorityCANPacketToTransmit( void ); static U32 transmitNextCANPacket( void ); -static U32 transmitNextUARTPacket( void ); static void processIncomingData( void ); static S32 parseMessageFromBuffer( U08 *data, U32 len ); @@ -139,10 +147,8 @@ static void checkForCommTimeouts( void ); static void checkTooManyBadMsgCRCs( void ); -#ifndef ACK_NOT_IMPLEMENTED static BOOL matchACKtoPendingACKList( S16 seqNo ); static void checkPendingACKList( void ); -#endif /************************************************************************* * @brief initSystemComm @@ -157,22 +163,22 @@ { U32 i; +#ifdef DEBUG_ENABLED // initialize UART and DMA for PC communication initUARTAndDMA(); +#endif // initialize bad message CRC list for ( i = 0; i < MAX_COMM_CRC_FAILURES; i++ ) { badCRCTimeStamps[ i ] = 0; } -#ifndef ACK_NOT_IMPLEMENTED // initialize pending ACK list for ( i = 0; i < PENDING_ACK_LIST_SIZE; i++ ) { pendingAckList[ i ].used = FALSE; } -#endif } /************************************************************************* @@ -214,10 +220,8 @@ // check for sub-system comm timeouts checkForCommTimeouts(); -#ifndef ACK_NOT_IMPLEMENTED // check ACK list for messages that need to be re-sent because they haven't been ACK'd checkPendingACKList(); -#endif } /************************************************************************* @@ -247,11 +251,13 @@ } } +#ifdef DEBUG_ENABLED // if UART transmitter is idle, start transmitting any pending packets if ( FALSE == isSCI1DMATransmitInProgress() ) { transmitNextUARTPacket(); } +#endif } /************************************************************************* @@ -331,6 +337,7 @@ * @param none * @return none *************************************************************************/ +#ifdef DEBUG_ENABLED void handleUARTMsgRecvPacketInterrupt( void ) { // buffer received packet @@ -340,6 +347,7 @@ dmaSetChEnable( DMA_CH1, DMA_HW ); setSCI1DMAReceiveInterrupt(); } +#endif /************************************************************************* * @brief handleUARTMsgXmitPacketInterrupt @@ -351,6 +359,7 @@ * @param none * @return none *************************************************************************/ +#ifdef DEBUG_ENABLED void handleUARTMsgXmitPacketInterrupt( void ) { U32 bytesXmitted = transmitNextUARTPacket(); @@ -360,6 +369,7 @@ signalSCI1XmitsCompleted(); } } +#endif /************************************************************************* * @brief initUARTAndDMA @@ -371,6 +381,7 @@ * @param none * @return none *************************************************************************/ +#ifdef DEBUG_ENABLED static void initUARTAndDMA( void ) { // Enable DMA block transfer complete interrupts @@ -424,6 +435,7 @@ dmaSetChEnable( DMA_CH1, DMA_HW ); setSCI1DMAReceiveInterrupt(); } +#endif /************************************************************************* * @brief isCANBoxForXmit @@ -587,6 +599,7 @@ * @param msg : none * @return # of bytes transmitted *************************************************************************/ +#ifdef DEBUG_ENABLED static U32 transmitNextUARTPacket( void ) { U32 result = 0; @@ -610,6 +623,7 @@ return result; } +#endif /************************************************************************* @@ -805,23 +819,19 @@ { // CRC should be good because we checked it during parsing before adding to queue - but check it again for good measure if ( message.crc == crc8( (U08*)(&message), sizeof(MESSAGE_HEADER_T) + message.msg.hdr.payloadLen ) ) { -#ifndef ACK_NOT_IMPLEMENTED // if ACK, mark pending message ACK'd if ( MSG_ID_ACK == message.msg.hdr.msgID ) { matchACKtoPendingACKList( message.msg.hdr.seqNo ); } else -#endif { -#ifndef ACK_NOT_IMPLEMENTED // if received message requires ACK, queue one up if ( message.msg.hdr.seqNo < 0 ) { sendACKMsg( &message.msg ); } else -#endif { // otherwise, process the received message processReceivedMessage( &message.msg ); } @@ -889,7 +899,6 @@ } } -#ifndef ACK_NOT_IMPLEMENTED /************************************************************************* * @brief addMsgToPendingACKList * The addMsgToPendingACKList function adds a given message to the pending \n @@ -1002,7 +1011,6 @@ } } } -#endif /************************************************************************* * @brief processReceivedMessage Index: firmware/App/Services/SystemComm.h =================================================================== diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Services/SystemComm.h (.../SystemComm.h) (revision f068446fdb7889d320ddb6ffbd58f347ce0501e7) +++ firmware/App/Services/SystemComm.h (.../SystemComm.h) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -26,7 +26,9 @@ #define MESSAGE_SYNC_BYTE 0xA5 #define CAN_MESSAGE_PAYLOAD_SIZE 8 -#define PC_MESSAGE_PACKET_SIZE 8 +#ifdef DEBUG_ENABLED + #define PC_MESSAGE_PACKET_SIZE 8 +#endif #define MSG_ID_ACK 0xFFFF #define MSG_ACK_BIT 0x8000 @@ -42,11 +44,11 @@ void execSystemCommRx( void ); void execSystemCommTx( void ); void handleCANMsgInterrupt( CAN_MESSAGE_BOX_T srcCANBox ); -void handleUARTMsgRecvPacketInterrupt( void ); -void handleUARTMsgXmitPacketInterrupt( void ); +#ifdef DEBUG_ENABLED + void handleUARTMsgRecvPacketInterrupt( void ); + void handleUARTMsgXmitPacketInterrupt( void ); +#endif BOOL isHDCommunicating( void ); -#ifndef ACK_NOT_IMPLEMENTED BOOL addMsgToPendingACKList( MESSAGE_T *msg, COMM_BUFFER_T channel, U08 *msgData, U32 len ); -#endif #endif Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r05f42ecd223cf512e9e8f3434dd01bdac3aca86d -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 05f42ecd223cf512e9e8f3434dd01bdac3aca86d) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -98,7 +98,6 @@ data[ msgSize++ ] = MESSAGE_SYNC_BYTE; // set sequence # and ACK bit (unless this is an ACK to a received message) -#ifndef ACK_NOT_IMPLEMENTED if ( msg.hdr.msgID != MSG_ID_ACK ) { // thread protect next sequence # access & increment @@ -111,7 +110,6 @@ msg.hdr.seqNo *= -1; } } -#endif // calculate message CRC crc = crc8( (U08*)(&msg), sizeof( MESSAGE_HEADER_T ) + msg.hdr.payloadLen ); @@ -135,7 +133,6 @@ data[ msgSize++ ] = 0; } -#ifndef ACK_NOT_IMPLEMENTED // if ACK required, add to pending ACK list if ( TRUE == ackReq ) { @@ -145,7 +142,6 @@ SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL ) } } -#endif if ( FALSE == error ) { @@ -156,7 +152,6 @@ return result; } -#ifndef ACK_NOT_IMPLEMENTED /************************************************************************* * @brief sendACKMsg * The sendACKMsg function constructs and queues for transmit an ACK message \n @@ -186,7 +181,6 @@ return result; } -#endif // *********************************************************************** // ********************* MSG_ID_OFF_BUTTON_PRESS ************************* @@ -400,6 +394,7 @@ * @param len : # of bytes of debug data * @return TRUE if debug data was successfully queued for transmit, FALSE if not *************************************************************************/ +#ifdef DEBUG_ENABLED BOOL sendDebugData( U08 *dbgData, U32 len ) { BOOL result; @@ -409,6 +404,7 @@ return result; } +#endif /************************************************************************* * @brief isTestingActivated Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -ra24665c05496241e5ba9a73e0b1831a85dfbc3c9 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision a24665c05496241e5ba9a73e0b1831a85dfbc3c9) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -58,10 +58,8 @@ // ********** public function prototypes ********** -#ifndef ACK_NOT_IMPLEMENTED // ACK MSG BOOL sendACKMsg( MESSAGE_T *message ); -#endif // MSG_ID_ALARM_TRIGGERED BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 ); @@ -81,8 +79,10 @@ // *********** public test support message functions ********** +#ifdef DEBUG_ENABLED // DEBUG OUTPUT BOOL sendDebugData( U08 *dbgData, U32 len ); +#endif // MSG_TESTER_LOG_IN void handleTesterLogInRequest( MESSAGE_T *message ); Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r6d2d8f0267c57135554e5a1acaca9aef37f27949 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 6d2d8f0267c57135554e5a1acaca9aef37f27949) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02) @@ -17,6 +17,7 @@ #include "gio.h" #include "FPGA.h" +#include "SensorProcess.h" #include "WatchdogMgmt.h" #include "TaskPriority.h"