bugfixes

lv_conf_templ.h

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

lv_hal/lv_hal_indev.h

@@ -53,7 +53,6 @@ typedef struct {
 
 /*Initialized by the user and registered by 'lv_indev_add()'*/
 typedef struct {
-    const char * name;                              /*Input device name*/
     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)*/
 }lv_indev_drv_t;

lv_hal/lv_hal_tick.c

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

lv_obj/lv_indev.c

@@ -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);
 }
 
+#if LV_OBJ_GROUP
 /**
  * Set a destination group for a keypad input device
  * @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;
 }
-
+#endif
 
 /**
  * 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)
 {
     if(indev->event == LV_INDEV_EVENT_PR){
-#if LV_INDEV_TP_MARKER != 0
+#if LV_INDEV_POINT_MARKER != 0
         area_t area;
-        area.x1 = x - (LV_INDEV_POINT_MARKER >> 1);
-        area.y1 = y - (LV_INDEV_POINT_MARKER >> 1);
-        area.x2 = x + ((LV_INDEV_POINT_MARKER >> 1) | 0x1);
-        area.y2 = y + ((LV_INDEV_POINT_MARKER >> 1) | 0x1);
+        area.x1 = (indev->act_point.x >> LV_ANTIALIAS) - (LV_INDEV_POINT_MARKER >> 1);
+        area.y1 = (indev->act_point.y >> LV_ANTIALIAS) - (LV_INDEV_POINT_MARKER >> 1);
+        area.x2 = (indev->act_point.x >> LV_ANTIALIAS) + ((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);
 #endif
         indev_proc_press(indev);

lv_obj/lv_indev.h

@@ -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);
 
+#if LV_OBJ_GROUP
 /**
  * Set a destination group for a keypad input device
  * @param indev pointer to an input device (type: 'LV_INDEV_TYPE_KEYPAD')
  * @param group point to a group
  */
 void lv_indev_set_group(lv_indev_t *indev, lv_group_t *group);
-
+#endif
 /**
  * Get the last point of an input device
  * @param indev pointer to an input device

lv_obj/lv_obj.c

@@ -7,13 +7,14 @@
  *      INCLUDES
  *********************/
 
-#include <lvgl/lv_obj/lv_indev.h>
 #include "lv_conf.h"
 #include "lv_obj.h"
+#include "lv_indev.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_draw/lv_draw_rbasic.h"
 #include "lv_refr.h"
 #include "lv_group.h"
+#include "misc/misc.h"
 #include "misc/gfx/anim.h"
 #include <stdint.h>
 #include <string.h>