Add license notice

This file was orignally added in v0.0.1, somehow messed up git history and it got deleted. This is a reupload

Core/Inc/main.h

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

Core/Inc/stm32f4xx_it.h

@@ -52,10 +52,12 @@ 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);
 void DMA2_Stream6_IRQHandler(void);
+void DMA2_Stream7_IRQHandler(void);
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */

Core/Src/canlog.c

@@ -51,11 +51,9 @@ 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 */
 
@@ -77,7 +75,8 @@ 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;
 
-    message.id = rxHeader.ExtId;
+    if (rxHeader.IDE == CAN_ID_EXT) message.id = rxHeader.ExtId;
+    else message.id = rxHeader.StdId;
     message.dlc = rxHeader.DLC;
     message.isExtended = (rxHeader.IDE == CAN_ID_EXT);
     message.source = (hcan->Instance == CAN1) ? 1 : 2;
@@ -113,17 +112,23 @@ 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, osWaitForever) == osOK)
+    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");
+
   }
 }
 /* END vCANListener */

Core/Src/cansend.c

@@ -104,17 +104,52 @@ 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");
-      if (osMessageQueueGet(xUARTQueue, &message, NULL, osWaitForever) == osOK)
+
+    #ifdef DEBUG_DUMMY_FRAME
+    uint32_t queue_timeout = 1000U;
+    #else
+    uint32_t queue_timeout = osWaitForever;
+    #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)
+      {
+        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 detected\r\n");
-        format_can_message(tx_buffer, message.source, &message);
-        HAL_UART_Transmit_DMA(&huart1, (uint8_t*)tx_buffer, len);
-        osSemaphoreAcquire(xUARTDMASemaphore, osWaitForever);
           DEBUG_PRINT("CAN frame sent via UART\r\n");
         }
+        else
+        {
+          osSemaphoreRelease(xUARTDMASemaphore);
+          DEBUG_PRINT("HAL error, CAN frame NOT sent!\r\n");
+        }
+      }
+      else
+      {
+        DEBUG_PRINT("ERROR: Semaphore timeout! UART might be stuck in BUSY state.\r\n");
+      }
+	}
   }
 }
 /* END vUARTLoggerListen */

Core/Src/main.c

@@ -46,6 +46,7 @@ DMA_HandleTypeDef hdma_sdio_rx;
 DMA_HandleTypeDef hdma_sdio_tx;
 
 UART_HandleTypeDef huart1;
+DMA_HandleTypeDef hdma_usart1_tx;
 
 /* USER CODE BEGIN PV */
 LED_Config led_can1 = {GPIOB, GPIO_PIN_5};
@@ -76,10 +77,9 @@ 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++));
- }
+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,10 +97,14 @@ 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;
+  }
+
   DEBUG_PRINT("Booting system\r\n");
   /* USER CODE END 1 */
 
@@ -170,7 +174,7 @@ int main(void)
   /* USER CODE END RTOS_MUTEX */
 
   /* USER CODE BEGIN RTOS_SEMAPHORES */
-  xUARTDMASemaphore = osSemaphoreNew(1, 0, NULL);
+  xUARTDMASemaphore = osSemaphoreNew(1, 1, NULL);
   if (xUARTDMASemaphore == NULL) Error_Handler();
   /* USER CODE END RTOS_SEMAPHORES */
 
@@ -276,7 +280,7 @@ static void MX_CAN1_Init(void)
 
   /* USER CODE END CAN1_Init 1 */
   hcan1.Instance = CAN1;
-  hcan1.Init.Prescaler = 4;
+  hcan1.Init.Prescaler = 8;
   hcan1.Init.Mode = CAN_MODE_SILENT;
   hcan1.Init.SyncJumpWidth = CAN_SJW_1TQ;
   hcan1.Init.TimeSeg1 = CAN_BS1_16TQ;
@@ -313,7 +317,7 @@ static void MX_CAN2_Init(void)
 
   /* USER CODE END CAN2_Init 1 */
   hcan2.Instance = CAN2;
-  hcan2.Init.Prescaler = 8;
+  hcan2.Init.Prescaler = 16;
   hcan2.Init.Mode = CAN_MODE_SILENT;
   hcan2.Init.SyncJumpWidth = CAN_SJW_1TQ;
   hcan2.Init.TimeSeg1 = CAN_BS1_16TQ;
@@ -386,7 +390,7 @@ static void MX_USART1_UART_Init(void)
 
   /* USER CODE END USART1_Init 1 */
   huart1.Instance = USART1;
-  huart1.Init.BaudRate = 1152000;
+  huart1.Init.BaudRate = 115200;
   huart1.Init.WordLength = UART_WORDLENGTH_8B;
   huart1.Init.StopBits = UART_STOPBITS_1;
   huart1.Init.Parity = UART_PARITY_NONE;
@@ -419,6 +423,9 @@ static void MX_DMA_Init(void)
   /* DMA2_Stream6_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(DMA2_Stream6_IRQn, 5, 0);
   HAL_NVIC_EnableIRQ(DMA2_Stream6_IRQn);
+  /* DMA2_Stream7_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA2_Stream7_IRQn, 5, 0);
+  HAL_NVIC_EnableIRQ(DMA2_Stream7_IRQn);
 
   /* USER CODE BEGIN MX_DMA_Init 1 */
   DEBUG_PRINT("DMA initialized!\r\n");

Core/Src/stm32f4xx_hal_msp.c

@@ -26,6 +26,8 @@ extern DMA_HandleTypeDef hdma_sdio_rx;
 
 extern DMA_HandleTypeDef hdma_sdio_tx;
 
+extern DMA_HandleTypeDef hdma_usart1_tx;
+
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN TD */
 
@@ -371,6 +373,28 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
     GPIO_InitStruct.Alternate = GPIO_AF7_USART1;
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
+    /* USART1 DMA Init */
+    /* USART1_TX Init */
+    hdma_usart1_tx.Instance = DMA2_Stream7;
+    hdma_usart1_tx.Init.Channel = DMA_CHANNEL_4;
+    hdma_usart1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+    hdma_usart1_tx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_usart1_tx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_usart1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_usart1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_usart1_tx.Init.Mode = DMA_NORMAL;
+    hdma_usart1_tx.Init.Priority = DMA_PRIORITY_LOW;
+    hdma_usart1_tx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
+    if (HAL_DMA_Init(&hdma_usart1_tx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __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 */
@@ -401,6 +425,11 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
     */
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9|GPIO_PIN_10);
 
+    /* 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

@@ -58,6 +58,8 @@
 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 */
@@ -162,6 +164,20 @@ 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.
   */
@@ -218,6 +234,20 @@ void DMA2_Stream6_IRQHandler(void)
   /* USER CODE END DMA2_Stream6_IRQn 1 */
 }
 
+/**
+  * @brief This function handles DMA2 stream7 global interrupt.
+  */
+void DMA2_Stream7_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA2_Stream7_IRQn 0 */
+
+  /* USER CODE END DMA2_Stream7_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_usart1_tx);
+  /* USER CODE BEGIN DMA2_Stream7_IRQn 1 */
+
+  /* USER CODE END DMA2_Stream7_IRQn 1 */
+}
+
 /* USER CODE BEGIN 1 */
 
 /* USER CODE END 1 */

LICENSE.md

@@ -0,0 +1,38 @@
+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

@@ -0,0 +1,15 @@
+# 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

@@ -20,7 +20,8 @@ CAN2.Mode=CAN_MODE_SILENT
 CAN2.Prescaler=8
 Dma.Request0=SDIO_RX
 Dma.Request1=SDIO_TX
-Dma.RequestsNb=2
+Dma.Request2=USART1_TX
+Dma.RequestsNb=3
 Dma.SDIO_RX.0.Direction=DMA_PERIPH_TO_MEMORY
 Dma.SDIO_RX.0.FIFOMode=DMA_FIFOMODE_ENABLE
 Dma.SDIO_RX.0.FIFOThreshold=DMA_FIFO_THRESHOLD_FULL
@@ -47,6 +48,16 @@ Dma.SDIO_TX.1.PeriphDataAlignment=DMA_PDATAALIGN_WORD
 Dma.SDIO_TX.1.PeriphInc=DMA_PINC_DISABLE
 Dma.SDIO_TX.1.Priority=DMA_PRIORITY_LOW
 Dma.SDIO_TX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode,FIFOThreshold,MemBurst,PeriphBurst
+Dma.USART1_TX.2.Direction=DMA_MEMORY_TO_PERIPH
+Dma.USART1_TX.2.FIFOMode=DMA_FIFOMODE_DISABLE
+Dma.USART1_TX.2.Instance=DMA2_Stream7
+Dma.USART1_TX.2.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART1_TX.2.MemInc=DMA_MINC_ENABLE
+Dma.USART1_TX.2.Mode=DMA_NORMAL
+Dma.USART1_TX.2.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART1_TX.2.PeriphInc=DMA_PINC_DISABLE
+Dma.USART1_TX.2.Priority=DMA_PRIORITY_LOW
+Dma.USART1_TX.2.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode
 FREERTOS.FootprintOK=true
 FREERTOS.IPParameters=Tasks01,configUSE_NEWLIB_REENTRANT,FootprintOK
 FREERTOS.Tasks01=DefaultTask,49,128,can_listen,Default,NULL,Dynamic,NULL,NULL
@@ -96,6 +107,7 @@ MxDb.Version=DB.6.0.170
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
 NVIC.DMA2_Stream3_IRQn=true\:5\:0\:false\:false\:true\:true\:false\:true\:true
 NVIC.DMA2_Stream6_IRQn=true\:5\:0\:false\:false\:true\:true\:false\:true\:true
+NVIC.DMA2_Stream7_IRQn=true\:5\:0\:false\:false\:true\:true\:false\:true\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
 NVIC.ForceEnableDMAVector=true
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
@@ -112,6 +124,7 @@ 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