From a656a8ce77617466bd0e310028b9bf31763e5cbd Mon Sep 17 00:00:00 2001
From: zhangjinshuo <jinshuo.zhang@hljtyw.com>
Date: Wed, 4 Dec 2024 16:43:36 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=E4=BF=AE=E6=94=B9=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E7=89=88=E6=9C=AC=E5=8F=B7=E4=B8=BA1.00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Firmware/Source/Application/BlueTooth.c     | 6 +++---
 Firmware/Source/Application/BlueTooth.h     | 2 --
 Firmware/Source/UDS/UDS_ISO14229_Services.h | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Firmware/Source/Application/BlueTooth.c b/Firmware/Source/Application/BlueTooth.c
index cd747a4..483bc86 100644
--- a/Firmware/Source/Application/BlueTooth.c
+++ b/Firmware/Source/Application/BlueTooth.c
@@ -246,10 +246,10 @@ void TextService(void)
         MCUVersionASCLLList[12] = DATA_Version[6];
         MCUVersionASCLLList[14] = DATA_Version[7];
         MCUVersionASCLLList[16] = 0x2E;
-        MCUVersionASCLLList[18] = SW_Version[0];
+        MCUVersionASCLLList[18] = (uint8_t)((SWV >> 8u) & 0x0Fu) + 0x30u;
         MCUVersionASCLLList[20] = 0x2E;
-        MCUVersionASCLLList[22] = SW_Version[1];
-        MCUVersionASCLLList[24] = SW_Version[2];
+        MCUVersionASCLLList[22] = (uint8_t)((SWV >> 4u) & 0x0Fu) + 0x30u;
+        MCUVersionASCLLList[24] = (uint8_t)(SWV & 0x0Fu) + 0x30u;
 
 
         memset(InformationOSVersion, 0, sizeof(InformationOSVersion));
diff --git a/Firmware/Source/Application/BlueTooth.h b/Firmware/Source/Application/BlueTooth.h
index bd64122..55b5af2 100644
--- a/Firmware/Source/Application/BlueTooth.h
+++ b/Firmware/Source/Application/BlueTooth.h
@@ -25,12 +25,10 @@ typedef struct __attribute__((aligned(4)))
 }TEXT_STRUCT;
 
 #define INFORMATION_VERSION_DATE   "20241129"
-#define SW_EXTERNAL_VERSION        "100"
 #define POWER_STATE_IGN_OFF 0u
 #define POWER_STATE_IGN_ON 1u
 
 static const uint8_t DATA_Version[8] =  {INFORMATION_VERSION_DATE};
-static const uint8_t SW_Version[3] =  {SW_EXTERNAL_VERSION};
 
 
 /*QRCode X Y height Width*/
diff --git a/Firmware/Source/UDS/UDS_ISO14229_Services.h b/Firmware/Source/UDS/UDS_ISO14229_Services.h
index b010998..cf4e2d9 100644
--- a/Firmware/Source/UDS/UDS_ISO14229_Services.h
+++ b/Firmware/Source/UDS/UDS_ISO14229_Services.h
@@ -29,7 +29,7 @@
 /******************************************************************************
     program version
 *******************************************************************************/
-#define SWV 0x110 // 0x100 = 1.00 software version 软件版本号
+#define SWV 0x100 // 0x100 = 1.00 software version 软件版本号
 #define HWV 0x120 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x105 // 0x100 = 1.00 bootloader version boot程序版本号
 
-- 
2.23.0