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

Timestamp:

Mar 5, 2025, 10:27:57 AM (2 months ago)

Author:

Zed

Message:

Everything works good. Fixing project.

Location:

ctrl/firmware/Main/CubeMX/Core

Files:

• Inc/dac.h (modified) (1 diff)
• Inc/main.h (modified) (1 diff)
• Src/dac.c (modified) (5 diffs)
• Src/gpio.c (modified) (1 diff)
• Src/tim.c (modified) (3 diffs)

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

@@ -39 +39 @@
 #define DAC_RESOLUTION_BIT        (12U)
 
-#define DAC_U_LIMIT_CHANNEL       DAC_CHANNEL_2
+#define DAC_LOAD_I_LIMIT_CHANNEL          DAC_CHANNEL_1
+#define DAC_U_LIMIT_CHANNEL                       DAC_CHANNEL_2
 
 /* USER CODE END Private defines */

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

@@ -70 +70 @@
 #define U_BAT_Pin GPIO_PIN_0
 #define U_BAT_GPIO_Port GPIOC
+#define DAC_LOAD_I_LIMIT_Pin GPIO_PIN_4
+#define DAC_LOAD_I_LIMIT_GPIO_Port GPIOA
 #define DAC_U_LIMIT_Pin GPIO_PIN_5
 #define DAC_U_LIMIT_GPIO_Port GPIOA

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

@@ -51 +51 @@
   }
 
-  /** DAC channel OUT2 config
+  /** DAC channel OUT1 config
   */
   sConfig.DAC_SampleAndHold = DAC_SAMPLEANDHOLD_DISABLE;
@@ -58 +58 @@
   sConfig.DAC_ConnectOnChipPeripheral = DAC_CHIPCONNECT_DISABLE;
   sConfig.DAC_UserTrimming = DAC_TRIMMING_FACTORY;
+  if (HAL_DAC_ConfigChannel(&hdac1, &sConfig, DAC_CHANNEL_1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** DAC channel OUT2 config
+  */
   if (HAL_DAC_ConfigChannel(&hdac1, &sConfig, DAC_CHANNEL_2) != HAL_OK)
   {
@@ -73 +80 @@
   }
   else Error_Handler();
+
+  r = HAL_DAC_SetValue(&hdac1, DAC_LOAD_I_LIMIT_CHANNEL, DAC_ALIGN_12B_R, 0U);
+  if (r == HAL_OK)
+  {
+          r = HAL_DAC_Start(&hdac1, DAC_LOAD_I_LIMIT_CHANNEL);
+          if (r != HAL_OK) Error_Handler();
+  }
+  else Error_Handler();
+
+
 
   /* USER CODE END DAC1_Init 2 */
@@ -92 +109 @@
     __HAL_RCC_GPIOA_CLK_ENABLE();
     /**DAC1 GPIO Configuration
+    PA4     ------> DAC1_OUT1
     PA5     ------> DAC1_OUT2
     */
-    GPIO_InitStruct.Pin = DAC_U_LIMIT_Pin;
+    GPIO_InitStruct.Pin = DAC_LOAD_I_LIMIT_Pin|DAC_U_LIMIT_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
-    HAL_GPIO_Init(DAC_U_LIMIT_GPIO_Port, &GPIO_InitStruct);
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
   /* USER CODE BEGIN DAC1_MspInit 1 */
@@ -117 +135 @@
 
     /**DAC1 GPIO Configuration
+    PA4     ------> DAC1_OUT1
     PA5     ------> DAC1_OUT2
     */
-    HAL_GPIO_DeInit(DAC_U_LIMIT_GPIO_Port, DAC_U_LIMIT_Pin);
+    HAL_GPIO_DeInit(GPIOA, DAC_LOAD_I_LIMIT_Pin|DAC_U_LIMIT_Pin);
 
   /* USER CODE BEGIN DAC1_MspDeInit 1 */

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

@@ -118 +118 @@
 
   /*Configure GPIO pins : PA0 PA1 PA2 PA3
-                           PA4 PA6 PA7 PA9
-                           PA10 PA11 PA12 */
+                           PA6 PA7 PA9 PA10
+                           PA11 PA12 */
   GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3
-                          |GPIO_PIN_4|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_9
-                          |GPIO_PIN_10|GPIO_PIN_11|GPIO_PIN_12;
+                          |GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_9|GPIO_PIN_10
+                          |GPIO_PIN_11|GPIO_PIN_12;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;

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

@@ -78 +78 @@
   }
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 50U;
+  sConfigOC.Pulse = 50;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH;
@@ -88 +88 @@
     Error_Handler();
   }
+  sConfigOC.Pulse = 0;
+  sConfigOC.OCIdleState = TIM_OCIDLESTATE_RESET;
+  if (HAL_TIM_PWM_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_3) != HAL_OK)
+  {
+    Error_Handler();
+  }
   sBreakDeadTimeConfig.OffStateRunMode = TIM_OSSR_ENABLE;
   sBreakDeadTimeConfig.OffStateIDLEMode = TIM_OSSI_ENABLE;
   sBreakDeadTimeConfig.LockLevel = TIM_LOCKLEVEL_1;
   sBreakDeadTimeConfig.DeadTime = 20;
-  sBreakDeadTimeConfig.BreakState = TIM_BREAK_ENABLE;
+  sBreakDeadTimeConfig.BreakState = TIM_BREAK_DISABLE;
   sBreakDeadTimeConfig.BreakPolarity = TIM_BREAKPOLARITY_HIGH;
   sBreakDeadTimeConfig.BreakFilter = 0;
@@ -354 +360 @@
     PE8     ------> TIM1_CH1N
     PE9     ------> TIM1_CH1
+    PE13     ------> TIM1_CH3
     */
-    GPIO_InitStruct.Pin = CHARGE_PWM_L_Pin|CHARGE_PWM_H_Pin;
+    GPIO_InitStruct.Pin = CHARGE_PWM_L_Pin|CHARGE_PWM_H_Pin|DISPLAY_BACKLIGHT_PWM_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;