Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiancetai
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈家乐
jiancetai
Commits
4c7ab4fb
Commit
4c7ab4fb
authored
Dec 16, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:贴图显示
parent
6823fab3
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
1248 additions
and
321 deletions
+1248
-321
c_cpp_properties.json
.vscode/c_cpp_properties.json
+18
-0
launch.json
.vscode/launch.json
+24
-0
settings.json
.vscode/settings.json
+59
-0
Check_Ctrl.c
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
+212
-243
Display_Info.c
YueJin_test_bench/source/Appliciation/Display_Info.c
+905
-52
Display_Info.h
YueJin_test_bench/source/Appliciation/Display_Info.h
+1
-0
Key.h
YueJin_test_bench/source/Appliciation/Key.h
+1
-1
Key_user.c
YueJin_test_bench/source/Appliciation/Key_user.c
+27
-24
Task.c
YueJin_test_bench/source/Appliciation/Task.c
+1
-1
No files found.
.vscode/c_cpp_properties.json
0 → 100644
View file @
4c7ab4fb
{
"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
0 → 100644
View file @
4c7ab4fb
{
"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
0 → 100644
View file @
4c7ab4fb
{
"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/Check_Ctrl.c
View file @
4c7ab4fb
This diff is collapsed.
Click to expand it.
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @
4c7ab4fb
This diff is collapsed.
Click to expand it.
YueJin_test_bench/source/Appliciation/Display_Info.h
View file @
4c7ab4fb
...
@@ -67,6 +67,7 @@ void Display_Init(void);
...
@@ -67,6 +67,7 @@ void Display_Init(void);
extern
void
Send_ODO_Init
(
void
);
extern
void
Send_ODO_Init
(
void
);
void
Display_Send_ODO
(
uint8_t
fuel
);
void
Display_Send_ODO
(
uint8_t
fuel
);
void
Display_Send_Vspead
(
uint8_t
menu
);
void
Display_Set_Buff
(
void
);
void
Display_Set_Buff
(
void
);
extern
void
Send_Init
(
void
);
extern
void
Send_Init
(
void
);
...
...
YueJin_test_bench/source/Appliciation/Key.h
View file @
4c7ab4fb
...
@@ -11,7 +11,7 @@ typedef enum
...
@@ -11,7 +11,7 @@ typedef enum
KEY_8
,
KEY_8
,
KEY_9
,
KEY_9
,
KEY_10
,
KEY_10
,
KEY_3
,
KEY_NUM_MAX
,
KEY_NUM_MAX
,
}
Key_Num_en_t
;
}
Key_Num_en_t
;
...
...
YueJin_test_bench/source/Appliciation/Key_user.c
View file @
4c7ab4fb
...
@@ -111,14 +111,14 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
...
@@ -111,14 +111,14 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
}
}
}
}
void
Key_Operation_SW2
(
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
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
{
{
if
(
(
LED_Waring
==
1
)
||
(
UDS_Warning_Voltage
==
1
))
if
(
Get_Display_Type
(
)
==
2
)
{
;
}
else
{
{
MENU_CHECK_STEP_SUB
(
);
MENU_CHECK_STEP_SUB
(
);
}
}
...
@@ -129,11 +129,7 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
...
@@ -129,11 +129,7 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
}
}
else
if
(
enKeyEvent
==
KEY_EVENT_SUPER_LONG_PRESS
)
else
if
(
enKeyEvent
==
KEY_EVENT_SUPER_LONG_PRESS
)
{
{
if
(
LED_Waring
==
1
||
(
UDS_Warning_Voltage
==
1
))
if
(
Get_Display_Type
(
)
==
2
)
{
;
}
else
{
{
MENU_CHECK_STEP_SUB
(
);
MENU_CHECK_STEP_SUB
(
);
}
}
...
@@ -147,11 +143,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
...
@@ -147,11 +143,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
/*清零ODO*/
/*清零ODO*/
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
{
{
if
(
LED_Waring
==
1
||
(
UDS_Warning_Voltage
==
1
))
if
(
Get_Display_Type
(
)
==
2
)
{
;
}
else
{
{
MENU_CHECK_STEP_ADD
(
);
MENU_CHECK_STEP_ADD
(
);
}
}
...
@@ -162,11 +154,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
...
@@ -162,11 +154,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
}
}
else
if
(
enKeyEvent
==
KEY_EVENT_SUPER_LONG_PRESS
)
else
if
(
enKeyEvent
==
KEY_EVENT_SUPER_LONG_PRESS
)
{
{
if
(
LED_Waring
==
1
||
(
UDS_Warning_Voltage
==
1
))
if
(
Get_Display_Type
(
)
==
2
)
{
;
}
else
{
{
MENU_CHECK_STEP_ADD
(
);
MENU_CHECK_STEP_ADD
(
);
}
}
...
@@ -251,6 +239,19 @@ Key_Real_Status_en_t Key_Real_sw1(void)
...
@@ -251,6 +239,19 @@ Key_Real_Status_en_t Key_Real_sw1(void)
return
enKeyRealStatus
;
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
]
=
{
const
Key_Attribute_st_t
stKeyAttribute
[
KEY_NUM_MAX
]
=
{
{
KEY_TYPE_LINE
,
Key_Real_sw5
,
Key_Operation_SW5
},
//SW5
{
KEY_TYPE_LINE
,
Key_Real_sw5
,
Key_Operation_SW5
},
//SW5
...
@@ -260,4 +261,6 @@ const Key_Attribute_st_t stKeyAttribute [ KEY_NUM_MAX ] = {
...
@@ -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_sw2
,
Key_Operation_SW2
},
//SW2-
{
KEY_TYPE_LINE
,
Key_Real_sw1
,
Key_Operation_SW1
},
//SW1+
{
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
View file @
4c7ab4fb
...
@@ -227,7 +227,7 @@ void Sys_Exact_50us_Tasks(void)
...
@@ -227,7 +227,7 @@ void Sys_Exact_50us_Tasks(void)
------------------------------------------------------------------------------*/
------------------------------------------------------------------------------*/
void
Sys_Exact_100ms_Tasks
(
void
)
void
Sys_Exact_100ms_Tasks
(
void
)
{
{
CHECK_IPK_COUNT
(
);
//
CHECK_IPK_COUNT( );
}
}
/*============================================================================*/
/*============================================================================*/
void
Sys_Enter_Sleep_Mode
(
void
)
void
Sys_Enter_Sleep_Mode
(
void
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment