Changeset 24 for trunk/fw_g473rct/SES/src/modbus.c

Timestamp:

Aug 31, 2025, 6:56:29 PM (4 days ago)

Author:

f.jahn

Message:

Shunt Temperatursensor aktiviert

File:

• trunk/fw_g473rct/SES/src/modbus.c (modified) (4 diffs)

trunk/fw_g473rct/SES/src/modbus.c

@@ -183 +183 @@
         }
         
-        uint32_t fixedDelayInBitDurations = (FAST_BAUDRATE_INTERFRAME_DELAY_us * baudrate) / 1000000UL + 1UL;
-//      HAL_UART_EnableReceiverTimeout( usart);
-//      HAL_UART_ReceiverTimeout_Config(usart,  fixedDelayInBitDurations);
-
-    if(HAL_UARTEx_ReceiveToIdle_DMA(mb_data->uart, mb_data->rx_buffer, RXBUFFERSIZE) != HAL_OK)
+        
+        HAL_UART_EnableReceiverTimeout( usart);
+        HAL_UART_ReceiverTimeout_Config(usart,  3.5 * nrOfBitsPerChar);
+        SET_BIT(usart->Instance->CR1, USART_CR1_RTOIE); 
+
+
+    if(HAL_UART_Receive_DMA(mb_data->uart, mb_data->rx_buffer, RXBUFFERSIZE) != HAL_OK)
     {
       printf("uart error \n\r");
@@ -202 +204 @@
     modbusData.mb_rx_frame_complete = 1;
     modbusData.setRxLed = false;
-        modbusData.rx_head= 0;
-
+        modbusData.rx_head = huart->RxXferSize - __HAL_DMA_GET_COUNTER(huart->hdmarx);
+        
 
   if (huart->ErrorCode == HAL_UART_ERROR_RTO)
   {
-        printf("MB RTO Event! \n\r");
+
+        // printf("MB RTO Event! \n\r");
+        // Kein Fehler, normale Funktion
   }
   if (huart->ErrorCode == HAL_UART_ERROR_FE)
@@ -240 +244 @@
 
 
-  if(HAL_UARTEx_ReceiveToIdle_DMA(huart, huart->pRxBuffPtr, RXBUFFERSIZE) != HAL_OK)
+  
+  if(HAL_UART_Receive_DMA(huart, huart->pRxBuffPtr, RXBUFFERSIZE) != HAL_OK)
    {
      printf("Uart Error bei neustart nach Fehler \n\r");
@@ -250 +255 @@
 }
 
-void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size)
-{
-  //printf("MB rxEvent!RX=%d \n\r",Size);
-  modbusData.setRxLed = true;
-
-  modbusData.mb_rx_frame_complete = 1;
-  modbusData.rx_head= Size +1;
-
-  if(HAL_UARTEx_ReceiveToIdle_DMA(huart, huart->pRxBuffPtr, RXBUFFERSIZE) != HAL_OK)
-   {
-     printf("uart error \n\r");
-  //   while(1)
-  //   {
-  //   }     
-   }    
-  
-
-}
+//void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size)
+//{
+//  //printf("MB rxEvent!RX=%d \n\r",Size);
+//  modbusData.setRxLed = true;
+
+//  modbusData.mb_rx_frame_complete = 1;
+//  modbusData.rx_head= Size +1;
+
+//  if(HAL_UART_Receive_DMA(huart, huart->pRxBuffPtr, RXBUFFERSIZE) != HAL_OK)
+//   {
+//     printf("uart error \n\r");
+//  //   while(1)
+//  //   {
+//  //   }     
+//   }    
+  
+
+//}
 
 void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)