Skip to content

J
jiancetai
Commit 2c19d850 authored by 李梓源's avatar 李梓源
Browse files
Options

✨ feat:sw10预留

parent a0319b49
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 44 deletions
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 2c19d850
...@@ -319,53 +319,53 @@ Key_Real_Status_en_t Key_Real_sw3(void) ...@@ -319,53 +319,53 @@ Key_Real_Status_en_t Key_Real_sw3(void)
return enKeyRealStatus; 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 ) if ( SW10 == 0U )
// { {
// enKeyRealStatus = KEY_LINE_PRESS; enKeyRealStatus = KEY_LINE_PRESS;
// } }
// return enKeyRealStatus; return enKeyRealStatus;
// } }
// void Key_Operation_SW10(Key_Event_en_t enKeyEvent) void Key_Operation_SW10(Key_Event_en_t enKeyEvent)
// { {
// /*清零ODO*/ /*清零ODO*/
// if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
// { {
// if(connectbleFlag == 0) if(connectbleFlag == 0)
// { {
// connectbleFlag = 1; connectbleFlag = 1;
// name1= (devicename) & 0xFF; name1= (devicename) & 0xFF;
// name2 = (devicename >> 8) & 0xFF; name2 = (devicename >> 8) & 0xFF;
// } }
// else else
// { {
// Display_TFT_Clear(); Display_TFT_Clear();
// name1= (devicename) & 0xFF; name1= (devicename) & 0xFF;
// name2 = (devicename >> 8) & 0xFF; name2 = (devicename >> 8) & 0xFF;
// startONfalg = 0; startONfalg = 0;
// send0x42time = 0; send0x42time = 0;
// bleOFFtoONtime = 0; bleOFFtoONtime = 0;
// startONfalg = 0; startONfalg = 0;
// startIGONtime = 0; startIGONtime = 0;
// } }
// } }
// else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
// { {
// } }
// else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
// { {
// connectbleFlag = 0; connectbleFlag = 0;
// } }
// else else
// { {
// } }
// } }
/*---------------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------------*/
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
...@@ -374,7 +374,7 @@ const Key_Attribute_st_t stKeyAttribute [ KEY_NUM_MAX ] = { ...@@ -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_sw8, Key_Operation_SW8},
{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_sw10, Key_Operation_SW10}, {KEY_TYPE_LINE, Key_Real_sw10, Key_Operation_SW10},
{KEY_TYPE_LINE, Key_Real_sw3, Key_Operation_SW3}, //SW1+ {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 @@ ...@@ -40,6 +40,7 @@
/* ---------------------旧的-------------------------- */ /* ---------------------旧的-------------------------- */
#define POWER_CTRL_KL30 GPIO_OUT_PORT10_PIN13 #define POWER_CTRL_KL30 GPIO_OUT_PORT10_PIN13
#define POWER_CTRL_KL15 GPIO_OUT_PORT10_PIN12 #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_01 GPIO_OUT_PORT09_PIN06 //12V
#define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05 //BAT #define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05 //BAT
#define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04 //BAT~ #define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04 //BAT~
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment