BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lvgl
Project
Overview
Details
Activity
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
lvgl
Commits
e4555e0f
Commit
e4555e0f
authored
Dec 30, 2016
by
Kiss-Vamosi Gabor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove LV_APP_KB_MODE_CLR
parent
5dd28510
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
27 deletions
+0
-27
lv_app_kb.c
lv_app/lv_app_util/lv_app_kb.c
+0
-26
lv_app_kb.h
lv_app/lv_app_util/lv_app_kb.h
+0
-1
No files found.
lv_app/lv_app_util/lv_app_kb.c
View file @
e4555e0f
...
@@ -61,7 +61,6 @@ static const char * kb_map_num[] = {
...
@@ -61,7 +61,6 @@ static const char * kb_map_num[] = {
static
cord_t
kb_ta_ori_size
;
static
cord_t
kb_ta_ori_size
;
static
uint8_t
kb_mode
;
static
uint8_t
kb_mode
;
static
bool
kb_first
;
static
void
(
*
kb_close_action
)(
lv_obj_t
*
);
static
void
(
*
kb_close_action
)(
lv_obj_t
*
);
static
void
(
*
kb_ok_action
)(
lv_obj_t
*
);
static
void
(
*
kb_ok_action
)(
lv_obj_t
*
);
static
lv_btnms_t
kb_btnms
;
static
lv_btnms_t
kb_btnms
;
...
@@ -102,7 +101,6 @@ void lv_app_kb_open(lv_obj_t * ta, lv_app_kb_mode_t mode, void (*close)(lv_obj_t
...
@@ -102,7 +101,6 @@ void lv_app_kb_open(lv_obj_t * ta, lv_app_kb_mode_t mode, void (*close)(lv_obj_t
kb_mode
=
mode
;
kb_mode
=
mode
;
kb_close_action
=
close
;
kb_close_action
=
close
;
kb_ok_action
=
ok
;
kb_ok_action
=
ok
;
kb_first
=
false
;
/*Create a button matrix for the keyboard */
/*Create a button matrix for the keyboard */
kb_btnm
=
lv_btnm_create
(
lv_scr_act
(),
NULL
);
kb_btnm
=
lv_btnm_create
(
lv_scr_act
(),
NULL
);
...
@@ -195,34 +193,14 @@ static lv_action_res_t lv_app_kb_action(lv_obj_t * btnm, uint16_t i)
...
@@ -195,34 +193,14 @@ static lv_action_res_t lv_app_kb_action(lv_obj_t * btnm, uint16_t i)
}
else
if
(
strcmp
(
txt
,
"1#"
)
==
0
)
{
}
else
if
(
strcmp
(
txt
,
"1#"
)
==
0
)
{
lv_btnm_set_map
(
btnm
,
kb_map_spec
);
lv_btnm_set_map
(
btnm
,
kb_map_spec
);
}
else
if
(
strcmp
(
txt
,
"Enter"
)
==
0
)
{
}
else
if
(
strcmp
(
txt
,
"Enter"
)
==
0
)
{
if
((
kb_mode
&
LV_APP_KB_MODE_CLR
)
!=
0
&&
kb_first
==
false
)
{
lv_ta_set_text
(
kb_ta
,
""
);
kb_first
=
true
;
}
lv_ta_add_char
(
kb_ta
,
'\n'
);
lv_ta_add_char
(
kb_ta
,
'\n'
);
}
else
if
(
strcmp
(
txt
,
"Left"
)
==
0
)
{
}
else
if
(
strcmp
(
txt
,
"Left"
)
==
0
)
{
if
((
kb_mode
&
LV_APP_KB_MODE_CLR
)
!=
0
&&
kb_first
==
false
)
{
lv_ta_set_text
(
kb_ta
,
""
);
kb_first
=
true
;
}
lv_ta_cursor_left
(
kb_ta
);
lv_ta_cursor_left
(
kb_ta
);
}
else
if
(
strcmp
(
txt
,
"Right"
)
==
0
)
{
}
else
if
(
strcmp
(
txt
,
"Right"
)
==
0
)
{
if
((
kb_mode
&
LV_APP_KB_MODE_CLR
)
!=
0
&&
kb_first
==
false
)
{
lv_ta_set_text
(
kb_ta
,
""
);
kb_first
=
true
;
}
lv_ta_cursor_right
(
kb_ta
);
lv_ta_cursor_right
(
kb_ta
);
}
else
if
(
strcmp
(
txt
,
"Del"
)
==
0
)
{
}
else
if
(
strcmp
(
txt
,
"Del"
)
==
0
)
{
if
((
kb_mode
&
LV_APP_KB_MODE_CLR
)
!=
0
&&
kb_first
==
false
)
{
lv_ta_set_text
(
kb_ta
,
""
);
kb_first
=
true
;
}
lv_ta_del
(
kb_ta
);
lv_ta_del
(
kb_ta
);
}
else
if
(
strcmp
(
txt
,
"+/-"
)
==
0
)
{
}
else
if
(
strcmp
(
txt
,
"+/-"
)
==
0
)
{
if
((
kb_mode
&
LV_APP_KB_MODE_CLR
)
!=
0
&&
kb_first
==
false
)
{
lv_ta_set_text
(
kb_ta
,
""
);
kb_first
=
true
;
}
uint16_t
cur
=
lv_ta_get_cursor_pos
(
kb_ta
);
uint16_t
cur
=
lv_ta_get_cursor_pos
(
kb_ta
);
const
char
*
ta_txt
=
lv_ta_get_txt
(
kb_ta
);
const
char
*
ta_txt
=
lv_ta_get_txt
(
kb_ta
);
if
(
ta_txt
[
0
]
==
'-'
)
{
if
(
ta_txt
[
0
]
==
'-'
)
{
...
@@ -247,10 +225,6 @@ static lv_action_res_t lv_app_kb_action(lv_obj_t * btnm, uint16_t i)
...
@@ -247,10 +225,6 @@ static lv_action_res_t lv_app_kb_action(lv_obj_t * btnm, uint16_t i)
lv_app_kb_close
(
true
);
lv_app_kb_close
(
true
);
return
LV_ACTION_RES_INV
;
return
LV_ACTION_RES_INV
;
}
else
{
}
else
{
if
((
kb_mode
&
LV_APP_KB_MODE_CLR
)
!=
0
&&
kb_first
==
false
)
{
lv_ta_set_text
(
kb_ta
,
""
);
kb_first
=
true
;
}
lv_ta_add_text
(
kb_ta
,
txt
);
lv_ta_add_text
(
kb_ta
,
txt
);
}
}
...
...
lv_app/lv_app_util/lv_app_kb.h
View file @
e4555e0f
...
@@ -23,7 +23,6 @@ typedef enum
...
@@ -23,7 +23,6 @@ typedef enum
{
{
LV_APP_KB_MODE_TXT
=
0x01
,
LV_APP_KB_MODE_TXT
=
0x01
,
LV_APP_KB_MODE_NUM
=
0x02
,
LV_APP_KB_MODE_NUM
=
0x02
,
LV_APP_KB_MODE_CLR
=
0x04
,
/*Clear when the first character is pressed*/
}
lv_app_kb_mode_t
;
}
lv_app_kb_mode_t
;
/**********************
/**********************
...
...
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