Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4967cd9b32 |
+2
-4
@@ -45,10 +45,8 @@ extern "C" {
|
||||
|
||||
/* Exported macro ------------------------------------------------------------*/
|
||||
/* USER CODE BEGIN EM */
|
||||
#define DEBUG_ITM
|
||||
#define DEBUG_DUMMY_FRAME
|
||||
|
||||
#ifdef DEBUG_ITM
|
||||
#define DEBUG
|
||||
#ifdef DEBUG
|
||||
#include <stdio.h>
|
||||
#define DEBUG_PRINT(...) printf(__VA_ARGS__)
|
||||
#else
|
||||
|
||||
+1
-4
@@ -117,15 +117,12 @@ void vCANListener(void *argument)
|
||||
|
||||
for (;;)
|
||||
{
|
||||
if (osMessageQueueGet(queue, &message, NULL, 1000) == osOK)
|
||||
if (osMessageQueueGet(queue, &message, NULL, osWaitForever) == osOK)
|
||||
{
|
||||
// J1939 decoding
|
||||
|
||||
// RELAY: Push to the UART queue
|
||||
osMessageQueuePut(xUARTQueue, &message, 0U, 0U);
|
||||
}
|
||||
else DEBUG_PRINT("No CAN yet!\r\n");
|
||||
|
||||
}
|
||||
}
|
||||
/* END vCANListener */
|
||||
|
||||
+1
-21
@@ -104,26 +104,7 @@ void vUARTLogger(void *argument)
|
||||
CanMessage_t message;
|
||||
char tx_buffer[45];
|
||||
|
||||
#ifdef DEBUG_DUMMY_FRAME
|
||||
CanMessage_t dummy_frame = {
|
||||
.id = 0x0CF00400, // J1939 EEC1 ID
|
||||
.dlc = 8, // 8 bytes of data
|
||||
.isExtended = 1, // 29-bit Extended ID
|
||||
.source = 1, // CAN1
|
||||
.payload = {0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF, 0x11, 0x22}
|
||||
};
|
||||
#endif
|
||||
|
||||
for (;;)
|
||||
{
|
||||
DEBUG_PRINT("Waiting for CAN traffic...\r\n");
|
||||
|
||||
#ifdef DEBUG_DUMMY_FRAME
|
||||
osMessageQueuePut(xUARTQueue, &dummy_frame, 0U, 0U);
|
||||
osDelay(1000);
|
||||
#endif
|
||||
|
||||
if (osMessageQueueGet(xUARTQueue, &message, NULL, osWaitForever) == osOK)
|
||||
for (;;)
|
||||
{
|
||||
DEBUG_PRINT("Waiting for CAN traffic...\r\n");
|
||||
if (osMessageQueueGet(xUARTQueue, &message, NULL, osWaitForever) == osOK)
|
||||
@@ -135,6 +116,5 @@ void vUARTLogger(void *argument)
|
||||
DEBUG_PRINT("CAN frame sent via UART\r\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/* END vUARTLoggerListen */
|
||||
|
||||
Reference in New Issue
Block a user