From 3da7f33f2adb6a6c7d7ea5dcb8ef843895a4cc38 Mon Sep 17 00:00:00 2001
From: jxh <jxh@lovelyqi.cn>
Date: Fri, 21 Mar 2025 01:25:07 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E5=AE=9E=E7=8E=B0=E6=8C=89=E9=94=AE?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/main.c             | 41 +++++++++++++++++++++++------------------
 wireless_charge.uvopt  | 12 ++++++++++++
 wireless_charge.uvproj |  5 +++++
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index 21d1c3d..566853e 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -11,8 +11,8 @@
 // Lib
 #include "delay.h"
 #include "ina226.h"
-// #include "keyscan.h"
-#include "dht10.h"
+#include "keyscan.h"
+// #include "dht10.h"
 #include "oled12864_drv.h"
 
 void packDataAndSent (uint16_t vol, uint16_t cur, uint16_t pwr, uint16_t tmp,
@@ -48,8 +48,8 @@ main ()
   IIC_Init ();
   OLED_Init ();
   INA226_Init (0.005f, 2.0f);
-  DHT10_Init ();
-  // Key_Init ();
+  // DHT10_Init ();
+  Key_Init ();
 
   DelayMs (100); // 初始化延时
 
@@ -59,13 +59,13 @@ main ()
   OLED_ShowPrintf (0, 2, "V", OLED_FONT_SIXTEEN, OLED_LEFT_ROLL, OLED_SHOW);
   OLED_ShowPrintf (64, 2, "A", OLED_FONT_SIXTEEN, OLED_LEFT_ROLL, OLED_SHOW);
   OLED_ShowPrintf (0, 4, "P", OLED_FONT_SIXTEEN, OLED_LEFT_ROLL, OLED_SHOW);
-  OLED_ShowPrintf (64, 4, "T", OLED_FONT_EIGHT, OLED_LEFT_ROLL, OLED_SHOW);
-  OLED_ShowPrintf (64, 5, "H", OLED_FONT_EIGHT, OLED_LEFT_ROLL, OLED_SHOW);
+  // OLED_ShowPrintf (64, 4, "T", OLED_FONT_EIGHT, OLED_LEFT_ROLL, OLED_SHOW);
+  // OLED_ShowPrintf (64, 5, "H", OLED_FONT_EIGHT, OLED_LEFT_ROLL, OLED_SHOW);
   OLED_ShowPrintf (32, 3, ".", OLED_FONT_EIGHT, OLED_LEFT_ROLL, OLED_CLS);
   OLED_ShowPrintf (96, 3, ".", OLED_FONT_EIGHT, OLED_LEFT_ROLL, OLED_CLS);
   OLED_ShowPrintf (32, 5, ".", OLED_FONT_EIGHT, OLED_LEFT_ROLL, OLED_CLS);
-  OLED_ShowPrintf (96, 4, ".", OLED_FONT_EIGHT, OLED_LEFT_ROLL, OLED_CLS);
-  OLED_ShowPrintf (96, 5, ".", OLED_FONT_EIGHT, OLED_LEFT_ROLL, OLED_CLS);
+  // OLED_ShowPrintf (96, 4, ".", OLED_FONT_EIGHT, OLED_LEFT_ROLL, OLED_CLS);
+  // OLED_ShowPrintf (96, 5, ".", OLED_FONT_EIGHT, OLED_LEFT_ROLL, OLED_CLS);
 
   P2M1 &= 0xFE; // P20为推挽输出
   P2M0 |= 0x01;
@@ -91,15 +91,17 @@ main ()
       OLED_ShowNum (40, 4, ina226_power, 2, OLED_FONT_SIXTEEN, OLED_LEFT_ROLL,
                     OLED_CLS);
 
-      DHT10_ReadData ();
-      OLED_ShowNum (80, 4, DHT10_GetTemperature () / 100, 2, OLED_FONT_EIGHT,
-                    OLED_LEFT_ROLL, OLED_CLS);
-      OLED_ShowNum (104, 4, DHT10_GetTemperature (), 2, OLED_FONT_EIGHT,
-                    OLED_LEFT_ROLL, OLED_CLS);
-      OLED_ShowNum (80, 5, DHT10_GetHumidity () / 100, 2, OLED_FONT_EIGHT,
-                    OLED_LEFT_ROLL, OLED_CLS);
-      OLED_ShowNum (104, 5, DHT10_GetHumidity (), 2, OLED_FONT_EIGHT,
-                    OLED_LEFT_ROLL, OLED_CLS);
+      // 取消温湿度功能
+      // DHT10_ReadData ();
+      // OLED_ShowNum (80, 4, DHT10_GetTemperature () / 100, 2,
+      // OLED_FONT_EIGHT,
+      //               OLED_LEFT_ROLL, OLED_CLS);
+      // OLED_ShowNum (104, 4, DHT10_GetTemperature (), 2, OLED_FONT_EIGHT,
+      //               OLED_LEFT_ROLL, OLED_CLS);
+      // OLED_ShowNum (80, 5, DHT10_GetHumidity () / 100, 2, OLED_FONT_EIGHT,
+      //               OLED_LEFT_ROLL, OLED_CLS);
+      // OLED_ShowNum (104, 5, DHT10_GetHumidity (), 2, OLED_FONT_EIGHT,
+      //               OLED_LEFT_ROLL, OLED_CLS);
 
       // DelayMs (100); // 初始化延时
       // last_round_time = this_round_time;
@@ -112,9 +114,12 @@ main ()
                        ina226_power,   // 功率
                        0x0CA2,         // 温度
                        0x0BF6          // 湿度
+
       );
 
-      // Key_Scan ();
+      Key_Scan ();
+      OLED_ShowNum (0, 6, Get_KeyEvents (), 3, OLED_FONT_SIXTEEN,
+                    OLED_LEFT_ROLL, OLED_SHOW);
     }
 }
 
diff --git a/wireless_charge.uvopt b/wireless_charge.uvopt
index fa0ee4b..995e835 100644
--- a/wireless_charge.uvopt
+++ b/wireless_charge.uvopt
@@ -328,6 +328,18 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\Lib\KeyScan.c</PathWithFileName>
+      <FilenameWithoutPath>KeyScan.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
 </ProjectOpt>
diff --git a/wireless_charge.uvproj b/wireless_charge.uvproj
index 17a755c..8b75aad 100644
--- a/wireless_charge.uvproj
+++ b/wireless_charge.uvproj
@@ -446,6 +446,11 @@
               <FileType>1</FileType>
               <FilePath>.\Lib\dht10.c</FilePath>
             </File>
+            <File>
+              <FileName>KeyScan.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\Lib\KeyScan.c</FilePath>
+            </File>
           </Files>
         </Group>
       </Groups>