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

修复上电触摸振2次，修复取消2无复位等功能

Browse Source
This commit is contained in:
sunbeam 2024-10-19 09:08:48 +08:00
parent 44633402a2
commit 91f1853bf7
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/src/DiagnosticL/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];

2
firmware/src/RTE/RTE.c
View File

@ -1382,7 +1382,7 @@ void RTE_Set_All_Test_Value(void)
InitMessage(SIG_SWTLPRESSBASELINE, &Press_baseline); // Press_baseline InitMessage(SIG_SWTLPRESSBASELINE, &Press_baseline); // Press_baseline
InitMessage(SIG_SWTLPRESSSIGNAL, &Press_signal); // Press_signal-Convert to N: TouchPanel_PressNValue = ((float32)Press_signal / (float32)0xF2); 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)) if (get_sensor_node_signal(i) > (get_sensor_node_reference(i) + qtlib_key_configs_set1[i].channel_threshold))
{ {

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

@ -567,8 +567,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;

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

@ -196,97 +196,97 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
#define KEY_0_PARAMS \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #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 \ #define KEY_15_PARAMS \
{ \ { \
40u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \ 52u, (uint8_t)RECAL_50, (uint8_t)NO_AKS_GROUP \
} }