eeeck/CANdigger
1
0
Fork 1
Code Issues 7 Pull Requests 1 Actions Projects 1 Releases 6 Wiki Activity

Merge branch 'stm_debug' into dev_serial-send

Browse Source
This commit was merged in pull request #23.
This commit is contained in:
Erick
2026-06-18 13:43:23 +02:00
parent 5a91a56e27 1ad8e5b04f
commit 6f8d2a12ea
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Inc/main.h
+4 -2
View File
@@ -45,8 +45,10 @@ extern "C" {
/* Exported macro ------------------------------------------------------------*/ /* Exported macro ------------------------------------------------------------*/
/* USER CODE BEGIN EM */ /* USER CODE BEGIN EM */
#define DEBUG #define DEBUG_ITM
#ifdef DEBUG #define DEBUG_DUMMY_FRAME
#ifdef DEBUG_ITM
#include <stdio.h> #include <stdio.h>
#define DEBUG_PRINT(...) printf(__VA_ARGS__) #define DEBUG_PRINT(...) printf(__VA_ARGS__)
#else #else
Core/Src/canlog.c
+3 -1
View File
@@ -121,12 +121,14 @@ void vCANListener(void *argument)
for (;;) for (;;)
{ {
if (osMessageQueueGet(queue, &message, NULL, osWaitForever) == osOK) if (osMessageQueueGet(queue, &message, NULL, 1000) == osOK)
{ {
// J1939 decoding // J1939 decoding
osMessageQueuePut(xUARTQueue, &message, 0U, 0U); osMessageQueuePut(xUARTQueue, &message, 0U, 0U);
} }
else DEBUG_PRINT("No CAN yet!\r\n");
} }
} }
/* END vCANListener */ /* END vCANListener */
Core/Src/cansend.c
+16
View File
@@ -104,9 +104,25 @@ void vUARTLogger(void *argument)
CanMessage_t message; CanMessage_t message;
char tx_buffer[45]; 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 (;;) for (;;)
{ {
DEBUG_PRINT("Waiting for CAN traffic...\r\n"); 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) if (osMessageQueueGet(xUARTQueue, &message, NULL, osWaitForever) == osOK)
{ {
osSemaphoreAcquire(xUARTDMASemaphore, osWaitForever); osSemaphoreAcquire(xUARTDMASemaphore, osWaitForever);