mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
Apply suggestions from code review
Co-authored-by: Ibrahim Abd Elkader <i.abdalkader@gmail.com>
This commit is contained in:
parent
293f569597
commit
571ddb9900
@ -1411,85 +1411,55 @@ STATIC mp_obj_t py_lcd_register_hotplug_cb(mp_obj_t cb)
|
||||
}
|
||||
STATIC MP_DEFINE_CONST_FUN_OBJ_1(py_lcd_register_hotplug_cb_obj, py_lcd_register_hotplug_cb);
|
||||
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
STATIC mp_obj_t py_lcd_update_touch_points()
|
||||
{
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
return lcd_touch_update_touch_points();
|
||||
#else
|
||||
return mp_const_none;
|
||||
#endif
|
||||
}
|
||||
STATIC MP_DEFINE_CONST_FUN_OBJ_0(py_lcd_update_touch_points_obj, py_lcd_update_touch_points);
|
||||
|
||||
STATIC mp_obj_t py_lcd_register_touch_cb(mp_obj_t cb)
|
||||
{
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
lcd_touch_register_touch_cb(cb);
|
||||
#endif
|
||||
return mp_const_none;
|
||||
}
|
||||
STATIC MP_DEFINE_CONST_FUN_OBJ_1(py_lcd_register_touch_cb_obj, py_lcd_register_touch_cb);
|
||||
|
||||
STATIC mp_obj_t py_lcd_get_gesture()
|
||||
{
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
return lcd_touch_get_gesture();
|
||||
#else
|
||||
return mp_const_none;
|
||||
#endif
|
||||
}
|
||||
STATIC MP_DEFINE_CONST_FUN_OBJ_0(py_lcd_get_gesture_obj, py_lcd_get_gesture);
|
||||
|
||||
STATIC mp_obj_t py_lcd_get_points()
|
||||
{
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
return lcd_touch_get_points();
|
||||
#else
|
||||
return mp_const_none;
|
||||
#endif
|
||||
}
|
||||
STATIC MP_DEFINE_CONST_FUN_OBJ_0(py_lcd_get_points_obj, py_lcd_get_points);
|
||||
|
||||
STATIC mp_obj_t py_lcd_get_point_flag(mp_obj_t index)
|
||||
{
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
return lcd_touch_get_point_flag(index);
|
||||
#else
|
||||
return mp_const_none;
|
||||
#endif
|
||||
}
|
||||
STATIC MP_DEFINE_CONST_FUN_OBJ_1(py_lcd_get_point_flag_obj, py_lcd_get_point_flag);
|
||||
|
||||
STATIC mp_obj_t py_lcd_get_point_id(mp_obj_t index)
|
||||
{
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
return lcd_touch_get_point_id(index);
|
||||
#else
|
||||
return mp_const_none;
|
||||
#endif
|
||||
}
|
||||
STATIC MP_DEFINE_CONST_FUN_OBJ_1(py_lcd_get_point_id_obj, py_lcd_get_point_id);
|
||||
|
||||
STATIC mp_obj_t py_lcd_get_point_x_position(mp_obj_t index)
|
||||
{
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
return lcd_touch_get_point_x_position(index);
|
||||
#else
|
||||
return mp_const_none;
|
||||
#endif
|
||||
}
|
||||
STATIC MP_DEFINE_CONST_FUN_OBJ_1(py_lcd_get_point_x_position_obj, py_lcd_get_point_x_position);
|
||||
|
||||
STATIC mp_obj_t py_lcd_get_point_y_position(mp_obj_t index)
|
||||
{
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
return lcd_touch_get_point_y_position(index);
|
||||
#else
|
||||
return mp_const_none;
|
||||
#endif
|
||||
}
|
||||
STATIC MP_DEFINE_CONST_FUN_OBJ_1(py_lcd_get_point_y_position_obj, py_lcd_get_point_y_position);
|
||||
|
||||
#endif
|
||||
STATIC mp_obj_t py_lcd_display(uint n_args, const mp_obj_t *args, mp_map_t *kw_args)
|
||||
{
|
||||
image_t *arg_img = py_helper_arg_to_image_mutable(args[0]);
|
||||
@ -1667,6 +1637,7 @@ STATIC const mp_rom_map_elem_t globals_dict_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR_UXGA), MP_ROM_INT(LCD_DISPLAY_UXGA) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_HD), MP_ROM_INT(LCD_DISPLAY_HD) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_FHD), MP_ROM_INT(LCD_DISPLAY_FHD) },
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
{ MP_ROM_QSTR(MP_QSTR_LCD_GESTURE_MOVE_UP), MP_ROM_INT(PY_LCD_TOUCH_GESTURE_MOVE_UP) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_LCD_GESTURE_MOVE_LEFT), MP_ROM_INT(PY_LCD_TOUCH_GESTURE_MOVE_LEFT) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_LCD_GESTURE_MOVE_DOWN), MP_ROM_INT(PY_LCD_TOUCH_GESTURE_MOVE_DOWN) },
|
||||
@ -1677,6 +1648,7 @@ STATIC const mp_rom_map_elem_t globals_dict_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR_LCD_FLAG_PRESSED), MP_ROM_INT(PY_LCD_TOUCH_EVENT_PUT_DOWN) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_LCD_FLAG_RELEASED), MP_ROM_INT(PY_LCD_TOUCH_EVENT_PUT_UP) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_LCD_FLAG_MOVED), MP_ROM_INT(PY_LCD_TOUCH_EVENT_CONTACT) },
|
||||
#endif
|
||||
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&py_lcd_init_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&py_lcd_deinit_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&py_lcd_width_obj) },
|
||||
@ -1691,6 +1663,7 @@ STATIC const mp_rom_map_elem_t globals_dict_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_display_connected), MP_ROM_PTR(&py_lcd_get_display_connected_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_display_id_data), MP_ROM_PTR(&py_lcd_get_display_id_data_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_register_hotplug_cb), MP_ROM_PTR(&py_lcd_register_hotplug_cb_obj) },
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
{ MP_ROM_QSTR(MP_QSTR_update_touch_points), MP_ROM_PTR(&py_lcd_update_touch_points_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_register_touch_cb), MP_ROM_PTR(&py_lcd_register_touch_cb_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_gesture), MP_ROM_PTR(&py_lcd_get_gesture_obj) },
|
||||
@ -1699,6 +1672,16 @@ STATIC const mp_rom_map_elem_t globals_dict_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_point_id), MP_ROM_PTR(&py_lcd_get_point_id_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_point_x_position), MP_ROM_PTR(&py_lcd_get_point_x_position_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_point_y_position), MP_ROM_PTR(&py_lcd_get_point_y_position_obj) },
|
||||
#else
|
||||
{ MP_ROM_QSTR(MP_QSTR_update_touch_points), MP_ROM_PTR(&py_func_unavailable_obj)},
|
||||
{ MP_ROM_QSTR(MP_QSTR_register_touch_cb), MP_ROM_PTR(&py_func_unavailable_obj)},
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_gesture), MP_ROM_PTR(&py_func_unavailable_obj)},
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_points), MP_ROM_PTR(&py_func_unavailable_obj)},
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_point_flag), MP_ROM_PTR(&py_func_unavailable_obj)},
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_point_id), MP_ROM_PTR(&py_func_unavailable_obj)},
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_point_x_position), MP_ROM_PTR(&py_func_unavailable_obj)},
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_point_y_position), MP_ROM_PTR(&py_func_unavailable_obj)},
|
||||
#endif
|
||||
{ MP_ROM_QSTR(MP_QSTR_display), MP_ROM_PTR(&py_lcd_display_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&py_lcd_clear_obj) },
|
||||
};
|
||||
|
||||
@ -17,16 +17,16 @@
|
||||
|
||||
#ifdef OMV_TOUCH_PRESENT
|
||||
#define FT5X06_I2C_ADDR 0x38
|
||||
mp_obj_base_t *lcd_touch_bus = NULL;
|
||||
mp_obj_t lcd_touch_user_cb = NULL;
|
||||
static mp_obj_base_t *lcd_touch_bus = NULL;
|
||||
static mp_obj_t lcd_touch_user_cb = NULL;
|
||||
|
||||
#define NUM_TOUCH_POINTS 5
|
||||
volatile uint8_t lcd_touch_gesture = 0;
|
||||
volatile uint8_t lcd_touch_points = 0, lcd_touch_points_old = 0;
|
||||
volatile uint8_t lcd_touch_flag[NUM_TOUCH_POINTS] = {};
|
||||
volatile uint8_t lcd_touch_id[NUM_TOUCH_POINTS] = {};
|
||||
volatile uint16_t lcd_touch_x_position[NUM_TOUCH_POINTS] = {};
|
||||
volatile uint16_t lcd_touch_y_position[NUM_TOUCH_POINTS] = {};
|
||||
static volatile uint8_t lcd_touch_gesture = 0;
|
||||
static volatile uint8_t lcd_touch_points = 0, lcd_touch_points_old = 0;
|
||||
static volatile uint8_t lcd_touch_flag[NUM_TOUCH_POINTS] = {};
|
||||
static volatile uint8_t lcd_touch_id[NUM_TOUCH_POINTS] = {};
|
||||
static volatile uint16_t lcd_touch_x_position[NUM_TOUCH_POINTS] = {};
|
||||
static volatile uint16_t lcd_touch_y_position[NUM_TOUCH_POINTS] = {};
|
||||
|
||||
mp_obj_t lcd_touch_get_gesture()
|
||||
{
|
||||
|
||||
@ -19,11 +19,13 @@ typedef enum py_lcd_touch_gesture {
|
||||
PY_LCD_TOUCH_GESTURE_ZOOM_OUT = 0x49,
|
||||
PY_LCD_TOUCH_GESTURE_NONE = 0x00
|
||||
} py_lcd_touch_gesture_t;
|
||||
|
||||
typedef enum py_lcd_touch_event {
|
||||
PY_LCD_TOUCH_EVENT_PUT_DOWN = 0x0,
|
||||
PY_LCD_TOUCH_EVENT_PUT_UP = 0x1,
|
||||
PY_LCD_TOUCH_EVENT_CONTACT = 0x2
|
||||
} py_lcd_touch_event_t;
|
||||
|
||||
void lcd_touch_init();
|
||||
void lcd_touch_deinit();
|
||||
mp_obj_t lcd_touch_update_touch_points();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user