additional changges for keyboard processing
This commit is contained in:
committed by
Raphael Coeffic
parent
52ec439ca2
commit
35af1cd008
@@ -28,7 +28,18 @@ LvglWrapper* LvglWrapper::_instance = nullptr;
|
|||||||
static lv_disp_drv_t disp_drv; /*A variable to hold the drivers. Must be static or global.*/
|
static lv_disp_drv_t disp_drv; /*A variable to hold the drivers. Must be static or global.*/
|
||||||
lv_disp_t * disp;
|
lv_disp_t * disp;
|
||||||
static lv_disp_draw_buf_t disp_buf;
|
static lv_disp_draw_buf_t disp_buf;
|
||||||
static lv_indev_drv_t indev_drv;
|
|
||||||
|
static lv_indev_drv_t touchDriver;
|
||||||
|
static lv_indev_drv_t keyboard_drv;
|
||||||
|
|
||||||
|
static TouchState lastState;
|
||||||
|
|
||||||
|
#if defined(HARDWARE_TOUCH)
|
||||||
|
TouchState getLastTochState()
|
||||||
|
{
|
||||||
|
return lastState;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void newLcdRefresh(uint16_t* buffer);
|
void newLcdRefresh(uint16_t* buffer);
|
||||||
static void flushLcd(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p)
|
static void flushLcd(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p)
|
||||||
@@ -37,22 +48,32 @@ static void flushLcd(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_
|
|||||||
lv_disp_flush_ready(disp_drv);
|
lv_disp_flush_ready(disp_drv);
|
||||||
}
|
}
|
||||||
|
|
||||||
extern "C" void my_input_read(lv_indev_drv_t * drv, lv_indev_data_t*data)
|
|
||||||
|
extern "C" void keyboardDriverRead(lv_indev_drv_t *drv, lv_indev_data_t *data)
|
||||||
|
{
|
||||||
|
// if there is a keyboard event then call checkevents
|
||||||
|
if (isEvent())
|
||||||
|
MainWindow::instance()->checkEvents();
|
||||||
|
}
|
||||||
|
|
||||||
|
extern "C" void touchDriverRead(lv_indev_drv_t *drv, lv_indev_data_t *data)
|
||||||
{
|
{
|
||||||
#if defined(HARDWARE_TOUCH)
|
#if defined(HARDWARE_TOUCH)
|
||||||
TouchState st = touchPanelRead();
|
TouchState st = touchPanelRead();
|
||||||
|
lastState = st; // hack for now
|
||||||
|
|
||||||
if(st.event == TE_NONE)
|
if(st.event == TE_NONE)
|
||||||
return;
|
return;
|
||||||
if(st.event == TE_DOWN || st.event == TE_SLIDE)
|
if(st.event == TE_DOWN || st.event == TE_SLIDE)
|
||||||
{
|
{
|
||||||
#if defined (LCD_VERTICAL_INVERT)
|
#if defined (LCD_VERTICAL_INVERT)
|
||||||
data->point.x = LCD_W - st.x;
|
data->point.x = LCD_W - st.x;
|
||||||
data->point.y = LCD_H - st.y;
|
data->point.y = LCD_H - st.y;
|
||||||
#else
|
#else
|
||||||
data->point.x = st.x;
|
data->point.x = st.x;
|
||||||
data->point.y = st.y;
|
data->point.y = st.y;
|
||||||
#endif
|
#endif
|
||||||
data->state = LV_INDEV_STATE_PRESSED;
|
data->state = LV_INDEV_STATE_PRESSED;
|
||||||
} else {
|
} else {
|
||||||
data->state = LV_INDEV_STATE_RELEASED;
|
data->state = LV_INDEV_STATE_RELEASED;
|
||||||
}
|
}
|
||||||
@@ -91,9 +112,6 @@ LvglWrapper::LvglWrapper()
|
|||||||
#endif
|
#endif
|
||||||
disp_drv.sw_rotate = 1;
|
disp_drv.sw_rotate = 1;
|
||||||
|
|
||||||
lv_indev_drv_init(&indev_drv); /*Basic initialization*/
|
|
||||||
indev_drv.type = LV_INDEV_TYPE_POINTER; /*See below.*/
|
|
||||||
indev_drv.read_cb = my_input_read; /*See below.*/
|
|
||||||
/*Register the driver in LVGL and save the created input device object*/
|
/*Register the driver in LVGL and save the created input device object*/
|
||||||
|
|
||||||
|
|
||||||
@@ -103,7 +121,15 @@ LvglWrapper::LvglWrapper()
|
|||||||
canvas = lv_canvas_create(lv_scr_act());
|
canvas = lv_canvas_create(lv_scr_act());
|
||||||
lv_canvas_set_buffer(canvas, cbuf, LCD_W, LCD_H, LV_IMG_CF_TRUE_COLOR);
|
lv_canvas_set_buffer(canvas, cbuf, LCD_W, LCD_H, LV_IMG_CF_TRUE_COLOR);
|
||||||
|
|
||||||
lv_indev_t * my_indev = lv_indev_drv_register(&indev_drv);
|
lv_indev_drv_init(&touchDriver); /*Basic initialization*/
|
||||||
|
touchDriver.type = LV_INDEV_TYPE_POINTER; /*See below.*/
|
||||||
|
touchDriver.read_cb = touchDriverRead; /*See below.*/
|
||||||
|
lv_indev_drv_register(&touchDriver);
|
||||||
|
|
||||||
|
lv_indev_drv_init(&keyboard_drv);
|
||||||
|
keyboard_drv.type = LV_INDEV_TYPE_KEYPAD;
|
||||||
|
keyboard_drv.read_cb = keyboardDriverRead;
|
||||||
|
lv_indev_drv_register(&keyboard_drv);
|
||||||
}
|
}
|
||||||
|
|
||||||
void LvglWrapper::run()
|
void LvglWrapper::run()
|
||||||
|
|||||||
@@ -26,6 +26,9 @@
|
|||||||
#include "lvgl/lvgl.h"
|
#include "lvgl/lvgl.h"
|
||||||
|
|
||||||
extern lv_color_t makeLvColor(uint32_t colorFlags);
|
extern lv_color_t makeLvColor(uint32_t colorFlags);
|
||||||
|
#if defined(HARDWARE_TOUCH)
|
||||||
|
extern TouchState getLastTochState();
|
||||||
|
#endif
|
||||||
|
|
||||||
class LvglWidgetFactory;
|
class LvglWidgetFactory;
|
||||||
typedef std::function<lv_obj_t *(lv_obj_t *parent)> LvObjConstructor;
|
typedef std::function<lv_obj_t *(lv_obj_t *parent)> LvObjConstructor;
|
||||||
|
|||||||
@@ -43,6 +43,15 @@ event_t s_evt;
|
|||||||
struct InactivityData inactivity = {0};
|
struct InactivityData inactivity = {0};
|
||||||
Key keys[NUM_KEYS];
|
Key keys[NUM_KEYS];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief returns true if there is an event waiting.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
bool isEvent()
|
||||||
|
{
|
||||||
|
return s_evt != 0;
|
||||||
|
}
|
||||||
|
|
||||||
event_t getEvent(bool trim)
|
event_t getEvent(bool trim)
|
||||||
{
|
{
|
||||||
event_t event = s_evt;
|
event_t event = s_evt;
|
||||||
|
|||||||
@@ -198,6 +198,7 @@ void killEvents(event_t event);
|
|||||||
void killAllEvents();
|
void killAllEvents();
|
||||||
bool waitKeysReleased();
|
bool waitKeysReleased();
|
||||||
event_t getEvent(bool trim=false);
|
event_t getEvent(bool trim=false);
|
||||||
|
bool isEvent();
|
||||||
bool keyDown();
|
bool keyDown();
|
||||||
|
|
||||||
#if defined(ROTARY_ENCODER_NAVIGATION)
|
#if defined(ROTARY_ENCODER_NAVIGATION)
|
||||||
|
|||||||
Vendored
+1
-1
Submodule radio/src/thirdparty/libopenui updated: afd17b1fbc...cfe5f543e5
Reference in New Issue
Block a user