Changeset 76 for trunk/fw_g473rct/Core

Timestamp:

Sep 9, 2026, 3:02:30 PM (11 days ago)

Author:

f.jahn

Message:

 

Location:

trunk/fw_g473rct/Core

Files:

• Inc/dac.h (added)
• Inc/main.h (modified) (1 diff)
• Inc/stm32g4xx_hal_conf.h (modified) (1 diff)
• Src/adc.c (modified) (17 diffs)
• Src/dac.c (added)
• Src/main.c (modified) (6 diffs)
• Src/stm32g4xx_it.c (modified) (3 diffs)
• Src/tim.c (modified) (1 diff)
• Src/ucpd.c (modified) (1 diff)

trunk/fw_g473rct/Core/Inc/main.h

@@ -30 +30 @@
 #include "stm32g4xx_hal.h"
 
+#include "stm32g4xx_ll_ucpd.h"
+#include "stm32g4xx_ll_bus.h"
+#include "stm32g4xx_ll_cortex.h"
+#include "stm32g4xx_ll_rcc.h"
+#include "stm32g4xx_ll_system.h"
+#include "stm32g4xx_ll_utils.h"
+#include "stm32g4xx_ll_pwr.h"
+#include "stm32g4xx_ll_gpio.h"
+#include "stm32g4xx_ll_dma.h"
 
+#include "stm32g4xx_ll_exti.h"
 
 /* Private includes ----------------------------------------------------------*/

trunk/fw_g473rct/Core/Inc/stm32g4xx_hal_conf.h

@@ -42 +42 @@
 #define HAL_CRC_MODULE_ENABLED
 /*#define HAL_CRYP_MODULE_ENABLED   */
-/*#define HAL_DAC_MODULE_ENABLED   */
+#define HAL_DAC_MODULE_ENABLED
 /*#define HAL_FDCAN_MODULE_ENABLED   */
 /*#define HAL_FMAC_MODULE_ENABLED   */

trunk/fw_g473rct/Core/Src/adc.c

@@ -66 +66 @@
   hadc1.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
   hadc1.Init.LowPowerAutoWait = DISABLE;
-  hadc1.Init.ContinuousConvMode = ENABLE;
+  hadc1.Init.ContinuousConvMode = DISABLE;
   hadc1.Init.NbrOfConversion = 1;
   hadc1.Init.DiscontinuousConvMode = DISABLE;
@@ -132 +132 @@
   hadc2.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
   hadc2.Init.LowPowerAutoWait = DISABLE;
-  hadc2.Init.ContinuousConvMode = ENABLE;
+  hadc2.Init.ContinuousConvMode = DISABLE;
   hadc2.Init.NbrOfConversion = 1;
   hadc2.Init.DiscontinuousConvMode = DISABLE;
@@ -156 +156 @@
   sConfig.SingleDiff = ADC_DIFFERENTIAL_ENDED;
   sConfig.OffsetNumber = ADC_OFFSET_NONE;
-  sConfig.Offset = 0; //Spannung etwa 100mV erhöhen
-
+  sConfig.Offset = 0;
   if (HAL_ADC_ConfigChannel(&hadc2, &sConfig) != HAL_OK)
   {
@@ -198 +197 @@
   hadc3.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
   hadc3.Init.DMAContinuousRequests = ENABLE;
-  hadc3.Init.Overrun = ADC_OVR_DATA_PRESERVED;
+  hadc3.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
   hadc3.Init.OversamplingMode = ENABLE;
   hadc3.Init.Oversampling.Ratio = ADC_OVERSAMPLING_RATIO_256;
@@ -276 +275 @@
   hadc4.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
   hadc4.Init.LowPowerAutoWait = DISABLE;
-  hadc4.Init.ContinuousConvMode = ENABLE;
+  hadc4.Init.ContinuousConvMode = DISABLE;
   hadc4.Init.NbrOfConversion = 1;
   hadc4.Init.DiscontinuousConvMode = DISABLE;
@@ -282 +281 @@
   hadc4.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_RISING;
   hadc4.Init.DMAContinuousRequests = DISABLE;
-  hadc4.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
+  hadc4.Init.Overrun = ADC_OVR_DATA_PRESERVED;
   hadc4.Init.OversamplingMode = ENABLE;
   hadc4.Init.Oversampling.Ratio = ADC_OVERSAMPLING_RATIO_256;
@@ -301 +300 @@
   sConfig.OffsetNumber = ADC_OFFSET_NONE;
   sConfig.Offset = 0;
-
-
   if (HAL_ADC_ConfigChannel(&hadc4, &sConfig) != HAL_OK)
   {
@@ -415 +412 @@
   */
     PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC12;
-    PeriphClkInit.Adc12ClockSelection = RCC_ADC12CLKSOURCE_SYSCLK;
+    PeriphClkInit.Adc12ClockSelection = RCC_ADC12CLKSOURCE_PLL;
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
     {
@@ -444 +441 @@
     hdma_adc1.Init.PeriphInc = DMA_PINC_DISABLE;
     hdma_adc1.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_adc1.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+    hdma_adc1.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
     hdma_adc1.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
     hdma_adc1.Init.Mode = DMA_NORMAL;
@@ -468 +465 @@
   */
     PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC12;
-    PeriphClkInit.Adc12ClockSelection = RCC_ADC12CLKSOURCE_SYSCLK;
+    PeriphClkInit.Adc12ClockSelection = RCC_ADC12CLKSOURCE_PLL;
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
     {
@@ -497 +494 @@
     hdma_adc2.Init.PeriphInc = DMA_PINC_DISABLE;
     hdma_adc2.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_adc2.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+    hdma_adc2.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
     hdma_adc2.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
     hdma_adc2.Init.Mode = DMA_NORMAL;
@@ -521 +518 @@
   */
     PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC345;
-    PeriphClkInit.Adc345ClockSelection = RCC_ADC345CLKSOURCE_SYSCLK;
+    PeriphClkInit.Adc345ClockSelection = RCC_ADC345CLKSOURCE_PLL;
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
     {
@@ -551 +548 @@
     hdma_adc3.Init.PeriphInc = DMA_PINC_DISABLE;
     hdma_adc3.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_adc3.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+    hdma_adc3.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
     hdma_adc3.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
     hdma_adc3.Init.Mode = DMA_CIRCULAR;
@@ -575 +572 @@
   */
     PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC345;
-    PeriphClkInit.Adc345ClockSelection = RCC_ADC345CLKSOURCE_SYSCLK;
+    PeriphClkInit.Adc345ClockSelection = RCC_ADC345CLKSOURCE_PLL;
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
     {
@@ -604 +601 @@
     hdma_adc4.Init.PeriphInc = DMA_PINC_DISABLE;
     hdma_adc4.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_adc4.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+    hdma_adc4.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
     hdma_adc4.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
     hdma_adc4.Init.Mode = DMA_NORMAL;
@@ -628 +625 @@
   */
     PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC345;
-    PeriphClkInit.Adc345ClockSelection = RCC_ADC345CLKSOURCE_SYSCLK;
+    PeriphClkInit.Adc345ClockSelection = RCC_ADC345CLKSOURCE_PLL;
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
     {
@@ -657 +654 @@
     hdma_adc5.Init.PeriphInc = DMA_PINC_DISABLE;
     hdma_adc5.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_adc5.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+    hdma_adc5.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
     hdma_adc5.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
     hdma_adc5.Init.Mode = DMA_CIRCULAR;

trunk/fw_g473rct/Core/Src/main.c

@@ -21 +21 @@
 #include "adc.h"
 #include "crc.h"
+#include "dac.h"
 #include "dma.h"
 #include "i2c.h"
@@ -174 +175 @@
   printf("System core clock: %uMHz\n", SystemCoreClock / 1000000U);
   /* USER CODE END SysInit */
-  
+
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
@@ -190 +191 @@
   MX_CRC_Init();
   MX_RTC_Init();
-  MX_IWDG_Init();
+  //MX_IWDG_Init();
   MX_TIM3_Init();
-#ifndef  NO_USB_SUPPORT
+  #ifndef NO_USB_SUPPORT 
   MX_USB_Device_Init();
   MX_UCPD1_Init();
-#endif
+  #endif
+  MX_DAC1_Init();
   /* USER CODE BEGIN 2 */
 
@@ -231 +233 @@
   mbInit(&modbusData, sys_data.s.parameter.baudrate, sys_data.s.parameter.parityMode, sys_data.s.parameter.stopBit, &huart2);
   HAL_IWDG_Refresh(&hiwdg);
-  HAL_Delay(500);
+ // HAL_Delay(500);
   HAL_IWDG_Refresh(&hiwdg);
 
@@ -281 +283 @@
 
   /* USBPD initialisation ---------------------------------*/
-#ifndef NO_USB_SUPPORT
+  #ifndef NO_USB_SUPPORT 
   MX_USBPD_Init();
-#endif
+  #endif
+
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
@@ -289 +292 @@
   {
     /* USER CODE END WHILE */
-#ifndef NO_USB_SUPPORT
+        #ifndef NO_USB_SUPPORT 
     USBPD_DPM_Run();
-#endif
+        #endif
+
     /* USER CODE BEGIN 3 */
     HAL_IWDG_Refresh(&hiwdg);

trunk/fw_g473rct/Core/Src/stm32g4xx_it.c

@@ -59 +59 @@
 
 /* External variables --------------------------------------------------------*/
-#ifndef NO_USB_SUPPORT
 extern PCD_HandleTypeDef hpcd_USB_FS;
-#endif
 extern DMA_HandleTypeDef hdma_adc1;
 extern DMA_HandleTypeDef hdma_adc2;
@@ -210 +208 @@
 #ifndef  NO_USB_SUPPORT
   USBPD_DPM_TimerCounter();
+  /* USER CODE BEGIN SysTick_IRQn 1 */
 #endif
-  /* USER CODE BEGIN SysTick_IRQn 1 */
-
   /* USER CODE END SysTick_IRQn 1 */
 }
@@ -404 +401 @@
 }
 
-
-
 /**
   * @brief This function handles UCPD1 interrupt / UCPD1 wake-up interrupt through EXTI line 43.

trunk/fw_g473rct/Core/Src/tim.c

@@ -42 +42 @@
   /* USER CODE END TIM3_Init 1 */
   htim3.Instance = TIM3;
-  htim3.Init.Prescaler = 100 - 1;
+  htim3.Init.Prescaler = 99;
   htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim3.Init.Period = 500 - 1;
+  htim3.Init.Period = 500;
   htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;

trunk/fw_g473rct/Core/Src/ucpd.c

@@ -20 +20 @@
 /* Includes ------------------------------------------------------------------*/
 #include "ucpd.h"
-
 
 /* USER CODE BEGIN 0 */