修复评审问题

firmware/p417_SWTL.X/mcc-manifest-autosave.yml

@@ -2,7 +2,7 @@
 
 manifest_file_version: 1.0.0
 project: p417_SWTL
-creation_date: 2024-08-19T22:45:13.653+08:00[Asia/Shanghai]
+creation_date: 2024-12-02T14:09:42.018+08:00[Asia/Shanghai]
 operating_system: Windows 10
 mcc_mode: IDE
 mcc_mode_version: v6.20
@@ -19,5 +19,5 @@ device_library: {library_class: com.microchip.mcc.harmony.Harmony3Library, name:
 packs: {name: SAME51_DFP, version: 3.8.253}
 modules:
 - {name: csp, type: HARMONY, version: v3.18.5}
-- {name: CMSIS_5, type: HARMONY, version: 5.8.0}
+- {name: CMSIS_5, type: HARMONY, version: 5.9.0}
 - {name: touch, type: HARMONY, version: v3.16.0}

firmware/p417_SWTL.X/mcc-manifest-generated-success.yml

@@ -2,7 +2,7 @@
 
 manifest_file_version: 1.0.0
 project: p417_SWTL
-creation_date: 2024-08-19T22:45:13.243+08:00[Asia/Shanghai]
+creation_date: 2024-12-02T14:05:58.700+08:00[Asia/Shanghai]
 operating_system: Windows 10
 mcc_mode: IDE
 mcc_mode_version: v6.20
@@ -19,5 +19,5 @@ device_library: {library_class: com.microchip.mcc.harmony.Harmony3Library, name:
 packs: {name: SAME51_DFP, version: 3.8.253}
 modules:
 - {name: csp, type: HARMONY, version: v3.18.5}
-- {name: CMSIS_5, type: HARMONY, version: 5.8.0}
+- {name: CMSIS_5, type: HARMONY, version: 5.9.0}
 - {name: touch, type: HARMONY, version: v3.16.0}

firmware/p417_SWTL.X/nbproject/Makefile-genesis.properties

@@ -1,10 +1,10 @@
 #
-#Fri Nov 01 13:47:44 CST 2024
+#Mon Dec 02 16:32:28 CST 2024
 mcal.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=1eaf555a844840d91945cb14109201c3
 conf.ids=mcal
 mcal.languagetoolchain.version=4.10
 host.id=124p-5vo2-40
-configurations-xml=82d12c4bf5f229226e945ddd8fae0eb3
+configurations-xml=640df2878c10379dda3b63efc3e1be79
 mcal.Pack.dfplocation=E\:\\Program Files\\Microchip\\MPLABX\\v6.20\\packs\\Microchip\\SAME51_DFP\\3.7.242
 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=f612087c95360c842296d189edfe3321
 proj.dir=F\:\\FCB_project\\P417\\CODE\\20240727HW06\\P417_SWTL\\firmware\\p417_SWTL.X

firmware/p417_SWTL.X/nbproject/Makefile-local-mcal.mk

@@ -34,5 +34,5 @@ MP_CPPC_DIR="E:\Program Files\Microchip\xc32\v4.10\bin"
 MP_AS_DIR="E:\Program Files\Microchip\xc32\v4.10\bin"
 MP_LD_DIR="E:\Program Files\Microchip\xc32\v4.10\bin"
 MP_AR_DIR="E:\Program Files\Microchip\xc32\v4.10\bin"
-CMSIS_DIR=E:/Program Files/Microchip/MPLABX/v6.20/packs/arm/CMSIS/5.4.0
 DFP_DIR=E:/Program Files/Microchip/MPLABX/v6.20/packs/Microchip/SAME51_DFP/3.7.242
+CMSIS_DIR=C:/Users/dm01/.mchp_packs/ARM/CMSIS/5.8.0

firmware/p417_SWTL.X/nbproject/configurations.xml

@@ -497,8 +497,8 @@
         <platform>3</platform>
       </toolsSet>
       <packs>
-        <pack name="CMSIS" vendor="ARM" version="5.4.0"/>
         <pack name="SAME51_DFP" vendor="Microchip" version="3.7.242"/>
+        <pack name="CMSIS" vendor="ARM" version="5.8.0"/>
       </packs>
       <ScriptingSettings>
       </ScriptingSettings>
@@ -558,6 +558,7 @@
       <C32>
         <property key="additional-warnings" value="false"/>
         <property key="addresss-attribute-use" value="false"/>
+        <property key="appendMe" value=""/>
         <property key="enable-app-io" value="false"/>
         <property key="enable-omit-frame-pointer" value="false"/>
         <property key="enable-symbols" value="true"/>
@@ -614,6 +615,7 @@
         <property key="additional-options-use-response-files" value="false"/>
         <property key="additional-options-write-sla" value="false"/>
         <property key="allocate-dinit" value="false"/>
+        <property key="appendMe" value=""/>
         <property key="code-dinit" value="false"/>
         <property key="ebase-addr" value=""/>
         <property key="enable-check-sections" value="false"/>
@@ -653,6 +655,7 @@
       <C32CPP>
         <property key="additional-warnings" value="false"/>
         <property key="addresss-attribute-use" value="false"/>
+        <property key="appendMe" value=""/>
         <property key="check-new" value="false"/>
         <property key="eh-specs" value="true"/>
         <property key="enable-app-io" value="false"/>
@@ -681,6 +684,7 @@
         <property key="use-indirect-calls" value="false"/>
       </C32CPP>
       <C32Global>
+        <property key="appendMe" value=""/>
         <property key="common-include-directories" value=""/>
         <property key="gp-relative-option" value=""/>
         <property key="legacy-libc" value="false"/>

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

@@ -2,11 +2,6 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <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>
+        <group/>
-            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/TouchPanel/TouchPanel.c</file>
-            <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/main.c</file>
-            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/FunctionState/FunctionState.c</file>
-        </group>
     </open-files>
 </project-private>

firmware/p417_SWTL.X/p417_SWTL.mc3

@@ -13327,7 +13327,7 @@
       </entry>
       <entry>
          <file>..\src\config\mcal\definitions.h</file>
-         <hash>9cbd3ca5ec4eb095b69f02d011146c57a203803096f631317e6ab43683793547</hash>
+         <hash>fbb6e3f66cce3d8e6c0ba0d7fdf03eec2bf658c523e64e50d327cb9dea68f5ae</hash>
       </entry>
       <entry>
          <file>..\src\config\mcal\device.h</file>
@@ -13347,7 +13347,7 @@
       </entry>
       <entry>
          <file>..\src\config\mcal\initialization.c</file>
-         <hash>634e2706c2ea11a8cf28f1c9edc5fe305ba038d5a2a10d330b8715ec068bc864</hash>
+         <hash>907ef22262941833932f90f3a4187fedb8c194d5d9507f3c1b4f8f805c1fcbbc</hash>
       </entry>
       <entry>
          <file>..\src\config\mcal\interrupts.c</file>
@@ -14043,7 +14043,7 @@
       </entry>
       <entry>
          <file>..\src\packs\CMSIS\CMSIS\Core\Include\cmsis_version.h</file>
-         <hash>2de01ae2556a38eb82c389de23c701805ec63308cfbcf3f84cb12141589b0858</hash>
+         <hash>8cda7ac3ff6f0eb5e83c4fe613dd195151b24da54167f5c3c007e599a03f1edc</hash>
       </entry>
       <entry>
          <file>..\src\packs\CMSIS\CMSIS\Core\Include\core_cm4.h</file>

firmware/src/DiagnosticL/Sys_Diag_Detect/SysDiagDetect.c

@@ -94,9 +94,10 @@ static void Touch_Sensor_Diag_Task(void)
         if (fault_countk1 > 40)
         {
             fault_countk1 = 40;
-        }
             Touch_Sensor_Fault_key1 = Touch_Out_Range;
         }
+        
+    }
     //巡航
     if (Touch_Sensor_delta01 < 200 && Touch_Sensor_delta14 < 200)
     {
@@ -109,9 +110,10 @@ static void Touch_Sensor_Diag_Task(void)
         if (fault_countk2 > 40)
         {
             fault_countk2 = 40;
-        }
             Touch_Sensor_Fault_key2 = Touch_Out_Range;
         }
+        
+    }
     //取消
     if (Touch_Sensor_delta02 < 200 && Touch_Sensor_delta15 < 200)
     {
@@ -124,9 +126,10 @@ static void Touch_Sensor_Diag_Task(void)
         if (fault_countk3 > 40)
         {
             fault_countk3 = 40;
-        }
             Touch_Sensor_Fault_key3 = Touch_Out_Range;
         }
+        
+    }
     //PAD
     if (Touch_Sensor_delta03 < 300 && Touch_Sensor_delta04 < 300 && Touch_Sensor_delta05 < 300 && Touch_Sensor_delta06 < 300 && Touch_Sensor_delta07 < 300 
     && Touch_Sensor_delta08 < 300 && Touch_Sensor_delta09 < 300 && Touch_Sensor_delta10 < 300 && Touch_Sensor_delta11 < 300 && Touch_Sensor_delta12 < 300)
@@ -140,10 +143,11 @@ static void Touch_Sensor_Diag_Task(void)
         if (fault_countpad > 40)
         {
             fault_countpad = 40;
-        }
             Touch_Sensor_Fault_pad = Touch_Out_Range;
         }
         
+    }
+    
 
     if (Touch_Sensor_Fault_key1 == Touch_NoFault && 
         Touch_Sensor_Fault_key2 == Touch_NoFault && 
@@ -168,23 +172,6 @@ static void Vibration_Diag_Task(void)
 
     Vibra_Fault = Get_Speaker_Fault();//
     InitMessage(SIG_DIAGCFAILRTOUCHPANSWTLVIBRATIONFLTSTS, &Vibra_Fault);
-    /*
-  if(LD_AD_Val>=0 && LD_AD_Val<=15)  //normal
-  {
-     Vibra_Fault = Vibration_Normal;
-     InitMessage(SIG_DIAGCFAILRTOUCHPANSWTLVIBRATIONFLTSTS, &Vibra_Fault);
-  }
-  else if((LD_AD_Val>=185 && LD_AD_Val<=448)||(LD_AD_Val>=742 && LD_AD_Val<=870)||(LD_AD_Val>=1177 && LD_AD_Val<=1305)||(LD_AD_Val>=1575 && LD_AD_Val<=1727))
-  {
-     Vibra_Fault = Vibration_Short;
-     InitMessage(SIG_DIAGCFAILRTOUCHPANSWTLVIBRATIONFLTSTS, &Vibra_Fault);
-  }
-  else if(LD_AD_Val>=1921 && LD_AD_Val<=2136)
-  {
-      Vibra_Fault = Vibration_open;
-      InitMessage(SIG_DIAGCFAILRTOUCHPANSWTLVIBRATIONFLTSTS, &Vibra_Fault);
-  }
-    */
 }
 
 void Sys_Diag_Detcet_Task(void)

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,0x10,0x19};
+const UI_8 NVM_Reprogramming_Date_App[DLC_DID_REPROGRAMMING_DATE] = {0x20,0x24,0x12,0x02};
-const UI_8 NVM_DID_CD_SUPPLIER_ID[DLC_SYSTEM_SUPPLIER_ID] = {'2','4','1','0','1','9'};
+const UI_8 NVM_DID_CD_SUPPLIER_ID[DLC_SYSTEM_SUPPLIER_ID] = {'2','4','1','2','0','2'};
 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/RTE/RTE.c

@@ -692,6 +692,7 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false   1 true
 
 
     Two_Finger_Y_count = GetActiveChNum(Two_Finger_Y_data,th_y,5U);
+    Y_count = GetContinuousChNum(Two_Finger_Y_data,th_y,5U);
     /*
     Two_Finger_Y_count = 0;
     for (i = 0; i < 5; i++)
@@ -701,9 +702,6 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false   1 true
             Two_Finger_Y_count++;
         }
     }
-    */
-    Y_count = GetContinuousChNum(Two_Finger_Y_data,th_y,5U);
-    /*
     i = 0;
     Y_count = 0;
     while (Two_Finger_Y_data[i] <= th_y[i++] && i < 5)
@@ -719,7 +717,7 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false   1 true
     */
 
     Two_Finger_X_count = GetActiveChNum(Two_Finger_X_data,th_x,5U);
-    X_count = GetActiveChNum(Two_Finger_X_data,th_x,5U);
+    X_count = GetContinuousChNum(Two_Finger_X_data,th_x,5U);
     /*
     Two_Finger_X_count = 0;
     for (m = 0; m < 5; m++)

firmware/src/TouchPanel/TouchPanel.c

@@ -527,7 +527,7 @@ PanelPress_LevelType TouchPanel_PressLevelRead(void)
 boolean TouchSurface_is_TouchActive(void)
 {
     boolean ret = FALSE;
-    if (TouchPanel_SurfaceStatus & TOUCH_ACTIVE  && CurrentPosition>0 && CurrentPosition<9)
+    if ((TouchPanel_SurfaceStatus & TOUCH_ACTIVE)  && (CurrentPosition>0 && CurrentPosition<9))
     {
         ret = TRUE;
     }
@@ -539,7 +539,7 @@ Buttons_SignalType TouchSurface_XY_StsRead(void)
 {
     Buttons_SignalType XY_Sts = BUTTON_RELEASE;
 
-    if (TouchPanel_SurfaceStatus & TOUCH_ACTIVE && CurrentPosition>0 && CurrentPosition<9)
+    if ((TouchPanel_SurfaceStatus & TOUCH_ACTIVE) && (CurrentPosition>0 && CurrentPosition<9))
     {
 
         switch (TouchPanel_PressLevel)