Changeset 69 for trunk/fw_g473rct/Core/Src

Timestamp:

Apr 10, 2026, 10:32:16 AM (4 weeks ago)

Author:

f.jahn

Message:

Started implementing Modbus on USB CDC channel.

Location:

trunk/fw_g473rct/Core/Src

Files:

• main.c (modified) (7 diffs)
• stm32g4xx_it.c (modified) (1 diff)

trunk/fw_g473rct/Core/Src/main.c

@@ -57 +57 @@
 #include "ltc_current.h"
 #include "usbd_cdc_if.h"
+#include "ring.h"
 
 /* USER CODE END Includes */
@@ -100 +101 @@
 static volatile uint32_t newADC5Data = 0;
 
+ring_buffer_t usb_in_buff __attribute__((section(".CCM_RAM1_CRC")));
+ring_buffer_t usb_out_buff __attribute__((section(".CCM_RAM1_CRC")));
+
 /* USER CODE END PV */
 
@@ -105 +109 @@
 void SystemClock_Config(void);
 /* USER CODE BEGIN PFP */
+
 bool SetFlashReadProtection(bool state);
 uint8_t printprotectionstate(void);
@@ -113 +118 @@
 void CheckRAMHWParity(void);
 void DoNothing(void){};
+void processUSB(ring_buffer_t* const ring_in_buff, ring_buffer_t* const ring_out_buff);
+
 /* USER CODE END PFP */
 
@@ -463 +470 @@
     }
 
+        if (rb_available(&usb_in_buff) > 8)                                                                                     // 8 minimum packet size in Modbus RTU RHR/WHR
+        {       // Theres something in our USB buffer. We need to process it
+                processUSB(&usb_in_buff, &usb_out_buff);
+        }
   
   }
@@ -526 +537 @@
 
 /* USER CODE BEGIN 4 */
+
+void processUSB(ring_buffer_t* const ring_in_buff, ring_buffer_t* const ring_out_buff)
+{
+        const uint32_t MAX_DELAY_ms = 1000U;
+        static uint32_t lastTime;
+        static int stage;
+        uint8_t adr, data;
+
+        switch (stage)
+        {
+                case 0: // Initial stage. We are waiting for our slave address
+                        while (rb_peek(ring_in_buff, &adr) && adr != sys_data.s.parameter.slave_address) // Removing elements from ring buffer, till we get a byte with our salve address
+                                rb_pop(ring_in_buff, &data);
+        
+                        uint8_t fc;
+                        bool r = rb_peek_at(ring_in_buff, 1U, &fc);                                                     // Testing function code, if present
+                        if (r == false)
+                        {
+                                lastTime = HAL_GetTick();                                                                               // Saving time of arrival of last byte
+                                ++stage;
+                                return;
+                        }
+
+                        switch (fc)
+                        {
+                                case FC_READ_HOLDING_REGISTERS: {
+                                        uint8_t start_addr_hi;
+                                        r = rb_peek_at(ring_in_buff, 3U, &start_addr_hi);
+                                        if (r == false)
+                                        {
+                                                lastTime = HAL_GetTick();                                                               // Saving time of arrival of last byte
+                                                ++stage;
+                                                return;
+                                        }
+
+                                        uint8_t start_addr_lo;
+                                        r = rb_peek_at(ring_in_buff, 2U, &start_addr_lo);
+                                        if (r == false)
+                                        {
+                                                lastTime = HAL_GetTick();                                                               // Saving time of arrival of last byte
+                                                ++stage;
+                                                return;
+                                        }
+
+                                        uint16_t start_addr = (((uint16_t)start_addr_hi) << 8U) | ((uint16_t)start_addr_lo);  // Modbus register start address
+
+                                        uint8_t reg_num_hi;
+                                        r = rb_peek_at(ring_in_buff, 5U, &reg_num_hi);
+                                        if (r == false)
+                                        {
+                                                lastTime = HAL_GetTick();                                                               // Saving time of arrival of last byte
+                                                ++stage;
+                                                return;
+                                        }
+
+                                        uint8_t reg_num_lo;
+                                        r = rb_peek_at(ring_in_buff, 4U, &reg_num_lo);
+                                        if (r == false)
+                                        {
+                                                lastTime = HAL_GetTick();                                                               // Saving time of arrival of last byte
+                                                ++stage;
+                                                return;
+                                        }
+
+                                        uint16_t reg_num = (((uint16_t)reg_num_hi) << 8U) | ((uint16_t)reg_num_lo);  // Modbus Quantity of Registers
+
+
+                                        }
+                                        break;
+
+                                case FC_WRITE_SINGLE_REGISTER:
+                                        break;
+        
+                                case FC_WRITE_MULTIPLE_REGISTER:
+                                        break;
+        
+                                case FC_READ_COILS:
+                                default:
+                                        break;
+                        }
+                        break;
+
+                case 1:
+                        break;
+
+                case 2:
+                        break;
+        }
+}
+
+//------------------------------------------------------------------------------
+
 void LoadBackupRegister(void)
 {
@@ -754 +857 @@
                 ;
         }
+        else
+        {
+#ifdef DEBUG
+                printf("RAM Parity check was activated\n");
+#endif
+        }
 }
 

trunk/fw_g473rct/Core/Src/stm32g4xx_it.c

@@ -83 +83 @@
   /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
 
+  if (SYSCFG->CFGR2 & SYSCFG_CFGR2_SPF)
+  {
+          ++sys_data.s.values.ramCRCErrCnt;
+          SYSCFG->CFGR2 |= SYSCFG_CFGR2_SPF;
+          return;
+  }
+
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */