Add debug dummy CAN frame sent regularly

- Activated by defining DEBUG_DUMMY_FRAME

Core/Inc/main.h

@@ -45,10 +45,10 @@ extern "C" {
 
 /* Exported macro ------------------------------------------------------------*/
 /* USER CODE BEGIN EM */
-//#define DEBUG_ITM
-//#define DEBUG_DUMMY_FRAME
+#define DEBUG
+#define DEBUG_DUMMY_FRAME
 
-#ifdef DEBUG_ITM
+#ifdef DEBUG
 #include <stdio.h>
 #define DEBUG_PRINT(...) printf(__VA_ARGS__)
 #else

Core/Inc/stm32f4xx_it.h

@@ -52,7 +52,6 @@ void MemManage_Handler(void);
 void BusFault_Handler(void);
 void UsageFault_Handler(void);
 void DebugMon_Handler(void);
-void USART1_IRQHandler(void);
 void SDIO_IRQHandler(void);
 void TIM6_DAC_IRQHandler(void);
 void DMA2_Stream3_IRQHandler(void);

Core/Src/canlog.c

@@ -51,9 +51,11 @@ void CAN_Logger_Init(CAN_HandleTypeDef *hcan1, CAN_HandleTypeDef *hcan2)
 
     filter.FilterBank = 0;
     if (HAL_CAN_ConfigFilter(hcan1, &filter) != HAL_OK) Error_Handler();
+    if (HAL_CAN_Start(hcan1) != HAL_OK) Error_Handler();
 
     filter.FilterBank = 14;
     if (HAL_CAN_ConfigFilter(hcan2, &filter) != HAL_OK) Error_Handler();
+    if (HAL_CAN_Start(hcan2) != HAL_OK) Error_Handler();
 }
 /* END CAN_Logger_Init */
 
@@ -75,8 +77,7 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan)
     // TODO: manage the case of FIFO overflow
     if (HAL_CAN_GetRxMessage(hcan, CAN_RX_FIFO0, &rxHeader, data) != HAL_OK) return;
 
-    if (rxHeader.IDE == CAN_ID_EXT) message.id = rxHeader.ExtId;
-    else message.id = rxHeader.StdId;
+    message.id = rxHeader.ExtId;
     message.dlc = rxHeader.DLC;
     message.isExtended = (rxHeader.IDE == CAN_ID_EXT);
     message.source = (hcan->Instance == CAN1) ? 1 : 2;
@@ -112,19 +113,15 @@ void vCANListener(void *argument)
   osMessageQueueId_t queue = (hcan->Instance == CAN1) ? xCAN1RxQueue : xCAN2RxQueue;
   CanMessage_t message;
 
-  if (HAL_CAN_Start(hcan) != HAL_OK) Error_Handler();
   HAL_CAN_ActivateNotification(hcan, CAN_IT_RX_FIFO0_MSG_PENDING);
 
-  uint32_t irqn = (hcan->Instance == CAN1) ? CAN1_RX0_IRQn : CAN2_RX0_IRQn;
-  HAL_NVIC_SetPriority(irqn, 6, 0);
-  HAL_NVIC_EnableIRQ(irqn);
-
   for (;;)
   {
     if (osMessageQueueGet(queue, &message, NULL, 1000) == osOK)
     {
           // J1939 decoding
 
+          // RELAY: Push to the UART queue
       osMessageQueuePut(xUARTQueue, &message, 0U, 0U);
     }
     else DEBUG_PRINT("No CAN yet!\r\n");

Core/Src/cansend.c

@@ -101,8 +101,8 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
   */
 void vUARTLogger(void *argument)
 {
-  CanMessage_t message;
-  char tx_buffer[45];
+    CanMessage_t message;
+    char tx_buffer[45];
 
   #ifdef DEBUG_DUMMY_FRAME
   CanMessage_t dummy_frame = {
@@ -119,37 +119,21 @@ void vUARTLogger(void *argument)
     DEBUG_PRINT("Waiting for CAN traffic...\r\n");
 
     #ifdef DEBUG_DUMMY_FRAME
-    uint32_t queue_timeout = 1000U;
-    #else
-    uint32_t queue_timeout = osWaitForever;
+    osMessageQueuePut(xUARTQueue, &dummy_msg, 0U, 0U);
+    osDelay(2000);
     #endif
 
-    #ifdef DEBUG_DUMMY_FRAME
-    osMessageQueuePut(xUARTQueue, &dummy_frame, 0U, 0U);
-    osDelay(1000);
-    #endif
-
-   	if (osMessageQueueGet(xUARTQueue, &message, NULL, queue_timeout) == osOK)
-	{
-      if (osSemaphoreAcquire(xUARTDMASemaphore, queue_timeout) == osOK)
+    if (osMessageQueueGet(xUARTQueue, &message, NULL, osWaitForever) == osOK)
+    {
+      DEBUG_PRINT("Waiting for CAN traffic...\r\n");
+      if (osMessageQueueGet(xUARTQueue, &message, NULL, osWaitForever) == osOK)
       {
+        DEBUG_PRINT("CAN frame detected\r\n");
         int len = format_can_message(tx_buffer, message.source, &message);
-
-        if (HAL_UART_Transmit_DMA(&huart1, (uint8_t*)tx_buffer, len) == HAL_OK)
-        {
-          DEBUG_PRINT("CAN frame sent via UART\r\n");
-        }
-        else
-        {
-          osSemaphoreRelease(xUARTDMASemaphore);
-          DEBUG_PRINT("HAL error, CAN frame NOT sent!\r\n");
-        }
+        HAL_UART_Transmit_DMA(&huart1, (uint8_t*)tx_buffer, len);
+        osSemaphoreAcquire(xUARTDMASemaphore, osWaitForever);
+        DEBUG_PRINT("CAN frame sent via UART\r\n");
       }
-      else
-      {
-        DEBUG_PRINT("ERROR: Semaphore timeout! UART might be stuck in BUSY state.\r\n");
-      }
-	}
-  }
+    }
 }
 /* END vUARTLoggerListen */

Core/Src/main.c

@@ -77,10 +77,11 @@ static void MX_SDIO_SD_Init(void);
 static void MX_USART1_UART_Init(void);
 
 /* USER CODE BEGIN PFP */
-int _write(int file, char *ptr, int len)
-{
-  for (int i = 0; i < len; i++) ITM_SendChar((*ptr++));
-  return len;
+int _write(int file, char *ptr, int len) {
+ for (int i = 0; i < len; i++) {
+ ITM_SendChar((*ptr++));
+ }
+ return len;
 }
 /* USER CODE END PFP */
 
@@ -97,14 +98,10 @@ int main(void)
 {
 
   /* USER CODE BEGIN 1 */
-  if (CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk)
-  {
-    CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
-    ITM->LAR = 0xC5ACCE55;
-    ITM->TER = 1 << 0;
-    ITM->TCR = ITM_TCR_ITMENA_Msk | ITM_TCR_SYNCENA_Msk | ITM_TCR_SWOENA_Msk;
-  }
-
+  CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
+  ITM->LAR = 0xC5ACCE55;
+  ITM->TER = 1 << 0;
+  ITM->TCR = ITM_TCR_ITMENA_Msk | ITM_TCR_SYNCENA_Msk | ITM_TCR_SWOENA_Msk;
   DEBUG_PRINT("Booting system\r\n");
   /* USER CODE END 1 */
 
@@ -174,7 +171,7 @@ int main(void)
   /* USER CODE END RTOS_MUTEX */
 
   /* USER CODE BEGIN RTOS_SEMAPHORES */
-  xUARTDMASemaphore = osSemaphoreNew(1, 1, NULL);
+  xUARTDMASemaphore = osSemaphoreNew(1, 0, NULL);
   if (xUARTDMASemaphore == NULL) Error_Handler();
   /* USER CODE END RTOS_SEMAPHORES */
 
@@ -280,7 +277,7 @@ static void MX_CAN1_Init(void)
 
   /* USER CODE END CAN1_Init 1 */
   hcan1.Instance = CAN1;
-  hcan1.Init.Prescaler = 8;
+  hcan1.Init.Prescaler = 4;
   hcan1.Init.Mode = CAN_MODE_SILENT;
   hcan1.Init.SyncJumpWidth = CAN_SJW_1TQ;
   hcan1.Init.TimeSeg1 = CAN_BS1_16TQ;
@@ -317,7 +314,7 @@ static void MX_CAN2_Init(void)
 
   /* USER CODE END CAN2_Init 1 */
   hcan2.Instance = CAN2;
-  hcan2.Init.Prescaler = 16;
+  hcan2.Init.Prescaler = 8;
   hcan2.Init.Mode = CAN_MODE_SILENT;
   hcan2.Init.SyncJumpWidth = CAN_SJW_1TQ;
   hcan2.Init.TimeSeg1 = CAN_BS1_16TQ;

Core/Src/stm32f4xx_hal_msp.c

@@ -392,9 +392,6 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
 
     __HAL_LINKDMA(huart,hdmatx,hdma_usart1_tx);
 
-    /* USART1 interrupt Init */
-    HAL_NVIC_SetPriority(USART1_IRQn, 5, 0);
-    HAL_NVIC_EnableIRQ(USART1_IRQn);
     /* USER CODE BEGIN USART1_MspInit 1 */
 
     /* USER CODE END USART1_MspInit 1 */
@@ -427,9 +424,6 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
 
     /* USART1 DMA DeInit */
     HAL_DMA_DeInit(huart->hdmatx);
-
-    /* USART1 interrupt DeInit */
-    HAL_NVIC_DisableIRQ(USART1_IRQn);
     /* USER CODE BEGIN USART1_MspDeInit 1 */
 
     /* USER CODE END USART1_MspDeInit 1 */

Core/Src/stm32f4xx_it.c

@@ -59,7 +59,6 @@ extern DMA_HandleTypeDef hdma_sdio_rx;
 extern DMA_HandleTypeDef hdma_sdio_tx;
 extern SD_HandleTypeDef hsd;
 extern DMA_HandleTypeDef hdma_usart1_tx;
-extern UART_HandleTypeDef huart1;
 extern TIM_HandleTypeDef htim6;
 
 /* USER CODE BEGIN EV */
@@ -164,20 +163,6 @@ void DebugMon_Handler(void)
 /* please refer to the startup file (startup_stm32f4xx.s).                    */
 /******************************************************************************/
 
-/**
-  * @brief This function handles USART1 global interrupt.
-  */
-void USART1_IRQHandler(void)
-{
-  /* USER CODE BEGIN USART1_IRQn 0 */
-
-  /* USER CODE END USART1_IRQn 0 */
-  HAL_UART_IRQHandler(&huart1);
-  /* USER CODE BEGIN USART1_IRQn 1 */
-
-  /* USER CODE END USART1_IRQn 1 */
-}
-
 /**
   * @brief This function handles SDIO global interrupt.
   */

LICENSE.md

@@ -1,38 +0,0 @@
-GNU GENERAL PUBLIC LICENSE 
-Version 3, 29 June 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. https://fsf.org/ 
-Everyone is permitted to copy and distribute verbatim copies 
-of this license document, but changing it is not allowed.
-
-Preamble
-
-The GNU General Public License is a free, copyleft license for 
-software and other kinds of works.
-
-The licenses for most software and other practical works are designed 
-to take away your freedom to share and change the works. By contrast, 
-the GNU General Public License is intended to guarantee your freedom to 
-share and change all versions of a program--to make sure it remains free 
-software for all its users. We, the Free Software Foundation, use the 
-GNU General Public License for most of our software; it applies also to 
-any other work released this way by its authors. You can apply it to 
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not 
-price. Our General Public Licenses are designed to make sure that you 
-have the freedom to distribute copies of free software (and charge for 
-them if you wish), that you receive source code or can get it if you 
-want it, that you can change the software or use pieces of it in new 
-free programs, and that you know you can do these things.
-
-To protect your rights, we need to prevent others from denying you 
-these rights or asking you to surrender the rights. Therefore, you have 
-certain responsibilities if you distribute copies of the software, or if 
-you modify it: responsibilities to respect the freedom of others.
-
-For example, if you distribute copies of such a program, whether 
-gratis or for a fee, you must pass on to the recipients the same 
-freedoms that you received. You must make sure that they, too, receive 
-or can get the source code. And you must show them these terms so they 
-know their rights.

NOTICE.md

@@ -1,15 +0,0 @@
-# Third-Party Notices
-
-This project is built with open source components and includes third-party software:
-
-## 1. Original Application Code
-- **Copyright (c) 2026 Erick Ahmed**
-- **License:** [GNU General Public License v3.0](https://git.erickahmed.com/erickahmed/j1939_logger/src/branch/main/LICENSE.md)
-
-## 2. STM32F4 HAL Drivers
-- **Copyright (c) 2016 STMicroelectronics**
-- **License:** [BSD 3-Clause License](https://git.erickahmed.com/erickahmed/j1939_logger/src/branch/main/Drivers/STM32F4xx_HAL_Driver/LICENSE.txt)
-
-## 3. STM32 CMSIS
-- **Copyright (c) 2017 STMicroelectronics**
-- **License:** [Apache License 2.0](https://git.erickahmed.com/erickahmed/j1939_logger/src/branch/main/Drivers/CMSIS/LICENSE.txt)

can_logger.ioc

@@ -124,7 +124,6 @@ NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:false\:true\:false\:true\:false
 NVIC.TIM6_DAC_IRQn=true\:15\:0\:false\:false\:true\:false\:false\:true\:true
 NVIC.TimeBase=TIM6_DAC_IRQn
 NVIC.TimeBaseIP=TIM6
-NVIC.USART1_IRQn=true\:5\:0\:false\:false\:true\:true\:true\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
 PA10.Mode=Asynchronous
 PA10.Signal=USART1_RX