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

Timestamp:

Feb 20, 2025, 4:39:55 PM (3 months ago)

Author:

Zed

Message:

Charging PWM on TIM1 was implemented.

Location:

ctrl/firmware/Main/CubeMX/Core

Files:

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

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

@@ -80 +80 @@
 #define POWER_15V_EN_Pin GPIO_PIN_7
 #define POWER_15V_EN_GPIO_Port GPIOE
+#define CHARGE_PWM_L_Pin GPIO_PIN_8
+#define CHARGE_PWM_L_GPIO_Port GPIOE
+#define CHARGE_PWM_H_Pin GPIO_PIN_9
+#define CHARGE_PWM_H_GPIO_Port GPIOE
 #define SPI4_NSS_DISPLAY_Pin GPIO_PIN_11
 #define SPI4_NSS_DISPLAY_GPIO_Port GPIOE

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

@@ -33 +33 @@
 /* USER CODE END Includes */
 
+extern TIM_HandleTypeDef htim1;
+
 extern TIM_HandleTypeDef htim3;
 
@@ -43 +45 @@
 /* USER CODE END Private defines */
 
+void MX_TIM1_Init(void);
 void MX_TIM3_Init(void);
 void MX_TIM6_Init(void);

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

@@ -64 +64 @@
   /* USER CODE BEGIN DAC1_Init 2 */
 
-  uint32_t Voltage_mV = 3400U / 2U;       // We devide by 2, because voltage from Li-cell passes voltage divider 30k/30k (1:1)
-  uint32_t Data = (Voltage_mV * (1U << DAC_RESOLUTION_BIT)) / VREF;
+  uint32_t Voltage_mV = 6000U / 2U;       // We devide by 2, because voltage from Li-cell passes voltage divider 30k/30k (1:1)
+  uint32_t Data = (Voltage_mV * ((1U << DAC_RESOLUTION_BIT) - 1U)) / VREF;
   HAL_StatusTypeDef r = HAL_DAC_SetValue(&hdac1, DAC_U_LIMIT_CHANNEL, DAC_ALIGN_12B_R, Data);
   if (r == HAL_OK)

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

@@ -82 +82 @@
   HAL_GPIO_WritePin(ETH_SPI_RST_GPIO_Port, ETH_SPI_RST_Pin, GPIO_PIN_RESET);
 
-  /*Configure GPIO pins : PE4 PE5 PE8 PE9
-                           PE10 PE0 PE1 */
-  GPIO_InitStruct.Pin = GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_8|GPIO_PIN_9
-                          |GPIO_PIN_10|GPIO_PIN_0|GPIO_PIN_1;
+  /*Configure GPIO pins : PE4 PE5 PE10 PE0
+                           PE1 */
+  GPIO_InitStruct.Pin = GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_10|GPIO_PIN_0
+                          |GPIO_PIN_1;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;

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

@@ -149 +149 @@
   MX_DTS_Init();
   MX_DAC1_Init();
+  MX_TIM1_Init();
   /* USER CODE BEGIN 2 */
 

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

@@ -25 +25 @@
 /* USER CODE END 0 */
 
+TIM_HandleTypeDef htim1;
 TIM_HandleTypeDef htim3;
 TIM_HandleTypeDef htim6;
 TIM_HandleTypeDef htim8;
 
+/* TIM1 init function */
+void MX_TIM1_Init(void)
+{
+
+  /* USER CODE BEGIN TIM1_Init 0 */
+
+  // This Timer is used to generate two PWM wave forms to charge the cell.
+
+  /* USER CODE END TIM1_Init 0 */
+
+  TIM_ClockConfigTypeDef sClockSourceConfig = {0};
+  TIM_MasterConfigTypeDef sMasterConfig = {0};
+  TIM_OC_InitTypeDef sConfigOC = {0};
+  TIM_BreakDeadTimeConfigTypeDef sBreakDeadTimeConfig = {0};
+
+  /* USER CODE BEGIN TIM1_Init 1 */
+
+  // CPU freqency is assumed as 100MHz. PWM frequency must not be greater than 64kHz.
+
+  /* USER CODE END TIM1_Init 1 */
+  htim1.Instance = TIM1;
+  htim1.Init.Prescaler = 0;
+  htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
+  htim1.Init.Period = 800; // 1600
+  htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
+  htim1.Init.RepetitionCounter = 0;
+  htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;
+  if (HAL_TIM_Base_Init(&htim1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
+  if (HAL_TIM_ConfigClockSource(&htim1, &sClockSourceConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_TIM_PWM_Init(&htim1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+  sMasterConfig.MasterOutputTrigger2 = TIM_TRGO2_RESET;
+  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
+  if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sConfigOC.OCMode = TIM_OCMODE_PWM1;
+  sConfigOC.Pulse = 200U;
+  sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
+  sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH;
+  sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
+  sConfigOC.OCIdleState = TIM_OCIDLESTATE_SET;
+  sConfigOC.OCNIdleState = TIM_OCNIDLESTATE_RESET;
+  if (HAL_TIM_PWM_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_1) != 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.BreakPolarity = TIM_BREAKPOLARITY_HIGH;
+  sBreakDeadTimeConfig.BreakFilter = 0;
+  sBreakDeadTimeConfig.Break2State = TIM_BREAK2_DISABLE;
+  sBreakDeadTimeConfig.Break2Polarity = TIM_BREAK2POLARITY_HIGH;
+  sBreakDeadTimeConfig.Break2Filter = 0;
+  sBreakDeadTimeConfig.AutomaticOutput = TIM_AUTOMATICOUTPUT_ENABLE;
+  if (HAL_TIMEx_ConfigBreakDeadTime(&htim1, &sBreakDeadTimeConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIM1_Init 2 */
+
+  /* USER CODE END TIM1_Init 2 */
+  HAL_TIM_MspPostInit(&htim1);
+
+}
 /* TIM3 init function */
 void MX_TIM3_Init(void)
@@ -35 +115 @@
   /* USER CODE BEGIN TIM3_Init 0 */
 
-  // This timer is used to control FAN
+  // This timer is used to control FAN with the PWM generation.
 
   /* USER CODE END TIM3_Init 0 */
@@ -93 +173 @@
   /* USER CODE BEGIN TIM6_Init 0 */
 
-  // This timer increments its content every 1µs and is used to generate
+  // This timer increments its counter every 1µs and is used to generate
   // delays for 1-Wire protocol. CPU speed is assumed as 100MHz.
 
@@ -128 +208 @@
 
   /* USER CODE BEGIN TIM8_Init 0 */
+
+  // This timer is used to count pulses from FAN's Hall-sensor to count RPM.
 
   /* USER CODE END TIM8_Init 0 */
@@ -192 +274 @@
 
   GPIO_InitTypeDef GPIO_InitStruct = {0};
-  if(tim_baseHandle->Instance==TIM3)
+  if(tim_baseHandle->Instance==TIM1)
+  {
+  /* USER CODE BEGIN TIM1_MspInit 0 */
+
+  /* USER CODE END TIM1_MspInit 0 */
+    /* TIM1 clock enable */
+    __HAL_RCC_TIM1_CLK_ENABLE();
+  /* USER CODE BEGIN TIM1_MspInit 1 */
+
+  /* USER CODE END TIM1_MspInit 1 */
+  }
+  else if(tim_baseHandle->Instance==TIM3)
   {
   /* USER CODE BEGIN TIM3_MspInit 0 */
@@ -252 +345 @@
 
   GPIO_InitTypeDef GPIO_InitStruct = {0};
-  if(timHandle->Instance==TIM3)
+  if(timHandle->Instance==TIM1)
+  {
+  /* USER CODE BEGIN TIM1_MspPostInit 0 */
+
+  /* USER CODE END TIM1_MspPostInit 0 */
+    __HAL_RCC_GPIOE_CLK_ENABLE();
+    /**TIM1 GPIO Configuration
+    PE8     ------> TIM1_CH1N
+    PE9     ------> TIM1_CH1
+    */
+    GPIO_InitStruct.Pin = CHARGE_PWM_L_Pin|CHARGE_PWM_H_Pin;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+    GPIO_InitStruct.Alternate = GPIO_AF1_TIM1;
+    HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
+
+  /* USER CODE BEGIN TIM1_MspPostInit 1 */
+
+  /* USER CODE END TIM1_MspPostInit 1 */
+  }
+  else if(timHandle->Instance==TIM3)
   {
   /* USER CODE BEGIN TIM3_MspPostInit 0 */
@@ -279 +393 @@
 {
 
-  if(tim_baseHandle->Instance==TIM3)
+  if(tim_baseHandle->Instance==TIM1)
+  {
+  /* USER CODE BEGIN TIM1_MspDeInit 0 */
+
+  /* USER CODE END TIM1_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_TIM1_CLK_DISABLE();
+  /* USER CODE BEGIN TIM1_MspDeInit 1 */
+
+  /* USER CODE END TIM1_MspDeInit 1 */
+  }
+  else if(tim_baseHandle->Instance==TIM3)
   {
   /* USER CODE BEGIN TIM3_MspDeInit 0 */