update

APP/board.h

@@ -15,11 +15,8 @@
 #define HIGH_LEVEL_PWM_FREQ 25000
 #define LOW_LEVEL_PWM_FREQ 10000
 
-<<<<<<< HEAD
-=======
 // #define HIGH_LEVEL_PWM_FREQ 99000
 // #define LOW_LEVEL_PWM_FREQ 50000
->>>>>>> e75f4081e77430b7532f0a57d60b2af5c070cb2c
 
 #define MIN_PWM_FREQ 5000
 #define PWM_CHANGE_INTERVAL_TIME_MS 1000

APP/main.c

@@ -77,13 +77,6 @@ void update_ozone_work_level(bool interval_work, work_level_t level) {
     lightmode = krgb_close;
   } else if (level == kwork_level_low) {
     pwm_freqhz = LOW_LEVEL_PWM_FREQ;
-<<<<<<< HEAD
-    duty = get_duty_by_freq_and_valid_time(pwm_freqhz, 8);
-    lightmode = krgb_color_blue;
-  } else if (level == kwork_level_hight) {
-    pwm_freqhz = HIGH_LEVEL_PWM_FREQ;
-    duty = get_duty_by_freq_and_valid_time(pwm_freqhz, 8);
-=======
     //  duty = 50;
     duty = get_duty_by_freq_and_valid_time(pwm_freqhz, PWM_PULSE_WIDTH_US);
     lightmode = krgb_color_blue;
@@ -91,7 +84,6 @@ void update_ozone_work_level(bool interval_work, work_level_t level) {
     pwm_freqhz = HIGH_LEVEL_PWM_FREQ;
     // duty = 10;
     duty = get_duty_by_freq_and_valid_time(pwm_freqhz, PWM_PULSE_WIDTH_US);
->>>>>>> e75f4081e77430b7532f0a57d60b2af5c070cb2c
     lightmode = krgb_color_red;
   }
 

APP/ozone_pwm_control.c

@@ -77,15 +77,4 @@ void ozone_pwm_control_module_loop(void) {
       prv_pwm_stop();
     }
   }
-
-
-<<<<<<< HEAD
-
-
-
-
 }
-=======
-}
-
->>>>>>> e75f4081e77430b7532f0a57d60b2af5c070cb2c

APP/pwm.c

@@ -122,7 +122,6 @@ uint32_t s_now_frequencyhz;
 
 uint32_t s_target_duty;
 uint32_t s_now_duty;
-<<<<<<< HEAD
 
 void set_pwm_modbul_freq_duty(uint32_t frequencyhz, uint32_t duty) {
 
@@ -135,20 +134,6 @@ void set_pwm_modbul_freq_duty(uint32_t frequencyhz, uint32_t duty) {
   set_pwm_t16_pa4(frequencyhz, duty);
 }
 
-=======
-/**
- * @brief
- *
- * @param freq
- * @param us
- */
-void set_pwm_modbul_freq_duty(uint32_t frequencyhz, uint32_t duty) {
-  set_pwm_t16_pa4(frequencyhz, duty);
-  printf("%d,%d\r\n", frequencyhz, duty);
-}
-
-
->>>>>>> e75f4081e77430b7532f0a57d60b2af5c070cb2c
 // uint32_t get_next_value_on_step(uint32_t now, uint32_t target, uint32_t step) {
 
 // }
@@ -183,8 +168,4 @@ void set_pwm_modbul_freq_duty(uint32_t frequencyhz, uint32_t duty) {
 //# 操作系统
 //# 线程，进程，信号量
 //#
-<<<<<<< HEAD
-//#
-=======
 //#
->>>>>>> e75f4081e77430b7532f0a57d60b2af5c070cb2c

project_ozone/project_o.uvopt

@@ -135,7 +135,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>CMSIS_AGDI</Key>
-          <Name>-X"essemi CMSIS-DAP" -U0001A000000A -O207 -S0 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0ES8P5066 -FS00 -FL010000</Name>
+          <Name>-X"essemi CMSIS-DAP" -U0001A000000A -O207 -S0 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0ES8P5066 -FS00 -FL010000</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>