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

修复菜单和返回压力阈值反的问题

Browse Source
This commit is contained in:
sunbeam 2024-09-20 14:44:27 +08:00
parent 477ce4889e
commit ba6a10cabf
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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,0x14}; 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','4'}; const UI_8 NVM_DID_CD_SUPPLIER_ID[DLC_SYSTEM_SUPPLIER_ID] = {'2','4','0','9','1','8'};
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/FunctionState/FunctionState.c
View File

@ -22,7 +22,7 @@ void FunctionState_Task(void)
{ {
ADC1_Initialize(); ADC1_Initialize();
ADC1_Enable(); ADC1_Enable();
ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND); //ADC1_ChannelSelect(ADC_POSINPUT_AIN7, ADC_NEGINPUT_GND);
ADC1_ConversionStart(); ADC1_ConversionStart();
return; return;
} }

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

@ -1234,7 +1234,7 @@ void RTE_Set_All_UB(void)
} }
const uint16_t max_on_time_arr[16] = { const uint16_t max_on_time_arr[16] = {
// 0 1 2 3 4 5 6 7 // 0 1 2 3 4 5 6 7
10,10,10,10,10,50,50,50, 20,20,20,20,20,50,50,50,
50,50,50,50,50,50,50,50, 50,50,50,50,50,50,50,50,
}; };

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

@ -127,7 +127,7 @@ static uint16 Button0_GetVoice1_Trig_Threshold(void)
static uint16 Button3_GetVol1_Trig_Threshold(void) static uint16 Button3_GetVol1_Trig_Threshold(void)
{ {
uint16 temp = Calib_GetData(1U); uint16 temp = Calib_GetData(2U);
uint16 rtn = 0; uint16 rtn = 0;
if (temp == 0) if (temp == 0)
{ {
@ -135,7 +135,7 @@ static uint16 Button3_GetVol1_Trig_Threshold(void)
} }
else else
{ {
rtn = Calib_GetData(1U); rtn = Calib_GetData(2U);
} }
return rtn; return rtn;
@ -145,7 +145,7 @@ static uint16 Button3_GetVol1_Trig_Threshold(void)
static uint16 Button5_GetMenu1_Trig_Threshold(void) static uint16 Button5_GetMenu1_Trig_Threshold(void)
{ {
uint16 temp = Calib_GetData(2U); uint16 temp = Calib_GetData(1U);
uint16 rtn = 0; uint16 rtn = 0;
if (temp == 0) if (temp == 0)
{ {
@ -153,7 +153,7 @@ static uint16 Button5_GetMenu1_Trig_Threshold(void)
} }
else else
{ {
rtn = Calib_GetData(2U); rtn = Calib_GetData(1U);
} }
return rtn; return rtn;

6
firmware/src/main.c
View File

@ -106,11 +106,7 @@ void ADC1_ConversionCallback(ADC_STATUS status, uintptr_t context)
default: default:
break; break;
} }
// adc_ch_sel++;
// if (adc_ch_sel > ADC1_CH_MAX) {
// adc_ch_sel = ADC1_CH_AD_LDO_SNS + 1;
// }
ADC1_ConversionStart();
} }
} }