Merge branch 'development' into menutest

source/Application/RTE/Common_Interface.c

@@ -434,7 +434,7 @@ void Common_Input_Para(void)
         {
             TPMS_TEST_OFF_TIME++;
         }
-        else
+        else if (User_set_Num.User_TpmsStatus != 2u)
         {
             TPMS_TEST_OFF_TIME = 0;
         }
@@ -915,7 +915,7 @@ uint8_t Common_Get_TPMS_TEST_OFF_Time_Sta(void)
         ValueSta = 0u;
     }
 
-    return 0u;
+    return ValueSta;
 }
 
 void Common_Set_Menu_FacDea_Time_Sta(uint32_t Value)

source/Driver/Graphic/han00002ce20.h

@@ -4,7 +4,7 @@ static const HanSansCNFontPos_t Hansans00002ce20[] =
 {
     //{charid, xpos, ypos, width, height, xoffset, yoffset, xadvance}
     { 0    , 3995  , 552   , 4     , 22    , 0     , 0     , 4     },
-#if 1
+#if 0
     { 1    , 3995  , 23    , 4     , 22    , 0     , 0     , 4     },
     { 2    , 3995  , 805   , 4     , 22    , 0     , 0     , 4     },
     { 3    , 3995  , 759   , 4     , 22    , 0     , 0     , 4     },