Merge branch 'yedea_jiancetai-16843' of...

Merge branch 'yedea_jiancetai-16843' of http://tyw-server.synology.me:12345/chenjiale/jiancetai into yedea_jiancetai-16843

.vscode/c_cpp_properties.json

+{
+  "configurations": [
+    {
+      "name": "windows-gcc-x64",
+      "includePath": [
+        "${workspaceFolder}/**"
+      ],
+      "compilerPath": "gcc",
+      "cStandard": "${default}",
+      "cppStandard": "${default}",
+      "intelliSenseMode": "windows-gcc-x64",
+      "compilerArgs": [
+        ""
+      ]
+    }
+  ],
+  "version": 4
+}
\ No newline at end of file

.vscode/launch.json

+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "C/C++ Runner: Debug Session",
+      "type": "cppdbg",
+      "request": "launch",
+      "args": [],
+      "stopAtEntry": false,
+      "externalConsole": true,
+      "cwd": "d:/工作/雅迪C031检测台/tdongli",
+      "program": "d:/工作/雅迪C031检测台/tdongli/build/Debug/outDebug",
+      "MIMode": "gdb",
+      "miDebuggerPath": "gdb",
+      "setupCommands": [
+        {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file

.vscode/settings.json

+{
+  "C_Cpp_Runner.cCompilerPath": "gcc",
+  "C_Cpp_Runner.cppCompilerPath": "g++",
+  "C_Cpp_Runner.debuggerPath": "gdb",
+  "C_Cpp_Runner.cStandard": "",
+  "C_Cpp_Runner.cppStandard": "",
+  "C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/VR_NR/Community/VC/Auxiliary/Build/vcvarsall.bat",
+  "C_Cpp_Runner.useMsvc": false,
+  "C_Cpp_Runner.warnings": [
+    "-Wall",
+    "-Wextra",
+    "-Wpedantic",
+    "-Wshadow",
+    "-Wformat=2",
+    "-Wcast-align",
+    "-Wconversion",
+    "-Wsign-conversion",
+    "-Wnull-dereference"
+  ],
+  "C_Cpp_Runner.msvcWarnings": [
+    "/W4",
+    "/permissive-",
+    "/w14242",
+    "/w14287",
+    "/w14296",
+    "/w14311",
+    "/w14826",
+    "/w44062",
+    "/w44242",
+    "/w14905",
+    "/w14906",
+    "/w14263",
+    "/w44265",
+    "/w14928"
+  ],
+  "C_Cpp_Runner.enableWarnings": true,
+  "C_Cpp_Runner.warningsAsError": false,
+  "C_Cpp_Runner.compilerArgs": [],
+  "C_Cpp_Runner.linkerArgs": [],
+  "C_Cpp_Runner.includePaths": [],
+  "C_Cpp_Runner.includeSearch": [
+    "*",
+    "**/*"
+  ],
+  "C_Cpp_Runner.excludeSearch": [
+    "**/build",
+    "**/build/**",
+    "**/.*",
+    "**/.*/**",
+    "**/.vscode",
+    "**/.vscode/**"
+  ],
+  "C_Cpp_Runner.useAddressSanitizer": false,
+  "C_Cpp_Runner.useUndefinedSanitizer": false,
+  "C_Cpp_Runner.useLeakSanitizer": false,
+  "C_Cpp_Runner.showCompilationTime": false,
+  "C_Cpp_Runner.useLinkTimeOptimization": false,
+  "C_Cpp_Runner.msvcSecureNoWarnings": false
+}
\ No newline at end of file

YueJin_test_bench/source/Appliciation/Display_Info.h

@@ -67,6 +67,7 @@ void Display_Init(void);
 
 extern void Send_ODO_Init(void);
 void Display_Send_ODO(uint8_t fuel);
+void Display_Send_Vspead(uint8_t menu);
 
 void Display_Set_Buff(void);
 extern void Send_Init(void);

YueJin_test_bench/source/Appliciation/Key.h

@@ -11,7 +11,7 @@ typedef enum
     KEY_8,
     KEY_9,
     KEY_10,
-
+    KEY_3,
     KEY_NUM_MAX,
 } Key_Num_en_t;
 

YueJin_test_bench/source/Appliciation/Key_user.c

@@ -111,17 +111,17 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
     }
 }
 void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
+{
+    ;
+}
+void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
 {
     if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
     {
-        if ( (LED_Waring == 1) || (UDS_Warning_Voltage ==1))
+        if(Get_Display_Type( ) == 2)
         {
-            ;
+            MENU_CHECK_STEP_SUB( ); 
         }
-        else
-        {
-            MENU_CHECK_STEP_SUB( );
-        }        
         
     }
     else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
@@ -129,14 +129,10 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
     }
     else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
     {
-        if ( LED_Waring == 1 || (UDS_Warning_Voltage ==1))
+        if(Get_Display_Type( ) == 2)
         {
-            ;
+            MENU_CHECK_STEP_SUB( ); 
         }
-        else
-        {
-            MENU_CHECK_STEP_SUB( );
-        }  
     }
     else
     {
@@ -147,14 +143,10 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
         /*清零ODO*/
     if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
     {
-        if ( LED_Waring == 1 || (UDS_Warning_Voltage ==1))
-        {
-            ;
-        }
-        else
+        if(Get_Display_Type( ) == 2)
         {
             MENU_CHECK_STEP_ADD( );
-        }  
+        }
         
     }
     else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
@@ -162,14 +154,10 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
     }
     else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
     {
-        if ( LED_Waring == 1 || (UDS_Warning_Voltage ==1))
-        {
-            ;
-        }
-        else
+        if(Get_Display_Type( ) == 2)
         {
             MENU_CHECK_STEP_ADD( );
-        }  
+        }
     }
     else
     {
@@ -251,6 +239,19 @@ Key_Real_Status_en_t Key_Real_sw1(void)
     return enKeyRealStatus;
 }
 
+Key_Real_Status_en_t Key_Real_sw3(void)
+{
+
+    Key_Real_Status_en_t enKeyRealStatus = KEY_LINE_LOOSEN;
+
+    if ( SW3 == 0U )
+    {
+        enKeyRealStatus = KEY_LINE_PRESS;
+    }
+    return enKeyRealStatus;
+}
+
+
 /*---------------------------------------------------------------------------------------*/
 const Key_Attribute_st_t stKeyAttribute [ KEY_NUM_MAX ] = {
     {KEY_TYPE_LINE, Key_Real_sw5, Key_Operation_SW5},    //SW5
@@ -260,4 +261,6 @@ const Key_Attribute_st_t stKeyAttribute [ KEY_NUM_MAX ] = {
     {KEY_TYPE_LINE, Key_Real_sw2, Key_Operation_SW2},      //SW2-
     {KEY_TYPE_LINE, Key_Real_sw1, Key_Operation_SW1},    //SW1+
 
+    {KEY_TYPE_LINE, Key_Real_sw3, Key_Operation_SW3},    //SW1+
+
 };

YueJin_test_bench/source/Appliciation/Task.c

@@ -227,7 +227,7 @@ void Sys_Exact_50us_Tasks(void)
 ------------------------------------------------------------------------------*/
 void Sys_Exact_100ms_Tasks(void)
 {
-    CHECK_IPK_COUNT( );
+    // CHECK_IPK_COUNT( );
 }
 /*============================================================================*/
 void Sys_Enter_Sleep_Mode(void)