From 91f1853bf7fd7c24830bf1e08744079f666b7e3c Mon Sep 17 00:00:00 2001 From: sunbeam Date: Sat, 19 Oct 2024 09:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E7=94=B5=E8=A7=A6?= =?UTF-8?q?=E6=91=B8=E6=8C=AF2=E6=AC=A1=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8F=96=E6=B6=882=E6=97=A0=E5=A4=8D=E4=BD=8D=E7=AD=89?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- firmware/src/DiagnosticL/UDS/UDS_DIDNvm.c | 4 +-- firmware/src/RTE/RTE.c | 2 +- firmware/src/TouchPanel/TouchPanel.c | 4 +-- firmware/src/config/mcal/touch/touch.h | 32 +++++++++++------------ 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/firmware/src/DiagnosticL/UDS/UDS_DIDNvm.c b/firmware/src/DiagnosticL/UDS/UDS_DIDNvm.c index 478ba21..25ca469 100644 --- a/firmware/src/DiagnosticL/UDS/UDS_DIDNvm.c +++ b/firmware/src/DiagnosticL/UDS/UDS_DIDNvm.c @@ -78,8 +78,8 @@ typedef struct{ * Private variables */ const UI_8 NVM_DID_CD_VIN[DLC_DID_CD_VIN] = GAC_VIN_DEFAULT_VALUE; -const UI_8 NVM_Reprogramming_Date_App[DLC_DID_REPROGRAMMING_DATE] = {0x20,0x24,0x09,0x18}; -const UI_8 NVM_DID_CD_SUPPLIER_ID[DLC_SYSTEM_SUPPLIER_ID] = {'2','4','0','9','1','8'}; +const UI_8 NVM_Reprogramming_Date_App[DLC_DID_REPROGRAMMING_DATE] = {0x20,0x24,0x10,0x19}; +const UI_8 NVM_DID_CD_SUPPLIER_ID[DLC_SYSTEM_SUPPLIER_ID] = {'2','4','1','0','1','9'}; const UI_8 NVM_Repair_Shop_Code[DLC_REPAIR_SHOP_CODE] = GAC_ECU_REPAIR_SHOP_CODE; const UI_8 NVM_DID_CD_HW_VERSION[DLC_GAC_HW_VERSION] = {'H','W','0','6',0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20}; static uint8 RAM_DID_CD_VIN[DLC_DID_CD_VIN]; diff --git a/firmware/src/RTE/RTE.c b/firmware/src/RTE/RTE.c index 817001d..9b8876b 100644 --- a/firmware/src/RTE/RTE.c +++ b/firmware/src/RTE/RTE.c @@ -1382,7 +1382,7 @@ void RTE_Set_All_Test_Value(void) InitMessage(SIG_SWTLPRESSBASELINE, &Press_baseline); // Press_baseline InitMessage(SIG_SWTLPRESSSIGNAL, &Press_signal); // Press_signal-Convert to N: TouchPanel_PressNValue = ((float32)Press_signal / (float32)0xF2); - for (i = 0; i < 15; i++) + for (i = 0; i < 16; i++) { if (get_sensor_node_signal(i) > (get_sensor_node_reference(i) + qtlib_key_configs_set1[i].channel_threshold)) { diff --git a/firmware/src/TouchPanel/TouchPanel.c b/firmware/src/TouchPanel/TouchPanel.c index dd4e6a9..89f680c 100644 --- a/firmware/src/TouchPanel/TouchPanel.c +++ b/firmware/src/TouchPanel/TouchPanel.c @@ -567,8 +567,8 @@ static PanelPress_LevelType TouchPanel_PressCheck(void) // static uint16 ForceMcount = 0; // static uint16 ForceLcount = 0; - static uint16 tempForcePress = 0; - static uint16 tempForceRelease = 0; + static uint16 tempForcePress = 0xffff; + static uint16 tempForceRelease = 0xffff; uint16 RawData = 0; uint16 temp_RawData = 0; diff --git a/firmware/src/config/mcal/touch/touch.h b/firmware/src/config/mcal/touch/touch.h index f820b8c..481a92e 100644 --- a/firmware/src/config/mcal/touch/touch.h +++ b/firmware/src/config/mcal/touch/touch.h @@ -196,97 +196,97 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES #define KEY_0_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ + 59u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ } #define KEY_1_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ + 59u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ } #define KEY_2_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ + 52u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ } #define KEY_3_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 62u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_4_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 60u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_5_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 62u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_6_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 64u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_7_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 60u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_8_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 56u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_9_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 59u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_10_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 57u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_11_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 59u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_12_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 59u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_13_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ + 54u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ } #define KEY_14_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ + 58u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ } #define KEY_15_PARAMS \ { \ - 40u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ + 52u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ }