huahua/P417_SWTR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复上电触摸振2次

Browse Source
This commit is contained in:
sunbeam 2024-10-19 09:06:14 +08:00
parent ba6a10cabf
commit 4629ca26ae
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/p417_SWTR.X/nbproject/private/private.xml
View File

@ -3,9 +3,9 @@
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group> <group>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.c</file>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/TouchPanel/TouchPanel.c</file>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/main.c</file> <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/main.c</file>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/TouchPanel/TouchPanel.c</file>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.c</file>
</group> </group>
</open-files> </open-files>
</project-private> </project-private>

4
firmware/src/DiagnosticR/UDS/UDS_DIDNvm.c
View File

@ -78,8 +78,8 @@ typedef struct{
* Private variables * Private variables
*/ */
const UI_8 NVM_DID_CD_VIN[DLC_DID_CD_VIN] = GAC_VIN_DEFAULT_VALUE; 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_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','0','9','1','8'}; 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_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}; 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]; static uint8 RAM_DID_CD_VIN[DLC_DID_CD_VIN];

4
firmware/src/TouchPanel/TouchPanel.c
View File

@ -589,8 +589,8 @@ static PanelPress_LevelType TouchPanel_PressCheck(void)
// static uint16 ForceMcount = 0; // static uint16 ForceMcount = 0;
// static uint16 ForceLcount = 0; // static uint16 ForceLcount = 0;
static uint16 tempForcePress = 0; static uint16 tempForcePress = 0xffff;
static uint16 tempForceRelease = 0; static uint16 tempForceRelease = 0xffff;
uint16 RawData = 0; uint16 RawData = 0;
uint16 temp_RawData = 0; uint16 temp_RawData = 0;

30
firmware/src/config/mcal/touch/touch.h
View File

@ -192,91 +192,91 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
#define KEY_0_PARAMS \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #define KEY_14_PARAMS \
{ \ { \
58u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \ 55u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \
} }