tianjialong
/
ozone_cp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

直接设置频率占空比为目标值

master
Yuenold 3 years ago
parent
7e3428afe9
commit
e75f4081e7
6 changed files with 590 additions and 703 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      APP/light.c
  2. 21
      APP/main.c
  3. 4
      APP/ozone_pwm_control.c
  4. 63
      APP/pwm.c
  5. 1115
      project_ozone/Listings/project_o.map
  6. 82
      project_ozone/project_o.uvgui.admin

8
APP/light.c
View File

@ -131,23 +131,23 @@ static void prv_time_light_control_schedule() {
***********************************************************************************************************************/
void light_module_set_rgb_mode(rgb_light_mode_t mode) {
// printf("light_module_set_rgb_mode %d\n", mode);
printf("light_module_set_rgb_mode %d\n", mode);
s_rgb_light_mode_config = mode;
prv_light_module_set_rgb_mode(mode);
}
void light_module_set_rgb_in_interval_working_mode(bool state) {
// printf("light_module_set_rgb_in_interval_working_mode %d\n", state);
printf("light_module_set_rgb_in_interval_working_mode %d\n", state);
s_interval_working_mode = state;
}
void light_module_set_autoshutdown_indicator_light(bool open) { s_autoshutdown_light_state = open; }
void light_module_set_error_light_mode(bool open, uint8_t error_mode) {
// printf("light_module_set_error_light_mode %d\n", error_mode);
printf("light_module_set_error_light_mode %d\n", error_mode);
s_errorlight_display_state = open;
s_errornum = error_mode;
}
void light_module_close_all_light(void) {
// printf("light_module_close_all_light\n");
printf("light_module_close_all_light\n");
light_module_set_rgb_mode(krgb_close);
light_module_set_autoshutdown_indicator_light(false);
light_module_set_rgb_in_interval_working_mode(false);

21
APP/main.c
View File

@ -66,7 +66,7 @@ int get_duty_by_freq_and_valid_time(uint32_t freq, uint32_t us) {
* @param gears
*/
void update_ozone_work_level(bool interval_work, work_level_t level) {
// printf("update_ozone_work_level(interval_work:%d,level:%d)\n", interval_work, level);
printf("update_ozone_work_level(interval_work:%d,level:%d)\n", interval_work, level);
rgb_light_mode_t lightmode;
int duty = 0;
uint32_t pwm_freqhz = 0;
@ -173,7 +173,7 @@ void onkey(zkey_t *key, zkey_state_t key_state) {
if (!g_power_flag) {
if (key == &s_keys[3] && key->cur_state == zks_falling_edge) {
key->hasProcessed = true;
// printf("key zks_rising_edge\r\n");
printf("key zks_rising_edge\r\n");
/**
* @brief 开机
* 1.设置标志位
@ -192,7 +192,7 @@ void onkey(zkey_t *key, zkey_state_t key_state) {
if (g_error_num != 0) { //设备存在异常
if (key == &s_keys[3] && key->cur_state == zks_falling_edge) {
key->hasProcessed = true;
// printf("process key[2] event\r\n");
printf("process key[2] event\r\n");
/**
* @brief 关机
*/
@ -206,7 +206,7 @@ void onkey(zkey_t *key, zkey_state_t key_state) {
*********************************************************************************************************************/
if (key == &s_keys[0] && key->cur_state == zks_falling_edge) //小于3s
{
// printf("process key[0] event\r\n");
printf("process key[0] event\r\n");
if (g_setting_interval_work_flag == true) { // g_setting_interval_work_flag=true现在是间歇工作
g_setting_interval_work_flag = false; // 取消间歇工作
@ -230,7 +230,7 @@ void onkey(zkey_t *key, zkey_state_t key_state) {
/**
* @brief 处理等级按键
*/
// printf("process key[1] event\r\n");
printf("process key[1] event\r\n");
if (g_setting_level == kwork_level_hight) {
g_setting_level = kwork_level_low;
update_ozone_work_level(g_setting_interval_work_flag, kwork_level_low);
@ -243,7 +243,7 @@ void onkey(zkey_t *key, zkey_state_t key_state) {
* ==================================================间歇按键事件=================================================== *
*********************************************************************************************************************/
else if (key == &s_keys[2] && key->cur_state == zks_falling_edge) {
// printf("process key[2] event\r\n");
printf("process key[2] event\r\n");
/**
* @brief 处理间歇按键事件
*/
@ -254,7 +254,7 @@ void onkey(zkey_t *key, zkey_state_t key_state) {
g_setting_interval_work_flag = !g_setting_interval_work_flag;
update_ozone_work_level(g_setting_interval_work_flag, g_setting_level);
} else if (key == &s_keys[3] && key->cur_state == zks_falling_edge) {
// printf("process key[2] event\r\n");
printf("process key[2] event\r\n");
/**
* @brief 关机
*/
@ -301,7 +301,7 @@ int main(void) {
starting_up();
//启动结束
// printf("Initialization completed\r\n");
printf("Initialization completed\r\n");
while (true) {
/*******************************************************************************************************************
@ -331,11 +331,6 @@ int main(void) {
* ==================================================风扇的调度=================================================== *
*******************************************************************************************************************/
fan_module_schedule();
/*******************************************************************************************************************
* ==================================================PWM均匀增加================================================== *
*******************************************************************************************************************/
DO_IT_EACH_MS(PWM_CHANGE_PERIOD) { set_pwm_modbul_freq_duty(target_frequencyhz, target_duty); }
END();
/***********************************************************************************************************************
* ===================================================自动关机逻辑==================================================== *
***********************************************************************************************************************/

4
APP/ozone_pwm_control.c
View File

@ -66,12 +66,12 @@ void ozone_pwm_control_module_loop(void) {
}
if (port_haspassedms(begin_ticket) % s_large_period <= s_large_period * s_large_duty / 100) {
if (!prv_pwm_is_enable()) {
// printf("set work\r\n");
printf("set work\r\n");
prv_pwm_module_set_pwm_duty(hardware_frequency, hardware_duty);
}
} else {
if (prv_pwm_is_enable()) {
// printf("set rest\r\n");
printf("set rest\r\n");
hardware_frequency = s_hardware_frequency; //将关闭之前的频率进行保存
hardware_duty = s_hardware_duty; //将关闭之前的占空比进行保存
prv_pwm_stop();

63
APP/pwm.c
View File

@ -122,75 +122,18 @@ uint32_t s_now_frequencyhz;
uint32_t s_target_duty;
uint32_t s_now_duty;
/**
* @brief
*
* @param freq
* @param us
*/
// static uint32_t get_duty_by_freq_and_valid_time(uint32_t freq, uint32_t us) {
// uint32_t period = 1000000 / freq;
// uint32_t duty = us * 100 / period;
// return duty;
// }
// static uint32_t get_pwm_pulse_width_us_by_duty(uint32_t freq, uint32_t duty) {
// uint32_t period = 1000000 / freq;
// uint32_t pwm_pulse_width_us = period * duty / 100;
// return pwm_pulse_width_us;
// }
double get_duty(double now_duty, double target_duty, double increment_count) {
if (now_duty > target_duty) {
now_duty -= (now_duty - target_duty) / increment_count; //(now_duty-target_duty)/increment_count每次的增量
} else if (now_duty < target_duty) {
now_duty += (target_duty - now_duty) / increment_count;
}
return now_duty;
}
void set_pwm_modbul_freq_duty(uint32_t frequencyhz, uint32_t duty) {
static uint32_t now_frequencyhz;
static double now_duty;
static uint32_t pwm_pulse_width_us;
uint32_t increment_conut; //从现在的频率到目标频率每次增加PWM_CHANGE_STEP_FREQ，还需要增加多少次
target_frequencyhz = frequencyhz;
target_duty = duty;
if (now_frequencyhz == target_frequencyhz) {
if (now_duty != target_duty) {
now_duty = target_duty;
set_pwm_t16_pa4(now_frequencyhz, now_duty);
}
if ((uint32_t)now_duty == target_duty) {
return;
}
}
// pwm_pulse_width_us = get_pwm_pulse_width_us_by_duty(target_frequencyhz, target_duty);
if (now_frequencyhz < target_frequencyhz) {
increment_conut = (target_frequencyhz - now_frequencyhz) / PWM_CHANGE_STEP_FREQ;
now_frequencyhz = now_frequencyhz + PWM_CHANGE_STEP_FREQ;
if (now_frequencyhz >= target_frequencyhz) {
now_frequencyhz = target_frequencyhz;
}
// increment_conut = (target_frequencyhz - now_frequencyhz) / PWM_CHANGE_STEP_FREQ;
// now_duty = get_duty_by_freq_and_valid_time(now_frequencyhz, pwm_pulse_width_us);
now_duty = get_duty(now_duty, target_duty, increment_conut);
set_pwm_t16_pa4(now_frequencyhz, now_duty);
printf("%d,%lf\r\n", now_frequencyhz, now_duty);
} else if (now_frequencyhz > target_frequencyhz) {
increment_conut = (now_frequencyhz - target_frequencyhz) / PWM_CHANGE_STEP_FREQ;
now_frequencyhz = now_frequencyhz - PWM_CHANGE_STEP_FREQ;
if (now_frequencyhz <= target_frequencyhz) {
now_frequencyhz = target_frequencyhz;
}
// now_duty = get_duty_by_freq_and_valid_time(now_frequencyhz, pwm_pulse_width_us);
// increment_conut = (now_frequencyhz - target_frequencyhz) / PWM_CHANGE_STEP_FREQ;
now_duty = get_duty(now_duty, target_duty, increment_conut);
set_pwm_t16_pa4(now_frequencyhz, now_duty);
printf("%d,%lf\r\n", now_frequencyhz, now_duty);
}
set_pwm_t16_pa4(frequencyhz, duty);
printf("%d,%d\r\n", frequencyhz, duty);
}
// uint32_t get_next_value_on_step(uint32_t now, uint32_t target, uint32_t step) {
// }

1115
project_ozone/Listings/project_o.map
File diff suppressed because it is too large
View File

82
project_ozone/project_o.uvgui.admin
File diff suppressed because it is too large
View File

Write Preview
Loading…
Cancel
Save