Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'beta' of https://github.com/littlevgl/lvgl into beta

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2017-11-22 18:53:45 +01:00
commit 38663e1365
6 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lv_conf_templ.h
View File

@ -7,15 +7,8 @@
#ifndef LV_CONF_H #ifndef LV_CONF_H
#define LV_CONF_H #define LV_CONF_H
/**
* @file lv_conf.h
*
*/
#ifndef LV_CONF_H
#define LV_CONF_H
/*=================== /*===================
Graphical settings Graphical settings
*=====================*/ *=====================*/

1
lv_hal/lv_hal_indev.h
View File

@ -53,7 +53,6 @@ typedef struct {
/*Initialized by the user and registered by 'lv_indev_add()'*/ /*Initialized by the user and registered by 'lv_indev_add()'*/
typedef struct { typedef struct {
const char * name; /*Input device name*/
lv_hal_indev_type_t type; /*Input device type*/ lv_hal_indev_type_t type; /*Input device type*/
bool (*get_data)(lv_indev_data_t *data); /*Function pointer to read data. Return 'true' if there is still data to be read (buffered)*/ bool (*get_data)(lv_indev_data_t *data); /*Function pointer to read data. Return 'true' if there is still data to be read (buffered)*/
}lv_indev_drv_t; }lv_indev_drv_t;

2
lv_hal/lv_hal_tick.c
View File

@ -6,7 +6,7 @@
/********************* /*********************
* INCLUDES * INCLUDES
*********************/ *********************/
#include <lvgl/lv_hal/lv_hal_tick.h> #include "lv_hal_tick.h"
#include <stddef.h> #include <stddef.h>
/********************* /*********************

13
lv_obj/lv_indev.c
View File

@ -128,6 +128,7 @@ void lv_indev_set_cursor(lv_indev_t *indev, lv_obj_t *cur_obj)
lv_obj_set_pos(indev->cursor, indev->state.act_point.x, indev->state.act_point.y); lv_obj_set_pos(indev->cursor, indev->state.act_point.x, indev->state.act_point.y);
} }
#if LV_OBJ_GROUP
/** /**
* Set a destination group for a keypad input device * Set a destination group for a keypad input device
* @param indev pointer to an input device (type: 'LV_INDEV_TYPE_KEYPAD') * @param indev pointer to an input device (type: 'LV_INDEV_TYPE_KEYPAD')
@ -137,7 +138,7 @@ void lv_indev_set_group(lv_indev_t *indev, lv_group_t *group)
{ {
indev->group = group; indev->group = group;
} }
#endif
/** /**
* Get the last point of an input device * Get the last point of an input device
@ -281,12 +282,12 @@ static void indev_proc_task(void * param)
static void indev_proc_point(lv_indev_state_t * indev) static void indev_proc_point(lv_indev_state_t * indev)
{ {
if(indev->event == LV_INDEV_EVENT_PR){ if(indev->event == LV_INDEV_EVENT_PR){
#if LV_INDEV_TP_MARKER != 0 #if LV_INDEV_POINT_MARKER != 0
area_t area; area_t area;
area.x1 = x - (LV_INDEV_POINT_MARKER >> 1); area.x1 = (indev->act_point.x >> LV_ANTIALIAS) - (LV_INDEV_POINT_MARKER >> 1);
area.y1 = y - (LV_INDEV_POINT_MARKER >> 1); area.y1 = (indev->act_point.y >> LV_ANTIALIAS) - (LV_INDEV_POINT_MARKER >> 1);
area.x2 = x + ((LV_INDEV_POINT_MARKER >> 1) | 0x1); area.x2 = (indev->act_point.x >> LV_ANTIALIAS) + ((LV_INDEV_POINT_MARKER >> 1) | 0x1);
area.y2 = y + ((LV_INDEV_POINT_MARKER >> 1) | 0x1); area.y2 = (indev->act_point.y >> LV_ANTIALIAS) + ((LV_INDEV_POINT_MARKER >> 1) | 0x1);
lv_rfill(&area, NULL, COLOR_MAKE(0xFF, 0, 0), OPA_COVER); lv_rfill(&area, NULL, COLOR_MAKE(0xFF, 0, 0), OPA_COVER);
#endif #endif
indev_proc_press(indev); indev_proc_press(indev);

3
lv_obj/lv_indev.h
View File

@ -66,13 +66,14 @@ void lv_indev_enable(lv_hal_indev_type_t type, bool enable);
*/ */
void lv_indev_set_cursor(lv_indev_t *indev, lv_obj_t *cur_obj); void lv_indev_set_cursor(lv_indev_t *indev, lv_obj_t *cur_obj);
#if LV_OBJ_GROUP
/** /**
* Set a destination group for a keypad input device * Set a destination group for a keypad input device
* @param indev pointer to an input device (type: 'LV_INDEV_TYPE_KEYPAD') * @param indev pointer to an input device (type: 'LV_INDEV_TYPE_KEYPAD')
* @param group point to a group * @param group point to a group
*/ */
void lv_indev_set_group(lv_indev_t *indev, lv_group_t *group); void lv_indev_set_group(lv_indev_t *indev, lv_group_t *group);
#endif
/** /**
* Get the last point of an input device * Get the last point of an input device
* @param indev pointer to an input device * @param indev pointer to an input device

2
lv_obj/lv_obj.c
View File

@ -7,9 +7,9 @@
* INCLUDES * INCLUDES
*********************/ *********************/
#include <lvgl/lv_obj/lv_indev.h>
#include "lv_conf.h" #include "lv_conf.h"
#include "lv_obj.h" #include "lv_obj.h"
#include "lv_indev.h"
#include "../lv_draw/lv_draw.h" #include "../lv_draw/lv_draw.h"
#include "../lv_draw/lv_draw_rbasic.h" #include "../lv_draw/lv_draw_rbasic.h"
#include "lv_refr.h" #include "lv_refr.h"