From f3579acb3b5d0415e2c63f007a465e9a48eb0d88 Mon Sep 17 00:00:00 2001
From: tianjialong <tianjialong@163.com>
Date: Mon, 20 Mar 2023 11:21:51 +0800
Subject: [PATCH] update

---
 MDK-ARM/LWIP.uvguix.29643 | 14 +++++++-------
 usersrc/usermain.c        |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/MDK-ARM/LWIP.uvguix.29643 b/MDK-ARM/LWIP.uvguix.29643
index d75301e..62c547a 100644
--- a/MDK-ARM/LWIP.uvguix.29643
+++ b/MDK-ARM/LWIP.uvguix.29643
@@ -93,25 +93,25 @@
       <flags>0</flags>
       <showCmd>1</showCmd>
       <MinPosition>
-        <xPos>-1</xPos>
-        <yPos>-1</yPos>
+        <xPos>-32000</xPos>
+        <yPos>-32000</yPos>
       </MinPosition>
       <MaxPosition>
         <xPos>-1</xPos>
         <yPos>-1</yPos>
       </MaxPosition>
       <NormalPosition>
-        <Top>87</Top>
-        <Left>2031</Left>
-        <Right>3729</Right>
-        <Bottom>980</Bottom>
+        <Top>99</Top>
+        <Left>2023</Left>
+        <Right>3721</Right>
+        <Bottom>992</Bottom>
       </NormalPosition>
     </WindowPosition>
     <MDIClientArea>
       <RegID>0</RegID>
       <MDITabState>
         <Len>866</Len>
-        <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000006000000030000000100000056433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C757365726D61696E2E63000000000A757365726D61696E2E6300000000C5D4F200FFFFFFFF61433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C4D444B2D41524D5C737461727475705F73746D33326634303778782E730000000015737461727475705F73746D33326634303778782E7300000000FFDC7800FFFFFFFF4E433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C5372635C6D61696E2E6300000000066D61696E2E6300000000BECEA100FFFFFFFF55433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C656E636F6465722E630000000009656E636F6465722E6300000000F0A0A100FFFFFFFF56433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C70726F746F636F6C2E68000000000A70726F746F636F6C2E6800000000BCA8E100FFFFFFFF57433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C756470636C69656E742E63000000000B756470636C69656E742E63000000009CC1B600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000EB080000C5000000890E000090020000</Data>
+        <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000006000000030000000100000056433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C757365726D61696E2E63000000000A757365726D61696E2E6300000000C5D4F200FFFFFFFF61433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C4D444B2D41524D5C737461727475705F73746D33326634303778782E730000000015737461727475705F73746D33326634303778782E7300000000FFDC7800FFFFFFFF4E433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C5372635C6D61696E2E6300000000066D61696E2E6300000000BECEA100FFFFFFFF55433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C656E636F6465722E630000000009656E636F6465722E6300000000F0A0A100FFFFFFFF56433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C70726F746F636F6C2E68000000000A70726F746F636F6C2E6800000000BCA8E100FFFFFFFF57433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C756470636C69656E742E63000000000B756470636C69656E742E63000000009CC1B600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000E3080000D1000000810E00009C020000</Data>
       </MDITabState>
     </MDIClientArea>
     <ViewEx>
diff --git a/usersrc/usermain.c b/usersrc/usermain.c
index d74969f..33f200f 100644
--- a/usersrc/usermain.c
+++ b/usersrc/usermain.c
@@ -55,11 +55,12 @@ static void onkey(zkey_t *key, zkey_state_t key_state)
   {
     if (strcmp(key->name, CHEAR_ENCODER_1_KEY_NAME) == 0)
     {
-      encoder_switch_clear_counter(CAMERA_ENCODER);
+      /* 原理图中的KEY1对应软件中的按键DRIVEN_ENCODER_GEAR */
+      encoder_switch_clear_counter(DRIVEN_ENCODER_GEAR);
     }
     else if (strcmp(key->name, CHEAR_ENCODER_2_KEY_NAME) == 0)
     {
-      encoder_switch_clear_counter(DRIVEN_ENCODER_GEAR);
+      encoder_switch_clear_counter(CAMERA_ENCODER);
     }
   }