fixed pins settings for ESC_R/L_PWM
This commit is contained in:
		@ -1,4 +1,5 @@
 | 
			
		||||
#include "PWM_control.h"
 | 
			
		||||
#include "state_machine.h"
 | 
			
		||||
#include "stm32f3xx_hal.h"
 | 
			
		||||
#include <stdint.h>
 | 
			
		||||
 | 
			
		||||
@ -17,10 +18,16 @@ void PWM_control_init(TIM_HandleTypeDef* pg, TIM_HandleTypeDef* bat_cool, TIM_Ha
 | 
			
		||||
  
 | 
			
		||||
  powerground = pg;
 | 
			
		||||
  battery_cooling = bat_cool;
 | 
			
		||||
  esc_cooling = esc_cool;
 | 
			
		||||
 | 
			
		||||
  HAL_TIM_PWM_Start(pg, TIM_CHANNEL_1);          //TIM15CH1
 | 
			
		||||
  HAL_TIM_PWM_Start(pg, TIM_CHANNEL_2);          //TIM15CH2
 | 
			
		||||
  HAL_TIM_PWM_Start(bat_cool, TIM_CHANNEL_3);     //TIM1CH3
 | 
			
		||||
  // htim2 CH3,4 BAT_COOLING_PWM,ENABLE
 | 
			
		||||
  // htim3 CH3,4 ESC_L_PWM,R_PWM
 | 
			
		||||
  // htim4 CH1,2,3 LED R,G,B
 | 
			
		||||
  // htim15 CH1,2 ESC_COOLING_ENABLE,PWM
 | 
			
		||||
 | 
			
		||||
  HAL_TIM_PWM_Start(powerground, TIM_CHANNEL_3);          //TIM3CH3
 | 
			
		||||
  HAL_TIM_PWM_Start(powerground, TIM_CHANNEL_4);          //TIM3CH4
 | 
			
		||||
  //HAL_TIM_PWM_Start(bat_cool, TIM_CHANNEL_3);     //TIM1CH3
 | 
			
		||||
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_1, 0);
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_2, 0);
 | 
			
		||||
@ -39,8 +46,8 @@ void PWM_powerground_control(uint8_t percent){
 | 
			
		||||
  powerground_status = percent;
 | 
			
		||||
 | 
			
		||||
  int ccr = 2000 + ((2000) * (percent/100.0));
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_1, ccr);
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_2, ccr);
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_3, ccr);
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_4, ccr);
 | 
			
		||||
  //TIM15->CCR1 = (TIM15->ARR*POWERGROUND_MAX_DUTY_CYCLE-TIM15->ARR*POWERGROUND_MIN_DUTY_CYCLE) * (percent/100.0) + TIM15->ARR*POWERGROUND_MIN_DUTY_CYCLE;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -48,13 +55,13 @@ void PWM_set_throttle(){
 | 
			
		||||
  uint32_t timestamp = HAL_GetTick() + 5000;
 | 
			
		||||
  while (timestamp > HAL_GetTick()) {}
 | 
			
		||||
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_1, 4000);
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_2, 4000);
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_3, 4000);
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_4, 4000);
 | 
			
		||||
  timestamp = HAL_GetTick() + 2000;
 | 
			
		||||
  while (timestamp > HAL_GetTick()) {}
 | 
			
		||||
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_1, 2000);
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_2, 2000);
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_3, 2000);
 | 
			
		||||
  __HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_4, 2000);
 | 
			
		||||
  timestamp = HAL_GetTick() + 1000;
 | 
			
		||||
  while (timestamp > HAL_GetTick()) {}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user