From 72e84f05ae9e50c17f49c3f910a9f4b6066c7f6a Mon Sep 17 00:00:00 2001
From: lyon <liang6516@outlook.com>
Date: Sat, 17 Sep 2022 13:57:17 +0800
Subject: [PATCH] add_files

---
 package/pika_lvgl/pika_lv_point_t.c      |  8 ++++++++
 package/pika_lvgl/pika_lv_timer_t.c      |  8 ++++++++
 package/pika_lvgl/pika_lv_wegit.c        | 21 ++++++++++++++-------
 package/pika_lvgl/pika_lvgl.c            | 12 +++++++++---
 package/pika_lvgl/pika_lvgl.pyi          |  2 +-
 package/pika_lvgl/pika_lvgl_indev_t.c    | 10 +++++++++-
 package/pika_lvgl/pika_lvgl_lv_event.c   |  8 ++++++++
 package/pika_lvgl/pika_lvgl_lv_obj.c     | 14 +++++++++++---
 package/pika_lvgl/pika_lvgl_lv_style_t.c | 10 +++++++++-
 9 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/package/pika_lvgl/pika_lv_point_t.c b/package/pika_lvgl/pika_lv_point_t.c
index 0da53f551..7fe31cbe2 100644
--- a/package/pika_lvgl/pika_lv_point_t.c
+++ b/package/pika_lvgl/pika_lv_point_t.c
@@ -1,4 +1,11 @@
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
+#else
+#include "../../lvgl.h"
+#endif
+
+#ifdef PIKASCRIPT
+
 #include "pika_lvgl_point_t.h"
 
 void pika_lvgl_point_t___init__(PikaObj* self) {
@@ -6,3 +13,4 @@ void pika_lvgl_point_t___init__(PikaObj* self) {
     args_setStruct(self->list, "lv_point_struct", lv_point);
     obj_setPtr(self, "lv_point", args_getStruct(self->list, "lv_point_struct"));
 }
+#endif
diff --git a/package/pika_lvgl/pika_lv_timer_t.c b/package/pika_lvgl/pika_lv_timer_t.c
index 6df1956a8..c97b9b20d 100644
--- a/package/pika_lvgl/pika_lv_timer_t.c
+++ b/package/pika_lvgl/pika_lv_timer_t.c
@@ -1,4 +1,11 @@
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
+#else
+#include "../../lvgl.h"
+#endif
+
+#ifdef PIKASCRIPT
+
 #include "pika_lvgl_lv_timer_t.h"
 
 PikaEventListener* g_pika_lv_timer_event_listener;
@@ -34,3 +41,4 @@ void pika_lvgl_lv_timer_t__del(PikaObj* self) {
     lv_timer_t* lv_timer = obj_getPtr(self, "lv_timer");
     lv_timer_del(lv_timer);
 }
+#endif
diff --git a/package/pika_lvgl/pika_lv_wegit.c b/package/pika_lvgl/pika_lv_wegit.c
index 49dee3de4..2dc958dc4 100644
--- a/package/pika_lvgl/pika_lv_wegit.c
+++ b/package/pika_lvgl/pika_lv_wegit.c
@@ -1,5 +1,11 @@
-#include "BaseObj.h"
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
+#else
+#include "../../lvgl.h"
+#endif
+
+#ifdef PIKASCRIPT
+#include "BaseObj.h"
 #include "pika_lvgl.h"
 #include "pika_lvgl_arc.h"
 #include "pika_lvgl_bar.h"
@@ -176,7 +182,7 @@ void pika_lvgl_checkbox_set_text_static(PikaObj *self, char* txt){
 
 char* pika_lvgl_checkbox_get_text(PikaObj *self){
     lv_obj_t* lv_obj = obj_getPtr(self, "lv_obj");
-    return lv_checkbox_get_text(lv_obj);
+    return (char*) lv_checkbox_get_text(lv_obj);
 }
 
 void pika_lvgl_dropdown___init__(PikaObj* self, PikaObj* parent) {
@@ -220,7 +226,7 @@ int pika_lvgl_dropdown_get_option_index(PikaObj *self, char* txt){
 }
 char* pika_lvgl_dropdown_get_options(PikaObj *self){
     lv_obj_t* lv_obj = obj_getPtr(self, "lv_obj");
-    return lv_dropdown_get_options(lv_obj);
+    return (char*) lv_dropdown_get_options(lv_obj);
 }
 int pika_lvgl_dropdown_get_selected(PikaObj *self){
     lv_obj_t* lv_obj = obj_getPtr(self, "lv_obj");
@@ -234,17 +240,17 @@ int pika_lvgl_dropdown_get_selected_highlight(PikaObj *self){
 char* pika_lvgl_dropdown_get_selected_str(PikaObj *self){
     lv_obj_t* lv_obj = obj_getPtr(self, "lv_obj");
     obj_setBytes(self, "_buff",NULL, 128);
-    char* _buff = obj_getBytes(self, "_buff");
+    char* _buff = (char*)obj_getBytes(self, "_buff");
     lv_dropdown_get_selected_str(lv_obj, _buff, 128);
     return _buff;
 }
-int pika_lvgl_dropdown_get_symbol(PikaObj *self){
+char* pika_lvgl_dropdown_get_symbol(PikaObj *self){
     lv_obj_t* lv_obj = obj_getPtr(self, "lv_obj");
-    return lv_dropdown_get_symbol(lv_obj);
+    return (char*)lv_dropdown_get_symbol(lv_obj);
 }
 char* pika_lvgl_dropdown_get_text(PikaObj *self){
     lv_obj_t* lv_obj = obj_getPtr(self, "lv_obj");
-    return lv_dropdown_get_text(lv_obj);
+    return (char*)lv_dropdown_get_text(lv_obj);
 }
 int pika_lvgl_dropdown_is_open(PikaObj *self){
     lv_obj_t* lv_obj = obj_getPtr(self, "lv_obj");
@@ -355,3 +361,4 @@ void pika_lvgl_textarea_set_one_line(PikaObj* self, int en) {
     lv_obj_t* lv_obj = obj_getPtr(self, "lv_obj");
     lv_textarea_set_one_line(lv_obj, en);
 }
+#endif
\ No newline at end of file
diff --git a/package/pika_lvgl/pika_lvgl.c b/package/pika_lvgl/pika_lvgl.c
index 55ff93eea..1d42b0dc8 100644
--- a/package/pika_lvgl/pika_lvgl.c
+++ b/package/pika_lvgl/pika_lvgl.c
@@ -1,6 +1,12 @@
-#include "pika_lvgl.h"
-#include "BaseObj.h"
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
+#else
+#include "../../lvgl.h"
+#endif
+
+#ifdef PIKASCRIPT
+#include "pika_lvgl.h"
+#include "BaseObj.h"
 #include "pika_lvgl_ALIGN.h"
 #include "pika_lvgl_ANIM.h"
 #include "pika_lvgl_EVENT.h"
@@ -190,4 +196,4 @@ PikaObj* pika_lvgl_timer_create_basic(PikaObj *self){
     obj_setPtr(new_obj,"lv_timer", lv_timer);
     return new_obj;
 }
-
+#endif
diff --git a/package/pika_lvgl/pika_lvgl.pyi b/package/pika_lvgl/pika_lvgl.pyi
index cf07d71df..e86e1b751 100644
--- a/package/pika_lvgl/pika_lvgl.pyi
+++ b/package/pika_lvgl/pika_lvgl.pyi
@@ -226,7 +226,7 @@ class dropdown(lv_obj):
     def get_option_cnt(self) -> int: ...
     def get_selected_str(self) -> str: ...
     def get_option_index(self, option: str) -> int: ...
-    def get_symbol(self) -> int: ...
+    def get_symbol(self) -> str: ...
     def get_selected_highlight(self) -> int: ...
     def get_dir(self) -> int: ...
     def open(self): ...
diff --git a/package/pika_lvgl/pika_lvgl_indev_t.c b/package/pika_lvgl/pika_lvgl_indev_t.c
index 53f164b08..591ee8a62 100644
--- a/package/pika_lvgl/pika_lvgl_indev_t.c
+++ b/package/pika_lvgl/pika_lvgl_indev_t.c
@@ -1,5 +1,12 @@
-#include "pika_lvgl_indev_t.h"
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
+#else
+#include "../../lvgl.h"
+#endif
+
+#ifdef PIKASCRIPT
+
+#include "pika_lvgl_indev_t.h"
 
 void pika_lvgl_indev_t_get_vect(PikaObj* self, PikaObj* point) {
     lv_indev_t* lv_indev = obj_getPtr(self, "lv_indev");
@@ -8,3 +15,4 @@ void pika_lvgl_indev_t_get_vect(PikaObj* self, PikaObj* point) {
     obj_setInt(point, "x", lv_point->x);
     obj_setInt(point, "y", lv_point->y);
 }
+#endif
diff --git a/package/pika_lvgl/pika_lvgl_lv_event.c b/package/pika_lvgl/pika_lvgl_lv_event.c
index b2acaa339..575cf1648 100644
--- a/package/pika_lvgl/pika_lvgl_lv_event.c
+++ b/package/pika_lvgl/pika_lvgl_lv_event.c
@@ -1,4 +1,11 @@
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
+#else
+#include "../../lvgl.h"
+#endif
+
+#ifdef PIKASCRIPT
+
 #include "pika_lvgl_lv_event.h"
 
 int pika_lvgl_lv_event_get_code(PikaObj *self){
@@ -14,3 +21,4 @@ PikaObj* pika_lvgl_lv_event_get_target(PikaObj *self){
     obj_setPtr(new_obj, "lv_obj", lv_obj);
     return new_obj;
 }
+#endif
diff --git a/package/pika_lvgl/pika_lvgl_lv_obj.c b/package/pika_lvgl/pika_lvgl_lv_obj.c
index 05079891e..700b4dad2 100644
--- a/package/pika_lvgl/pika_lvgl_lv_obj.c
+++ b/package/pika_lvgl/pika_lvgl_lv_obj.c
@@ -1,7 +1,14 @@
-#include "pika_lvgl_lv_obj.h"
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#include "lvgl.h"
+#else
+#include "../../lvgl.h"
+#endif
+
+#ifdef PIKASCRIPT
+
+#include "pika_lvgl_lv_obj.h"
 #include "BaseObj.h"
 #include "dataStrs.h"
-#include "lvgl.h"
 #include "pika_lvgl.h"
 #include "pika_lvgl_arc.h"
 #include "pika_lvgl_lv_event.h"
@@ -88,7 +95,7 @@ void pika_lvgl_lv_obj_add_event_cb(PikaObj* self,
 
 void pika_lvgl_lv_obj_add_style(PikaObj *self, PikaObj* style, int selector){
     lv_obj_t* lv_obj = obj_getPtr(self, "lv_obj");
-    lv_state_t* lv_style = obj_getPtr(style, "lv_style");
+    lv_style_t* lv_style = obj_getPtr(style, "lv_style");
     lv_obj_add_style(lv_obj, lv_style, selector);
 }
 
@@ -106,3 +113,4 @@ void pika_lvgl_lv_obj_set_pos(PikaObj *self, int x, int y){
     lv_obj_t* lv_obj = obj_getPtr(self, "lv_obj");
     lv_obj_set_pos(lv_obj, x, y);
 }
+#endif
diff --git a/package/pika_lvgl/pika_lvgl_lv_style_t.c b/package/pika_lvgl/pika_lvgl_lv_style_t.c
index ba0887896..478300898 100644
--- a/package/pika_lvgl/pika_lvgl_lv_style_t.c
+++ b/package/pika_lvgl/pika_lvgl_lv_style_t.c
@@ -1,4 +1,11 @@
-#include "lvgl.h"
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#include "lvgl.h"
+#else
+#include "../../lvgl.h"
+#endif
+
+#ifdef PIKASCRIPT
+
 #include "pika_lvgl_style_t.h"
 
 void pika_lvgl_style_t_init(PikaObj* self) {
@@ -60,3 +67,4 @@ void pika_lvgl_style_t_set_shadow_width(PikaObj *self, int w){
     lv_style_t* lv_style = obj_getPtr(self, "lv_style");
     lv_style_set_shadow_width(lv_style, w);
 }
+#endif