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

Timestamp:

Mar 12, 2025, 4:18:34 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) (6 diffs)
• Src/freertos.c (modified) (1 diff)
• Src/main.c (modified) (1 diff)
• Src/stm32h7xx_it.c (modified) (2 diffs)

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

@@ -41 +41 @@
 /* USER CODE BEGIN Private defines */
 
-#define ADC2_CHANNELS   (2U)
-#define ADC3_CHANNELS   (4U)
-#define VREF                    (3000U)
+#define ADC2_CHANNELS_NUM       (2U)
+#define ADC3_CHANNELS_NUM       (4U)
+#define VREF                            (3000U)
 
 typedef union ADC2_data_t
 {
-        uint16_t Raw[ADC2_CHANNELS];
+        uint16_t Raw[ADC2_CHANNELS_NUM];
         struct
         {
@@ -57 +57 @@
 typedef union ADC3_data_t
 {
-        uint16_t Raw[ADC3_CHANNELS];
+        uint16_t Raw[ADC3_CHANNELS_NUM];
         struct
         {

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

@@ -23 +23 @@
 /* USER CODE BEGIN 0 */
 
+#include <string.h>
+
 volatile ADC2_data_t ADC2Data __attribute__((section(".AXI_RAM_4_DMA")));
 volatile ADC3_data_t ADC3Data __attribute__((section(".BKP_RAM_4_DMA")));
@@ -52 +54 @@
   */
   hadc2.Instance = ADC2;
-  hadc2.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV256;
+  hadc2.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV2;
   hadc2.Init.Resolution = ADC_RESOLUTION_16B;
   hadc2.Init.ScanConvMode = ADC_SCAN_ENABLE;
@@ -66 +68 @@
   hadc2.Init.LeftBitShift = ADC_LEFTBITSHIFT_NONE;
   hadc2.Init.OversamplingMode = ENABLE;
-  hadc2.Init.Oversampling.Ratio = 1024;
-  hadc2.Init.Oversampling.RightBitShift = ADC_RIGHTBITSHIFT_10;
+  hadc2.Init.Oversampling.Ratio = 64;
+  hadc2.Init.Oversampling.RightBitShift = ADC_RIGHTBITSHIFT_6;
   hadc2.Init.Oversampling.TriggeredMode = ADC_TRIGGEREDMODE_SINGLE_TRIGGER;
   hadc2.Init.Oversampling.OversamplingStopReset = ADC_REGOVERSAMPLING_CONTINUED_MODE;
@@ -93 +95 @@
   sConfig.Channel = ADC_CHANNEL_4;
   sConfig.Rank = ADC_REGULAR_RANK_2;
+  sConfig.Offset = 0;
   if (HAL_ADC_ConfigChannel(&hadc2, &sConfig) != HAL_OK)
   {
@@ -104 +107 @@
   HAL_Delay(100U);
 
-  //if (HAL_OK != HAL_ADC_Start(&hadc3)) Error_Handler();
-  if (HAL_OK != HAL_ADC_Start_DMA(&hadc2, (uint32_t*)&ADC2Data, ADC2_CHANNELS)) Error_Handler();
-  __HAL_DMA_DISABLE_IT(&hdma_adc2, DMA_IT_HT);
-
-  uint16_t offset = 0;
-  for (int i = 0; i < 100; i++)
-  {
-
-  }
+  uint32_t offset[2] = { 0U };
+  const uint32_t max_samples = 16U;
+  // Starting DMA converstion
+  if (HAL_OK != HAL_ADC_Start_DMA(&hadc2, (uint32_t*)&ADC2Data, ADC2_CHANNELS_NUM)) Error_Handler();
+   // Disabling interrupts, because we don't need it during offset calculation
+  __HAL_DMA_DISABLE_IT(&hdma_adc2, DMA_IT_HT | DMA_IT_TC);
+  for (uint32_t i = 0U; i < max_samples; i++)
+  {       // Waiting for conversion to finish
+          while(!__HAL_DMA_GET_FLAG(&hdma_adc2, DMA_FLAG_TCIF1_5));
+          // Reading ADC2 value
+          offset[0] += ADC2Data.Raw[0];
+          offset[1] += ADC2Data.Raw[1];
+          __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);
+
+  if (HAL_OK == HAL_ADC_Stop_DMA(&hadc2))
+  {
+          LL_ADC_SetOffset(hadc2.Instance, LL_ADC_OFFSET_1, LL_ADC_CHANNEL_3, (offset[0]/max_samples) << 6U);
+          LL_ADC_SetOffset(hadc2.Instance, LL_ADC_OFFSET_2, LL_ADC_CHANNEL_4, (offset[1]/max_samples) << 6U);
+  }
+
+  if (HAL_OK != HAL_ADC_Start_DMA(&hadc2, (uint32_t*)&ADC2Data, ADC2_CHANNELS_NUM)) Error_Handler();
+  __HAL_DMA_DISABLE_IT(&hdma_adc2, DMA_IT_HT /*| DMA_IT_TC*/); // Disabling interrupts, because we don't need it
 
 
@@ -209 +228 @@
 
   //if (HAL_OK != HAL_ADC_Start(&hadc3)) Error_Handler();
-  if (HAL_OK != HAL_ADC_Start_DMA(&hadc3, (uint32_t*)&ADC3Data, ADC3_CHANNELS)) Error_Handler();
+  if (HAL_OK != HAL_ADC_Start_DMA(&hadc3, (uint32_t*)&ADC3Data, ADC3_CHANNELS_NUM)) Error_Handler();
   __HAL_DMA_DISABLE_IT(&hdma_adc3, DMA_IT_HT);
 

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

@@ -58 +58 @@
 #define BME_TASK_STACK_DEPTH_WORDS                                      (256U)
 #define GUI_TASK_STACK_DEPTH_WORDS                                      (2048U)
-#define FAN_TASK_STACK_DEPTH_WORDS                                      (128U)
+#define FAN_TASK_STACK_DEPTH_WORDS                                      (256U)
 
 /* USER CODE END PD */

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

@@ -374 +374 @@
 {
   /* USER CODE BEGIN Error_Handler_Debug */
+  printf("ERROR!!!\n");
   /* User can add his own implementation to report the HAL error return state */
   __disable_irq();

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

@@ -24 +24 @@
 /* USER CODE BEGIN Includes */
 
+#include <stdio.h>
+
 #include "FreeRTOS.h"
 #include "modbus.h"
-//#include "semphr.h"
+#include "adc.h"
 
 /* USER CODE END Includes */
@@ -468 +470 @@
 
 //------------------------------------------------------------------------------
+
+static volatile int64_t charge_tmp;
+static volatile int64_t load_tmp;
+static volatile float charge_i;
+static volatile float load_i;
+
+void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hadc)
+{
+        //extern ADC2_data_t ADC2Data;
+
+        if (hadc->Instance == ADC2)
+        {
+                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);
+                HAL_GPIO_WritePin(RX1_LED_GPIO_Port, RX1_LED_Pin, GPIO_PIN_RESET);
+        }
+}
+
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------