From ba6a10cabf6945e84f2e45e715d3f640f6e05405 Mon Sep 17 00:00:00 2001
From: sunbeam <fcb1995@163.com>
Date: Fri, 20 Sep 2024 14:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8E=8B=E5=8A=9B=E9=98=88=E5=80=BC=E5=8F=8D?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firmware/src/DiagnosticR/UDS/UDS_DIDNvm.c  | 4 ++--
 firmware/src/FunctionState/FunctionState.c | 2 +-
 firmware/src/RTE/RTE.c                     | 2 +-
 firmware/src/TouchPanel/TouchPanel.c       | 8 ++++----
 firmware/src/main.c                        | 6 +-----
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/firmware/src/DiagnosticR/UDS/UDS_DIDNvm.c b/firmware/src/DiagnosticR/UDS/UDS_DIDNvm.c
index cf923b5..1f216de 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,0x14};
-const UI_8 NVM_DID_CD_SUPPLIER_ID[DLC_SYSTEM_SUPPLIER_ID] = {'2','4','0','9','1','4'};
+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_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/FunctionState/FunctionState.c b/firmware/src/FunctionState/FunctionState.c
index 2742ff1..e991df8 100644
--- a/firmware/src/FunctionState/FunctionState.c
+++ b/firmware/src/FunctionState/FunctionState.c
@@ -22,7 +22,7 @@ void FunctionState_Task(void)
         {
             ADC1_Initialize();
             ADC1_Enable();
-            ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
+            //ADC1_ChannelSelect(ADC_POSINPUT_AIN7, ADC_NEGINPUT_GND);
             ADC1_ConversionStart();
             return;
         }
diff --git a/firmware/src/RTE/RTE.c b/firmware/src/RTE/RTE.c
index 9050e9d..af08496 100644
--- a/firmware/src/RTE/RTE.c
+++ b/firmware/src/RTE/RTE.c
@@ -1234,7 +1234,7 @@ void RTE_Set_All_UB(void)
 }
 const uint16_t max_on_time_arr[16] = {
   // 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,
 };
 
diff --git a/firmware/src/TouchPanel/TouchPanel.c b/firmware/src/TouchPanel/TouchPanel.c
index 75659b0..30de5dc 100644
--- a/firmware/src/TouchPanel/TouchPanel.c
+++ b/firmware/src/TouchPanel/TouchPanel.c
@@ -127,7 +127,7 @@ static uint16 Button0_GetVoice1_Trig_Threshold(void)
 
 static uint16 Button3_GetVol1_Trig_Threshold(void)
 {
-    uint16 temp = Calib_GetData(1U);
+    uint16 temp = Calib_GetData(2U);
     uint16 rtn = 0;
     if (temp == 0)
     {
@@ -135,7 +135,7 @@ static uint16 Button3_GetVol1_Trig_Threshold(void)
     }
     else
     {
-        rtn = Calib_GetData(1U);
+        rtn = Calib_GetData(2U);
     }
 
     return rtn;
@@ -145,7 +145,7 @@ static uint16 Button3_GetVol1_Trig_Threshold(void)
 
 static uint16 Button5_GetMenu1_Trig_Threshold(void)
 {
-    uint16 temp = Calib_GetData(2U);
+    uint16 temp = Calib_GetData(1U);
     uint16 rtn = 0;
     if (temp == 0)
     {
@@ -153,7 +153,7 @@ static uint16 Button5_GetMenu1_Trig_Threshold(void)
     }
     else
     {
-        rtn = Calib_GetData(2U);
+        rtn = Calib_GetData(1U);
     }
 
     return rtn;
diff --git a/firmware/src/main.c b/firmware/src/main.c
index 1464dca..899195b 100644
--- a/firmware/src/main.c
+++ b/firmware/src/main.c
@@ -106,11 +106,7 @@ void ADC1_ConversionCallback(ADC_STATUS status, uintptr_t context)
         default:
             break;
         }
-        // adc_ch_sel++;
-        // if (adc_ch_sel > ADC1_CH_MAX) {
-        //     adc_ch_sel = ADC1_CH_AD_LDO_SNS + 1;
-        // }
-        ADC1_ConversionStart();
+
     }
 }