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

update

master
zhaohe 3 years ago
parent
edfd364f24
commit
690f2f57ff
9 changed files with 810 additions and 484 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. 9
      APP/main.c
  2. 48
      APP/port.c
  3. 4
      APP/port.h
  4. 2
      APP/pwm.c
  5. 1124
      project_ozone/Listings/project_o.map
  6. 62
      project_ozone/project_o.uvgui.zel
  7. 28
      project_ozone/project_o.uvopt
  8. 15
      project_ozone/project_o.uvproj
  9. 2
      zes8p5066lib

9
APP/main.c
View File

@ -244,8 +244,9 @@ int main(void) {
//
port_fan_set(true);
port_ozone_pwm_set_duty(1, 100 * 1000);
port_ozone_pwm_start();
// port_ozone_pwm_stop
while (true) {
//调试指示灯逻辑
systicket_do_debug_light_state();
@ -253,14 +254,14 @@ int main(void) {
DO_IT_EACH_MS(KEY_PERIOD) { zkey_do_loop_in_each_period(NULL); }
END();
test_all_light();
#if 1 //打印功率
DO_IT_EACH_MS(300) { //
// printf("v :fan:%f,ozone:%f\n", port_adc_get_fan_voltage(), port_adc_get_ozone_generator_voltage());
printf("power:fan:%f,ozone:%f\n", port_adc_get_fan_power(), port_adc_get_ozone_generator_power());
}
END();
test_all_light();
#endif
// port_adc_get_fan_voltage

48
APP/port.c
View File

@ -2,7 +2,11 @@
#include "../zes8p5066lib/adc.h"
#include "../zes8p5066lib/gpio.h"
#include "../zes8p5066lib/pwm.h"
#include "../zes8p5066lib/uart0.h"
#include "pwm.h"
zpwm_t g_ozonepwm;
void port_init() {
// LED-GPIO初始化
@ -30,7 +34,51 @@ void port_init() {
adc_pin_init(GPIO_Pin_A2);
adc_pin_init(GPIO_Pin_B8);
adc_module_init();
// PWM初始化
// t16_pa4_init();
// set_pwm_modbul_freq_duty2(1000,50);
{
g_ozonepwm.T16Nx = T16N0;
g_ozonepwm.T16Nx_PREMAT = 1;
//臭氧PWM控制引脚
g_ozonepwm.C1Enable = true;
g_ozonepwm.C1Pin = GPIO_Pin_A4;
g_ozonepwm.C1PinReuseFunc = GPIO_Reuse_Func2;
g_ozonepwm.C1PinIdleState = false;
g_ozonepwm.C1freq = 1;
g_ozonepwm.CH1_ODE = GPIO_ODE_Output_Disable;
g_ozonepwm.CH1_DS = GPIO_DS_Output_Normal;
g_ozonepwm.CH1_PUE = GPIO_PUE_Input_Disable;
g_ozonepwm.CH1_PDE = GPIO_PUE_Input_Disable;
// g_ozonepwm.C0Enable = ;
// g_ozonepwm.C0Pin =
// g_ozonepwm.C0PinReuseFunc =
// g_ozonepwm.C0PinIdleState =
// g_ozonepwm.C0freq =
zpwm_init(&g_ozonepwm);
zpwm_set_freq(&g_ozonepwm, 1, 1000);
zpwm_set_duty(&g_ozonepwm, 1, 50);
zpwm_start(&g_ozonepwm, 1);
}
while (true) {
}
}
void port_ozone_pwm_set_duty(float freq, uint32_t dutyns) {
zpwm_set_freq(&g_ozonepwm, 0, freq);
zpwm_set_duty_ns(&g_ozonepwm, 0, dutyns);
}
void port_ozone_pwm_start() { zpwm_start(&g_ozonepwm, 0); }
void port_ozone_pwm_stop() { zpwm_stop(&g_ozonepwm, 0); }
/***********************************************************************************************************************
* =======================================================GPIO======================================================== *
***********************************************************************************************************************/

4
APP/port.h
View File

@ -40,3 +40,7 @@ float port_adc_get_ozone_generator_power();
float port_adc_get_fan_voltage();
float port_adc_get_ozone_generator_voltage();
void port_ozone_pwm_set_duty(float freq, uint32_t dutyns);
void port_ozone_pwm_start();
void port_ozone_pwm_stop();

2
APP/pwm.c
View File

@ -1,4 +1,4 @@
#if 0
#if 1
#include "pwm.h"
#include "board.h"

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

62
project_ozone/project_o.uvgui.zel
File diff suppressed because it is too large
View File

28
project_ozone/project_o.uvopt
View File

@ -265,8 +265,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\APP\pwm.c</PathWithFileName>
<FilenameWithoutPath>pwm.c</FilenameWithoutPath>
<PathWithFileName>..\APP\ozone_pwm_control.c</PathWithFileName>
<FilenameWithoutPath>ozone_pwm_control.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@ -277,8 +277,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\APP\ozone_pwm_control.c</PathWithFileName>
<FilenameWithoutPath>ozone_pwm_control.c</FilenameWithoutPath>
<PathWithFileName>..\APP\test.c</PathWithFileName>
<FilenameWithoutPath>test.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@ -289,8 +289,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\APP\test.c</PathWithFileName>
<FilenameWithoutPath>test.c</FilenameWithoutPath>
<PathWithFileName>..\APP\pwm.c</PathWithFileName>
<FilenameWithoutPath>pwm.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@ -318,7 +318,7 @@
<Group>
<GroupName>Library</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@ -498,7 +498,7 @@
<Group>
<GroupName>zes8p5066lib</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@ -562,6 +562,18 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\zes8p5066lib\pwm.c</PathWithFileName>
<FilenameWithoutPath>pwm.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
</ProjectOpt>

15
project_ozone/project_o.uvproj
View File

@ -438,11 +438,6 @@
<FilePath>..\APP\light.c</FilePath>
</File>
<File>
<FileName>pwm.c</FileName>
<FileType>1</FileType>
<FilePath>..\APP\pwm.c</FilePath>
</File>
<File>
<FileName>ozone_pwm_control.c</FileName>
<FileType>1</FileType>
<FilePath>..\APP\ozone_pwm_control.c</FilePath>
@ -452,6 +447,11 @@
<FileType>1</FileType>
<FilePath>..\APP\test.c</FilePath>
</File>
<File>
<FileName>pwm.c</FileName>
<FileType>1</FileType>
<FilePath>..\APP\pwm.c</FilePath>
</File>
</Files>
</Group>
<Group>
@ -572,6 +572,11 @@
<FileType>1</FileType>
<FilePath>..\zes8p5066lib\key.c</FilePath>
</File>
<File>
<FileName>pwm.c</FileName>
<FileType>1</FileType>
<FilePath>..\zes8p5066lib\pwm.c</FilePath>
</File>
</Files>
</Group>
</Groups>

2
zes8p5066lib

@ -1 +1 @@
Subproject commit 8d19234e93169fc9bd3fe0b699f83da366770aab
Subproject commit ccb17d87425402bedcf96255c926d9cb38d9d3d1
Write Preview
Loading…
Cancel
Save