Merge branch 'development' into withBoot

source/Application/APP/Data_TPMS/Service_TPMS.c

@@ -161,6 +161,7 @@ void Get_Data_TPMS_Value(TPMSNUM_t TPMSTyreID)
     if (CAN_MSG_Status(ID_CanMsg18011733_Msg_Count) == CAN_SIG_LOST)
     {
         TPMS_Out[TPMSTyreID].TPMSPressure = 0x00u;
+        TPMS_Out[TPMSTyreID].TPMSTempSign = 0u;
         TPMS_Out[TPMSTyreID].TPMSTemp = 0x00u;
     }
 }

source/Application/Alarm/Popup_Scheduler.c

@@ -34,13 +34,22 @@
  * Local variables
  */
 #pragma alignvar(8)
-static CommMemBuf_t CommBuf[MAX_MEM_NUM];
+static PopupList_Opt_t PopupListOpt = {0};
+#pragma alignvar(8)
+static CommMemBuf_t CommBuf [ MAX_MEM_NUM ];
+#pragma alignvar(8)
 static struct PopupList *FatalListHead = POPUPLIB_NULL;
+#pragma alignvar(8)
 static struct PopupList *HintListHead = POPUPLIB_NULL;
+#pragma alignvar(8)
 static struct PopupList *WarningListHead = POPUPLIB_NULL;
+#pragma alignvar(8)
 static struct PopupList *WarningListHead1 = POPUPLIB_NULL;
+#pragma alignvar(8)
 static struct PopupList *WarningListHead2 = POPUPLIB_NULL;
+#pragma alignvar(8)
 static struct PopupList *ExceptionListHead = POPUPLIB_NULL;
+#pragma alignvar(8)
 static PopupSchedulingStruct s_PopupScheduling;
 
 /**********************************************************************************************************
@@ -65,8 +74,6 @@ static uint16_t Popup_Get_Next_Masked_Warning ( uint16_t PopupID );
 static void Popup_IRQ_Enable(void);
 static void Popup_IRQ_Disable(void);
 
-static PopupList_Opt_t PopupListOpt;
-
 /**********************************************************************************************************
  * Global variables
  */
@@ -90,7 +97,7 @@ void Popup_Scheduler_Init ( void )
     PopupListOpt.pPopupAttributeTable = PopupAttributeTable;
     PopupListOpt.IRQ_Disable = Popup_IRQ_Disable;
     PopupListOpt.IRQ_Enable = Popup_IRQ_Enable;
-    PopupList_Init(&PopupListOpt);
+    ( void )PopupList_Init(&PopupListOpt);
     /*初始化参数值*/
     s_PopupScheduling.Timer        = 0u;
     s_PopupScheduling.NewPopupID   = POPUP_NONE;

source/Application/Graphic/GUI/GUI.h

@@ -16,7 +16,7 @@
 
 #define FState_COilTimeOutNum 60u /*3S*/
 
-#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10202)) /*硬件版本号   HV:01.02.02*/
+#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10300)) /*硬件版本号   HV:01.02.02*/
 #define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10107))   /*软件版本号   SV:01.01.05*/
 #define systemSupplierECUFlashInformationApp ((uint16_t)(14))         /*FLASH版本号 FV:00.14*/
 

source/Driver/GPIO/GPIO.c

@@ -264,8 +264,8 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
     0x00010000ul,  /*Pin_P42_6 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
     0x00010000ul,  /*Pin_P42_6 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
 
-    0x00010010ul,  /*Pin_P42_7 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
-    0x00010010ul,  /*Pin_P42_7 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
+    0x00010000ul,  /*Pin_P42_7 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
+    0x00010000ul,  /*Pin_P42_7 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
 
     0x00000042ul,  /*Pin_P42_8 TAUB0O15 SCHMITT1PDSC:L PU/PD:NULL P:L */
     0x00000042ul,  /*Pin_P42_8 TAUB0O15 SCHMITT1PDSC:L PU/PD:NULL P:L */

source/Driver/GPIO/GPIO.h

@@ -489,7 +489,7 @@
 #define Water_Temp_Led_R_MCU_OUT GPIO_OUT_PORT42_PIN04
 #define TRAILER_ABS_LED_MCU_OUT GPIO_OUT_PORT42_PIN05
 #define ACC5V_LED_PWM_MCU GPIO_OUT_PORT42_PIN06
-#define D8867_FAULT_IN GPIO_IN_PORT42_PIN07
+#define IGH_5VLED GPIO_OUT_PORT42_PIN07
 #define TEMP_R_LED_OUT GPIO_OUT_PORT42_PIN09
 #define TEMP_W_LED_OUT GPIO_OUT_PORT42_PIN10
 #define R6_LED_OUT GPIO_OUT_PORT42_PIN11

source/System/init.c

@@ -135,6 +135,7 @@ void Sys_Startup_Init(void)
     Sys_Tick_Timer_Start();
     /*COM_CAN_Init(); Ô­CAN³õʼ»¯Î»ÖÃ*/
 
+    IGH_5VLED = 1;
 
     RTE_ADC_Init();
 

utility/GPIO/GPIO.c

@@ -265,8 +265,8 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
     0x00010000ul,  /*Pin_P42_6 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
     0x00010000ul,  /*Pin_P42_6 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
 
-    0x00010010ul,  /*Pin_P42_7 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
-    0x00010010ul,  /*Pin_P42_7 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
+    0x00010000ul,  /*Pin_P42_7 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
+    0x00010000ul,  /*Pin_P42_7 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
 
     0x00000042ul,  /*Pin_P42_8 TAUB0O15 SCHMITT1PDSC:L PU/PD:NULL P:L */
     0x00000042ul,  /*Pin_P42_8 TAUB0O15 SCHMITT1PDSC:L PU/PD:NULL P:L */

utility/GPIO/GPIO.h

@@ -487,7 +487,7 @@
 #define Water_Temp_Led_R_MCU_OUT GPIO_OUT_PORT42_PIN04
 #define TRAILER_ABS_LED_MCU_OUT GPIO_OUT_PORT42_PIN05
 #define ACC5V_LED_PWM_MCU GPIO_OUT_PORT42_PIN06
-#define D8867_FAULT_IN GPIO_IN_PORT42_PIN07
+#define IGH_5VLED GPIO_OUT_PORT42_PIN07
 #define TEMP_R_LED_OUT GPIO_OUT_PORT42_PIN09
 #define TEMP_W_LED_OUT GPIO_OUT_PORT42_PIN10
 #define R6_LED_OUT GPIO_OUT_PORT42_PIN11

utility/GPIO/GPIO_RH850_D1M1A_CFG.json

@@ -5109,10 +5109,10 @@
         },
         {
           "pinID": "Pin_P42_7",
-          "pinName": "D8867_FAULT_IN",
+          "pinName": "IGH_5VLED",
           "pinAddress": " 3K",
           "wakeupPin": {
-            "pinModeName": "GPIO_IN",
+            "pinModeName": "GPIO_OUT",
             "circuitName": "SCHMITT1",
             "PINV": false,
             "PODC": false,
@@ -5127,13 +5127,13 @@
             "PPR": false,
             "PMC": false,
             "PIPC": false,
-            "PM": true,
+            "PM": false,
             "PFCAE": false,
             "PFCE": false,
             "PFC": false
           },
           "sleepPin": {
-            "pinModeName": "GPIO_IN",
+            "pinModeName": "GPIO_OUT",
             "circuitName": "SCHMITT1",
             "PINV": false,
             "PODC": false,
@@ -5148,7 +5148,7 @@
             "PPR": false,
             "PMC": false,
             "PIPC": false,
-            "PM": true,
+            "PM": false,
             "PFCAE": false,
             "PFCE": false,
             "PFC": false