From 4629ca26aec603b185d8e7a1359ebd8d8f3d6394 Mon Sep 17 00:00:00 2001 From: sunbeam Date: Sat, 19 Oct 2024 09:06:14 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../p417_SWTR.X/nbproject/private/private.xml | 4 +-- firmware/src/DiagnosticR/UDS/UDS_DIDNvm.c | 4 +-- firmware/src/TouchPanel/TouchPanel.c | 4 +-- firmware/src/config/mcal/touch/touch.h | 30 +++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/firmware/p417_SWTR.X/nbproject/private/private.xml b/firmware/p417_SWTR.X/nbproject/private/private.xml index b293abf..361468e 100644 --- a/firmware/p417_SWTR.X/nbproject/private/private.xml +++ b/firmware/p417_SWTR.X/nbproject/private/private.xml @@ -3,9 +3,9 @@ - file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.c - file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/TouchPanel/TouchPanel.c file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/main.c + file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/TouchPanel/TouchPanel.c + file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.c diff --git a/firmware/src/DiagnosticR/UDS/UDS_DIDNvm.c b/firmware/src/DiagnosticR/UDS/UDS_DIDNvm.c index 1f216de..32b9a3c 100644 --- a/firmware/src/DiagnosticR/UDS/UDS_DIDNvm.c +++ b/firmware/src/DiagnosticR/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/TouchPanel/TouchPanel.c b/firmware/src/TouchPanel/TouchPanel.c index 30de5dc..9c57c80 100644 --- a/firmware/src/TouchPanel/TouchPanel.c +++ b/firmware/src/TouchPanel/TouchPanel.c @@ -589,8 +589,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 ebaa3cd..f26927d 100644 --- a/firmware/src/config/mcal/touch/touch.h +++ b/firmware/src/config/mcal/touch/touch.h @@ -192,91 +192,91 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES #define KEY_0_PARAMS \ { \ - 70u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \ + 56u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \ } #define KEY_1_PARAMS \ { \ - 72u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \ + 54u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \ } #define KEY_2_PARAMS \ { \ - 70u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \ + 64u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \ } #define KEY_3_PARAMS \ { \ - 71u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \ + 51u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \ } #define KEY_4_PARAMS \ { \ - 71u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \ + 56u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \ } #define KEY_5_PARAMS \ { \ - 74u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 59u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_6_PARAMS \ { \ - 64u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 63u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_7_PARAMS \ { \ - 57u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 60u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_8_PARAMS \ { \ - 62u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 60u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_9_PARAMS \ { \ - 59u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 53u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_10_PARAMS \ { \ - 60u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 58u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_11_PARAMS \ { \ - 55u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 56u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_12_PARAMS \ { \ - 50u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 54u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_13_PARAMS \ { \ - 52u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 57u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ } #define KEY_14_PARAMS \ { \ - 58u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ + 55u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ }