V1.0
This commit is contained in:
parent
7a4494f5ef
commit
537641a53a
@ -20,8 +20,6 @@ CCR * DUTY_CYCLE
|
|||||||
CCR: 1/20 -> 500, 2/20 -> 1000
|
CCR: 1/20 -> 500, 2/20 -> 1000
|
||||||
*/
|
*/
|
||||||
#define POWERGROUND_FREQ 50
|
#define POWERGROUND_FREQ 50
|
||||||
#define POWERGROUND_MAX_DUTY_CYCLE 0.1
|
|
||||||
#define POWERGROUND_MIN_DUTY_CYCLE 0.05
|
|
||||||
|
|
||||||
//#define BATTERY_COOLING_FREQ 20000
|
//#define BATTERY_COOLING_FREQ 20000
|
||||||
|
|
||||||
@ -29,5 +27,6 @@ void PWM_control_init(TIM_HandleTypeDef* powerground, TIM_HandleTypeDef* battery
|
|||||||
|
|
||||||
void PWM_powerground_control(uint8_t percent);
|
void PWM_powerground_control(uint8_t percent);
|
||||||
void PWM_battery_cooling_control(uint8_t percent);
|
void PWM_battery_cooling_control(uint8_t percent);
|
||||||
|
void PWM_set_throttle();
|
||||||
|
|
||||||
#endif /* INC_CHANNEL_CONTROL_H */
|
#endif /* INC_CHANNEL_CONTROL_H */
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
#include "PWM_control.h"
|
#include "PWM_control.h"
|
||||||
|
#include "stm32f3xx_hal.h"
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
uint8_t battery_cooling_status;
|
uint8_t battery_cooling_status;
|
||||||
//uint32_t powerground1_CCR, powerground2_CCR, battery_cooling_CCR;
|
//uint32_t powerground1_CCR, powerground2_CCR, battery_cooling_CCR;
|
||||||
@ -14,28 +16,48 @@ void PWM_control_init(TIM_HandleTypeDef* pg, TIM_HandleTypeDef* bat_cool){
|
|||||||
powerground_status = 0;
|
powerground_status = 0;
|
||||||
battery_cooling_status = 0;
|
battery_cooling_status = 0;
|
||||||
|
|
||||||
|
powerground = pg;
|
||||||
|
battery_cooling = bat_cool;
|
||||||
|
|
||||||
HAL_TIM_PWM_Start(pg, TIM_CHANNEL_1); //TIM15CH1
|
HAL_TIM_PWM_Start(pg, TIM_CHANNEL_1); //TIM15CH1
|
||||||
HAL_TIM_PWM_Start(pg, TIM_CHANNEL_2); //TIM15CH2
|
HAL_TIM_PWM_Start(pg, TIM_CHANNEL_2); //TIM15CH2
|
||||||
HAL_TIM_PWM_Start(bat_cool, TIM_CHANNEL_3); //TIM1CH3
|
HAL_TIM_PWM_Start(bat_cool, TIM_CHANNEL_3); //TIM1CH3
|
||||||
|
|
||||||
powerground = pg;
|
__HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_1, 0);
|
||||||
battery_cooling = bat_cool;
|
__HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_2, 0);
|
||||||
__HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_1, 2000);
|
|
||||||
__HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_2, 2000);
|
//PWM_powerground_control(0);
|
||||||
//__HAL_TIM_SET_COMPARE(battery_cooling, TIM_CHANNEL_3, 2000);
|
//__HAL_TIM_SET_COMPARE(battery_cooling, TIM_CHANNEL_3, 2000);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
controls the duty cycle of the fans by setting the CCR of the channel percent/100 = x/ARR
|
controls the duty cycle of the fans by setting the CCR of the channel percent/100 = x/ARR
|
||||||
|
DUTYCYCLE = 40000 * X/100
|
||||||
*/
|
*/
|
||||||
void PWM_powerground_control(uint8_t percent){
|
void PWM_powerground_control(uint8_t percent){
|
||||||
if (percent > 100) //something went wrong
|
if (percent > 100) //something went wrong
|
||||||
return;
|
return;
|
||||||
powerground_status = percent;
|
powerground_status = percent;
|
||||||
|
|
||||||
int ccr = 2000 + ((2000) * (percent/100.0));
|
int ccr = 2000 + ((2000) * (percent/100.0));
|
||||||
__HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_1, ccr);
|
__HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_1, ccr);
|
||||||
__HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_2, 2000 + ((2000) * (percent/100.0)));
|
__HAL_TIM_SET_COMPARE(powerground, TIM_CHANNEL_2, ccr);
|
||||||
//TIM15->CCR1 = (TIM15->ARR*POWERGROUND_MAX_DUTY_CYCLE-TIM15->ARR*POWERGROUND_MIN_DUTY_CYCLE) * (percent/100.0) + TIM15->ARR*POWERGROUND_MIN_DUTY_CYCLE;
|
//TIM15->CCR1 = (TIM15->ARR*POWERGROUND_MAX_DUTY_CYCLE-TIM15->ARR*POWERGROUND_MIN_DUTY_CYCLE) * (percent/100.0) + TIM15->ARR*POWERGROUND_MIN_DUTY_CYCLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
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);
|
||||||
|
timestamp = HAL_GetTick() + 1000;
|
||||||
|
while (timestamp > HAL_GetTick()) {}
|
||||||
|
}
|
||||||
|
|
||||||
void PWM_battery_cooling_control(uint8_t percent){}
|
void PWM_battery_cooling_control(uint8_t percent){}
|
@ -74,8 +74,10 @@ State sm_update_precharge(){
|
|||||||
case STATE_INACTIVE: // if CAN Signal 0000 0000 then immidiete shutdown
|
case STATE_INACTIVE: // if CAN Signal 0000 0000 then immidiete shutdown
|
||||||
return STATE_DISCHARGE;
|
return STATE_DISCHARGE;
|
||||||
case STATE_PRECHARGE:
|
case STATE_PRECHARGE:
|
||||||
if (RELAY_BAT_SIDE_VOLTAGE-RELAY_ESC_SIDE_VOLTAGE < 100)
|
if (RELAY_BAT_SIDE_VOLTAGE-RELAY_ESC_SIDE_VOLTAGE < 100){
|
||||||
|
PWM_set_throttle();
|
||||||
return STATE_READY;
|
return STATE_READY;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case STATE_DISCHARGE:
|
case STATE_DISCHARGE:
|
||||||
return STATE_DISCHARGE;
|
return STATE_DISCHARGE;
|
||||||
@ -228,21 +230,18 @@ void sm_handle_ams_in(const uint8_t *data){
|
|||||||
switch (data[0]) {
|
switch (data[0]) {
|
||||||
case 0x00:
|
case 0x00:
|
||||||
if (state.current_state != STATE_INACTIVE){
|
if (state.current_state != STATE_INACTIVE){
|
||||||
PWM_powerground_control(0);
|
|
||||||
state.target_state = STATE_DISCHARGE;
|
state.target_state = STATE_DISCHARGE;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 0x01:
|
case 0x01:
|
||||||
if (state.target_state == STATE_INACTIVE || state.target_state == STATE_DISCHARGE){
|
if (state.target_state == STATE_INACTIVE || state.target_state == STATE_DISCHARGE){
|
||||||
PWM_powerground_control(0);
|
|
||||||
state.target_state = STATE_PRECHARGE;
|
state.target_state = STATE_PRECHARGE;
|
||||||
} else if (state.target_state == STATE_ACTIVE){
|
} else if (state.target_state == STATE_ACTIVE){
|
||||||
PWM_powerground_control(0);
|
|
||||||
state.target_state = STATE_READY;
|
state.target_state = STATE_READY;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 0x02:
|
case 0x02:
|
||||||
if (state.current_state == STATE_READY){
|
if (state.current_state == STATE_READY || state.current_state == STATE_ACTIVE){
|
||||||
PWM_powerground_control(data[1]);
|
PWM_powerground_control(data[1]);
|
||||||
state.target_state = STATE_ACTIVE; // READY -> ACTIVE
|
state.target_state = STATE_ACTIVE; // READY -> ACTIVE
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user