Changeset 111 for ctrl/firmware/Main/CubeMX/Core

Timestamp:

Mar 14, 2025, 3:22:01 PM (2 months ago)

Author:

Zed

Message:

Fixing project.

Location:

ctrl/firmware/Main/CubeMX/Core

Files:

• Inc/adc.h (modified) (2 diffs)
• Src/adc.c (modified) (11 diffs)
• Src/gpio.c (modified) (1 diff)
• Src/main.c (modified) (1 diff)
• Src/stm32h7xx_it.c (modified) (1 diff)

ctrl/firmware/Main/CubeMX/Core/Inc/adc.h

@@ -41 +41 @@
 /* USER CODE BEGIN Private defines */
 
-#define ADC2_CHANNELS_NUM       (2U)
+#define ADC2_CHANNELS_NUM       (3U)
 #define ADC3_CHANNELS_NUM       (4U)
 #define VREF                            (3000U)
@@ -52 +52 @@
                 int16_t charge_strom;
                 int16_t eload_strom;
+                int16_t u_bat;
         } Name;
 } __attribute__((packed, aligned(32))) ADC2_data_t;

ctrl/firmware/Main/CubeMX/Core/Src/adc.c

@@ -60 +60 @@
   hadc2.Init.LowPowerAutoWait = DISABLE;
   hadc2.Init.ContinuousConvMode = ENABLE;
-  hadc2.Init.NbrOfConversion = 2;
+  hadc2.Init.NbrOfConversion = 3;
   hadc2.Init.DiscontinuousConvMode = DISABLE;
   hadc2.Init.ExternalTrigConv = ADC_SOFTWARE_START;
@@ -81 +81 @@
   sConfig.Channel = ADC_CHANNEL_3;
   sConfig.Rank = ADC_REGULAR_RANK_1;
-  sConfig.SamplingTime = ADC_SAMPLETIME_16CYCLES_5;
+  sConfig.SamplingTime = ADC_SAMPLETIME_32CYCLES_5;
   sConfig.SingleDiff = ADC_DIFFERENTIAL_ENDED;
   sConfig.OffsetNumber = ADC_OFFSET_NONE;
-  sConfig.Offset = 0;
+  sConfig.Offset = 32767;
   sConfig.OffsetSignedSaturation = DISABLE;
   if (HAL_ADC_ConfigChannel(&hadc2, &sConfig) != HAL_OK)
@@ -100 +100 @@
     Error_Handler();
   }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_5;
+  sConfig.Rank = ADC_REGULAR_RANK_3;
+  if (HAL_ADC_ConfigChannel(&hadc2, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
   /* USER CODE BEGIN ADC2_Init 2 */
 
@@ -107 +116 @@
   HAL_Delay(100U);
 
-  uint32_t offset[2] = { 0U };
+  uint32_t offset[ADC2_CHANNELS_NUM] = { 0U };
   const uint32_t max_samples = 8192U / ((hadc2.Init.OversamplingMode == ENABLE)? hadc2.Init.Oversampling.Ratio: 1);
   // Starting DMA converstion
@@ -117 +126 @@
           while(!__HAL_DMA_GET_FLAG(&hdma_adc2, DMA_FLAG_TCIF1_5));
           // Reading ADC2 value
-          offset[0] += ADC2Data.Raw[0];
-          offset[1] += ADC2Data.Raw[1];
+          for (unsigned j = 0; j < ADC2_CHANNELS_NUM; j++) offset[j] += ADC2Data.Raw[j];
           __HAL_DMA_CLEAR_FLAG(&hdma_adc2, DMA_FLAG_TCIF1_5);
   }
 
-  printf("ADC2 offset[0] = %u, offset[1] = %u\n", offset[0] / max_samples, offset[1] / max_samples);
+  printf("ADC2 ");
+  for (unsigned j = 0U; j < ADC2_CHANNELS_NUM; j++)
+          printf("offset[%u] = %u%s", j, offset[j] / max_samples, (j < ADC2_CHANNELS_NUM - 1)?", ":"\n");
 
   if (HAL_OK == HAL_ADC_Stop_DMA(&hadc2))
@@ -128 +138 @@
           LL_ADC_SetOffset(hadc2.Instance, LL_ADC_OFFSET_1, LL_ADC_CHANNEL_3, (offset[0]/max_samples) * ((hadc2.Init.OversamplingMode == ENABLE)? hadc2.Init.Oversampling.Ratio: 1));
           LL_ADC_SetOffset(hadc2.Instance, LL_ADC_OFFSET_2, LL_ADC_CHANNEL_4, (offset[1]/max_samples) * ((hadc2.Init.OversamplingMode == ENABLE)? hadc2.Init.Oversampling.Ratio: 1));
+          LL_ADC_SetOffset(hadc2.Instance, LL_ADC_OFFSET_3, LL_ADC_CHANNEL_5, (offset[2]/max_samples) * ((hadc2.Init.OversamplingMode == ENABLE)? hadc2.Init.Oversampling.Ratio: 1));
   }
 
@@ -184 +195 @@
   sConfig.Channel = ADC_CHANNEL_10;
   sConfig.Rank = ADC_REGULAR_RANK_1;
-  sConfig.SamplingTime = ADC_SAMPLETIME_810CYCLES_5;
+  sConfig.SamplingTime = ADC3_SAMPLETIME_640CYCLES_5;
   sConfig.SingleDiff = ADC_SINGLE_ENDED;
   sConfig.OffsetNumber = ADC_OFFSET_NONE;
@@ -250 +261 @@
     __HAL_RCC_GPIOA_CLK_ENABLE();
     __HAL_RCC_GPIOC_CLK_ENABLE();
+    __HAL_RCC_GPIOB_CLK_ENABLE();
     /**ADC2 GPIO Configuration
     PA6     ------> ADC2_INP3
@@ -255 +267 @@
     PC4     ------> ADC2_INP4
     PC5     ------> ADC2_INN4
+    PB0     ------> ADC2_INN5
+    PB1     ------> ADC2_INP5
     */
     GPIO_InitStruct.Pin = BAT_I_SENSE_PLUS_Pin|BAT_I_SENSE_MINUS_Pin;
@@ -265 +279 @@
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+    GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1;
+    GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
     /* ADC2 DMA Init */
@@ -346 +365 @@
     PC4     ------> ADC2_INP4
     PC5     ------> ADC2_INN4
+    PB0     ------> ADC2_INN5
+    PB1     ------> ADC2_INP5
     */
     HAL_GPIO_DeInit(GPIOA, BAT_I_SENSE_PLUS_Pin|BAT_I_SENSE_MINUS_Pin);
 
     HAL_GPIO_DeInit(GPIOC, GPIO_PIN_4|GPIO_PIN_5);
+
+    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_0|GPIO_PIN_1);
 
     /* ADC2 DMA DeInit */

ctrl/firmware/Main/CubeMX/Core/Src/gpio.c

@@ -123 +123 @@
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : PB0 PB1 PB2 PB11
-                           PB12 PB13 PB3 PB5 */
-  GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_11
-                          |GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_3|GPIO_PIN_5;
+  /*Configure GPIO pins : PB2 PB11 PB12 PB13
+                           PB3 PB5 */
+  GPIO_InitStruct.Pin = GPIO_PIN_2|GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13
+                          |GPIO_PIN_3|GPIO_PIN_5;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;

ctrl/firmware/Main/CubeMX/Core/Src/main.c

@@ -266 +266 @@
   PeriphClkInitStruct.PLL2.PLL2FRACN = 0;
   PeriphClkInitStruct.PLL3.PLL3M = 25;
-  PeriphClkInitStruct.PLL3.PLL3N = 150;
+  PeriphClkInitStruct.PLL3.PLL3N = 200;
   PeriphClkInitStruct.PLL3.PLL3P = 2;
-  PeriphClkInitStruct.PLL3.PLL3Q = 6;
-  PeriphClkInitStruct.PLL3.PLL3R = 3;
+  PeriphClkInitStruct.PLL3.PLL3Q = 8;
+  PeriphClkInitStruct.PLL3.PLL3R = 2;
   PeriphClkInitStruct.PLL3.PLL3RGE = RCC_PLL3VCIRANGE_0;
   PeriphClkInitStruct.PLL3.PLL3VCOSEL = RCC_PLL3VCOMEDIUM;

ctrl/firmware/Main/CubeMX/Core/Src/stm32h7xx_it.c

@@ -483 +483 @@
         {
                 HAL_GPIO_WritePin(RX1_LED_GPIO_Port, RX1_LED_Pin, GPIO_PIN_SET);
-                //charge_tmp = (((int64_t)ADC2Data.Name.charge_strom * ((int64_t)VREF) * 1000LL) / ((int64_t)0xFFFF)) / 50LL;
-                //load_tmp = (((int64_t)ADC2Data.Name.eload_strom * ((int64_t)VREF) * 1000LL) / ((int64_t)0xFFFF)) / 50LL;
-                //charge_i = (float)charge_tmp / 500LL;
-                //load_i = (float)load_tmp / 500LL;
-                //printf("\t\t\t%5.2fA, %5.2fA\n", charge_i, load_i);
-                printf("%d, %d\n", ADC2Data.Name.charge_strom, ADC2Data.Name.eload_strom);
+                charge_tmp = (((int64_t)ADC2Data.Name.charge_strom * ((int64_t)VREF) * 1000LL) / ((int64_t)0xFFFF)) / 50LL;
+                load_tmp = (((int64_t)ADC2Data.Name.eload_strom * ((int64_t)VREF) * 1000LL) / ((int64_t)0xFFFF)) / 50LL;
+                charge_i = (float)charge_tmp / 500LL;
+                load_i = (float)load_tmp / 500LL;
+                printf("\t\t\t%5.2fA, %5.2fA\n", charge_i, load_i);
+                //printf("%d, %d\n", ADC2Data.Name.charge_strom, ADC2Data.Name.eload_strom);
                 HAL_GPIO_WritePin(RX1_LED_GPIO_Port, RX1_LED_Pin, GPIO_PIN_RESET);
         }