Browse Source

update

master
zhaohe 3 years ago
parent
commit
ef1f732b88
  1. 2
      APP/adc.c
  2. 2
      APP/board.h
  3. 2
      APP/light.c
  4. 6
      APP/main.c
  5. 1450
      project_ozone/Listings/project_o.map
  6. 46
      project_ozone/project_o.uvgui.zel
  7. 2
      project_ozone/project_o.uvproj

2
APP/adc.c

@ -1,5 +1,5 @@
#include "adc.h" #include "adc.h"
static float prv_adc_get_value();
// uint16_t meanvalue; // uint16_t meanvalue;
static void prv_adc_pa2_init() { static void prv_adc_pa2_init() {
ADC_InitStruType x; ADC_InitStruType x;

2
APP/board.h

@ -9,4 +9,4 @@
// //
#define INTERVAL_WORK_PERIOD_MS (60 * 1000) #define INTERVAL_WORK_PERIOD_MS (60 * 1000)
// //
#define INTERVAL_WORK_DUTY (50)
#define INTERVAL_WORK_DUTY ((uint8_t)50)

2
APP/light.c

@ -146,7 +146,7 @@ void light_module_set_error_light_mode(bool open, uint8_t error_mode) {
void light_module_close_all_light(void) { 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(RGB_CLOSE); light_module_set_rgb_mode(RGB_CLOSE);
light_module_set_timing_light_mode(CLOSE_ALL_LED);
light_module_set_autoshutdown_indicator_light(false);
light_module_set_rgb_flicker_mode(false); light_module_set_rgb_flicker_mode(false);
s_errornum = 0; s_errornum = 0;
s_flicker = false; s_flicker = false;

6
APP/main.c

@ -84,7 +84,7 @@ void update_ozone_work_level(bool interval_work, WORK_LEVEL_T level) {
} }
if (interval_work) { if (interval_work) {
ozone_pwm_control_module_set_pwm_output_2(1, 0, INTERVAL_WORK_DUTY, INTERVAL_WORK_PERIOD_MS);
ozone_pwm_control_module_set_pwm_output_2(1, 0, INTERVAL_WORK_PERIOD_MS,INTERVAL_WORK_DUTY);
} else { } else {
set_pwm_modbul_freq_duty(1, duty); set_pwm_modbul_freq_duty(1, duty);
} }
@ -286,10 +286,6 @@ int main(void) {
// //
} }
/*********************************************************************************************************************** /***********************************************************************************************************************
* =======================================================================================================
***********************************************************************************************************************/
updae_timing_light_state();
/***********************************************************************************************************************
* ======================================================================================================= * =======================================================================================================
***********************************************************************************************************************/ ***********************************************************************************************************************/
{ {

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

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

2
project_ozone/project_o.uvproj

@ -375,7 +375,7 @@
<v6WtE>0</v6WtE> <v6WtE>0</v6WtE>
<v6Rtti>0</v6Rtti> <v6Rtti>0</v6Rtti>
<VariousControls> <VariousControls>
<MiscControls></MiscControls>
<MiscControls>--diag_suppress=381 --diag_suppress=1 --diag_suppress=177 --diag_suppress=111 --diag_suppress=1295</MiscControls>
<Define></Define> <Define></Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>..\APP;..\CMSIS;..\Library\Include;..\PlatForm</IncludePath> <IncludePath>..\APP;..\CMSIS;..\Library\Include;..\PlatForm</IncludePath>

Loading…
Cancel
Save