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
2c19d850
Commit
2c19d850
authored
Feb 14, 2025
by
李梓源
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:sw10预留
parent
a0319b49
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
44 deletions
+45
-44
Key_user.c
YueJin_test_bench/source/Appliciation/Key_user.c
+44
-44
RTE_GPIO.h
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
+1
-0
No files found.
YueJin_test_bench/source/Appliciation/Key_user.c
View file @
2c19d850
...
...
@@ -319,53 +319,53 @@ Key_Real_Status_en_t Key_Real_sw3(void)
return
enKeyRealStatus
;
}
//
Key_Real_Status_en_t Key_Real_sw10(void)
//
{
Key_Real_Status_en_t
Key_Real_sw10
(
void
)
{
//
Key_Real_Status_en_t enKeyRealStatus = KEY_LINE_LOOSEN;
Key_Real_Status_en_t
enKeyRealStatus
=
KEY_LINE_LOOSEN
;
//
if ( SW10 == 0U )
//
{
//
enKeyRealStatus = KEY_LINE_PRESS;
//
}
//
return enKeyRealStatus;
//
}
if
(
SW10
==
0U
)
{
enKeyRealStatus
=
KEY_LINE_PRESS
;
}
return
enKeyRealStatus
;
}
//
void Key_Operation_SW10(Key_Event_en_t enKeyEvent)
//
{
//
/*清零ODO*/
//
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
//
{
void
Key_Operation_SW10
(
Key_Event_en_t
enKeyEvent
)
{
/*清零ODO*/
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
{
//
if(connectbleFlag == 0)
//
{
//
connectbleFlag = 1;
//
name1= (devicename) & 0xFF;
//
name2 = (devicename >> 8) & 0xFF;
//
}
//
else
//
{
//
Display_TFT_Clear();
//
name1= (devicename) & 0xFF;
//
name2 = (devicename >> 8) & 0xFF;
//
startONfalg = 0;
//
send0x42time = 0;
//
bleOFFtoONtime = 0;
//
startONfalg = 0;
//
startIGONtime = 0;
//
}
//
}
//
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
//
{
//
}
//
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
//
{
//
connectbleFlag = 0;
//
}
//
else
//
{
//
}
//
}
if
(
connectbleFlag
==
0
)
{
connectbleFlag
=
1
;
name1
=
(
devicename
)
&
0xFF
;
name2
=
(
devicename
>>
8
)
&
0xFF
;
}
else
{
Display_TFT_Clear
();
name1
=
(
devicename
)
&
0xFF
;
name2
=
(
devicename
>>
8
)
&
0xFF
;
startONfalg
=
0
;
send0x42time
=
0
;
bleOFFtoONtime
=
0
;
startONfalg
=
0
;
startIGONtime
=
0
;
}
}
else
if
(
enKeyEvent
==
KEY_EVENT_LONG_PRESS
)
{
}
else
if
(
enKeyEvent
==
KEY_EVENT_SUPER_LONG_PRESS
)
{
connectbleFlag
=
0
;
}
else
{
}
}
/*---------------------------------------------------------------------------------------*/
const
Key_Attribute_st_t
stKeyAttribute
[
KEY_NUM_MAX
]
=
{
{
KEY_TYPE_LINE
,
Key_Real_sw5
,
Key_Operation_SW5
},
//SW5
...
...
@@ -374,7 +374,7 @@ const Key_Attribute_st_t stKeyAttribute [ KEY_NUM_MAX ] = {
{
KEY_TYPE_LINE
,
Key_Real_sw8
,
Key_Operation_SW8
},
{
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_sw10, Key_Operation_SW10},
{
KEY_TYPE_LINE
,
Key_Real_sw10
,
Key_Operation_SW10
},
{
KEY_TYPE_LINE
,
Key_Real_sw3
,
Key_Operation_SW3
},
//SW1+
};
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @
2c19d850
...
...
@@ -40,6 +40,7 @@
/* ---------------------旧的-------------------------- */
#define POWER_CTRL_KL30 GPIO_OUT_PORT10_PIN13
#define POWER_CTRL_KL15 GPIO_OUT_PORT10_PIN12
#define SW10 GPIO_IN_PORT10_PIN06
#define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06 //12V
#define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05 //BAT
#define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04 //BAT~
...
...
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