From a341ac0bfd3012e4fe1bd5eefe1ca79825031813 Mon Sep 17 00:00:00 2001
From: zhaohe <1013909206@qq.com>
Date: Mon, 15 Aug 2022 23:44:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E9=83=A8=E5=88=86=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project_ozone/project_o.uvgui.zel |  4 ++--
 project_ozone/project_o.uvopt     | 24 ++++++++++++------------
 project_ozone/project_o.uvproj    | 10 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/project_ozone/project_o.uvgui.zel b/project_ozone/project_o.uvgui.zel
index aedbc09..fac11de 100644
--- a/project_ozone/project_o.uvgui.zel
+++ b/project_ozone/project_o.uvgui.zel
@@ -6,7 +6,7 @@
   <Header>### uVision Project, (C) Keil Software</Header>
 
   <PrjGuiSettings>
-    <LastAddFilePath>F:\workspace\project_ozone_generator\ozone_generator_es8p5066\APP</LastAddFilePath>
+    <LastAddFilePath>F:\workspace\project_ozone_generator\ozone_generator_es8p5066\APP\service</LastAddFilePath>
   </PrjGuiSettings>
 
   <ViewPool/>
@@ -1822,7 +1822,7 @@
         <Name>Build</Name>
         <Buttons>
           <Len>976</Len>
-          <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
+          <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
         </Buttons>
         <OriginalItems>
           <Len>583</Len>
diff --git a/project_ozone/project_o.uvopt b/project_ozone/project_o.uvopt
index 146e692..d880732 100644
--- a/project_ozone/project_o.uvopt
+++ b/project_ozone/project_o.uvopt
@@ -265,8 +265,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\APP\service\light_control_service.c</PathWithFileName>
-      <FilenameWithoutPath>light_control_service.c</FilenameWithoutPath>
+      <PathWithFileName>..\APP\service\ozone_control_service.c</PathWithFileName>
+      <FilenameWithoutPath>ozone_control_service.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -277,8 +277,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\APP\service\ozone_control_service.c</PathWithFileName>
-      <FilenameWithoutPath>ozone_control_service.c</FilenameWithoutPath>
+      <PathWithFileName>..\dep\zsimple_timer\zsimple_timer.c</PathWithFileName>
+      <FilenameWithoutPath>zsimple_timer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -289,8 +289,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\dep\zsimple_timer\zsimple_timer.c</PathWithFileName>
-      <FilenameWithoutPath>zsimple_timer.c</FilenameWithoutPath>
+      <PathWithFileName>..\APP\service\thisdevice.c</PathWithFileName>
+      <FilenameWithoutPath>thisdevice.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -301,8 +301,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\APP\service\thisdevice.c</PathWithFileName>
-      <FilenameWithoutPath>thisdevice.c</FilenameWithoutPath>
+      <PathWithFileName>..\APP\service\frequency_sweep_service.c</PathWithFileName>
+      <FilenameWithoutPath>frequency_sweep_service.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -313,8 +313,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\APP\service\frequency_sweep_service.c</PathWithFileName>
-      <FilenameWithoutPath>frequency_sweep_service.c</FilenameWithoutPath>
+      <PathWithFileName>..\APP\state_machine.c</PathWithFileName>
+      <FilenameWithoutPath>state_machine.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -325,8 +325,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\APP\state_machine.c</PathWithFileName>
-      <FilenameWithoutPath>state_machine.c</FilenameWithoutPath>
+      <PathWithFileName>..\APP\service\human_computer_interaction_service.c</PathWithFileName>
+      <FilenameWithoutPath>human_computer_interaction_service.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/project_ozone/project_o.uvproj b/project_ozone/project_o.uvproj
index c27456b..29aef12 100644
--- a/project_ozone/project_o.uvproj
+++ b/project_ozone/project_o.uvproj
@@ -438,11 +438,6 @@
               <FilePath>..\APP\test.c</FilePath>
             </File>
             <File>
-              <FileName>light_control_service.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\APP\service\light_control_service.c</FilePath>
-            </File>
-            <File>
               <FileName>ozone_control_service.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\APP\service\ozone_control_service.c</FilePath>
@@ -467,6 +462,11 @@
               <FileType>1</FileType>
               <FilePath>..\APP\state_machine.c</FilePath>
             </File>
+            <File>
+              <FileName>human_computer_interaction_service.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\APP\service\human_computer_interaction_service.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>