增加QF发送0，resume错误时发0

firmware/p417_SWTL.X/nbproject/private/private.xml

@@ -3,6 +3,9 @@
     <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">
         <group>
+            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/RTE/RTE.c</file>
+            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/FunctionState/FunctionState.c</file>
+            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/main.c</file>
             <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/TouchPanel/TouchPanel.c</file>
         </group>
     </open-files>

firmware/src/DiagnosticL/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_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_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];

firmware/src/FunctionState/FunctionState.c

@@ -1,6 +1,7 @@
 #include   "FunctionState.h"
 #include   "plib_port.h"  
-#include "plib_adc1.h"       
+#include "plib_adc1.h"     
+#include "OsekCom.h"  
 
 extern uint16 adc[2] ;
 uint8 Fuction_State = 1 ;
@@ -23,10 +24,12 @@ void FunctionState_Task(void)
         {
             ADC1_Initialize();
             ADC1_Enable();
+            //ADC1_ChannelSelect(ADC_POSINPUT_AIN7, ADC_NEGINPUT_GND);
+            ADC1_ConversionStart();
             return;
         }
         
-        
+        //InitMessage(SIG_SWTLSENSOR1_BASELINE, &adc[0]);
         LD_AD_Val = adc[1];
         
         switch(Fuction_State)

firmware/src/RTE/RTE.c

@@ -685,8 +685,10 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false   1 true
         else
             X_count++;
     }
-    //    触发的通道数量      //连续触发的通道数量
+
-    if ((Two_Finger_Y_count > 4 && Two_Finger_X_data[0]>th_x[0]) || Y_count != Two_Finger_Y_count || Two_Finger_X_count > 4 || X_count != Two_Finger_X_count)
+    //    触发的通道数量                                            //连续触发的通道数量
+    if ((Two_Finger_Y_count > 4 && Two_Finger_X_data[0]>th_x[0]) || Y_count != Two_Finger_Y_count 
+        || Two_Finger_X_count > 4 || X_count != Two_Finger_X_count)
     {
         //满足防误触
         Allow_Touch_counter++;
@@ -698,7 +700,7 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false   1 true
     }
     else
     {
-        Allow_Touch_counter = 0;
+        Allow_Touch_counter = 0;//不满足，计数清零
     }
 
     
@@ -1126,6 +1128,11 @@ void RTE_Set_CAN_SteerWhlTouchBdCnclCntr(uint8_t Value)
 
 void RTE_Set_CAN_SteerWhlTouchBdCnclQf1(uint8_t Value)
 {
+    if (Touch_Sensor_Fault_key3 != Touch_NoFault)
+    {
+        Value = 0;
+    }
+    
     InitMessage(SIG_STEERWHLTOUCHBDCNCLQF1, &Value);
     Cancel_Qf1 = Value;
 }
@@ -1147,6 +1154,11 @@ void RTE_Set_CAN_SteerWhlTouchBdCnclSteerWhlTouchBdSts(uint8_t Value)
 
 void RTE_Set_CAN_SteerWhlTouchBdCrsResuQf1(uint8_t Value)
 {
+    if (Touch_Sensor_Fault_key1 != Touch_NoFault)
+    {
+        Value = 0;
+    }
+    
     InitMessage(SIG_STEERWHLTOUCHBDCRSRESUQF1, &Value);
 }
 
@@ -1160,7 +1172,7 @@ void RTE_Set_CAN_SteerWhlTouchBdCrsResuSteerWhlTouchBdSts(uint8_t Value)
     }
     if (Value != 0 && Touch_Sensor_Fault_key1 != Touch_NoFault)
     {
-        Value = 0x03;
+        Value = 0x00;
     }
     InitMessage(SIG_STEERWHLTOUCHBDCRSRESUSTEERWHLTOUCHBDSTS, &Value);
 }
@@ -1344,8 +1356,8 @@ 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,50,50,50,50,50,
+    20,20,20,50,50,50,50,50,
-    50,50,50,50,50,10,10,10,
+    50,50,50,50,50,20,20,20,
 };
 
 const uint16_t low_baseline_reset_arr[16] = {

firmware/src/TouchPanel/TouchPanel.c

@@ -471,7 +471,7 @@ void TouchPanel_init(void)
     }
     else
     {
-        UDS_DAC_Timer_Period = 110;
+        UDS_DAC_Timer_Period = 100;
     }
     TC2_REGS->COUNT16.TC_CC[0U] = UDS_DAC_Timer_Period;
     AlideAverage_Filter(0, 0);

firmware/src/main.c

@@ -101,16 +101,11 @@ void ADC1_ConversionCallback(ADC_STATUS status, uintptr_t context)
             case ADC1_CH_LD_OUT_SNS:
                 ADC1_ChannelSelect(ADC_POSINPUT_AIN7, ADC_NEGINPUT_GND);
                 adc_ch_sel= ADC1_CH_AD_LDO_SNS;
-                //ADC1_Disable();
+                ADC1_Disable();
-                ADC1_ConversionStart();
                 break;
             default:
                 break;
         }        
-        //adc_ch_sel++;
-        //if (adc_ch_sel > ADC1_CH_MAX) {
-        //    adc_ch_sel = ADC1_CH_AD_LDO_SNS + 1;
-        //}
         
     }
 }