From 81fcd8c482511c53ce5c203f41d682db975e47ba Mon Sep 17 00:00:00 2001
From: Lyon <88232613+pikasTech@users.noreply.github.com>
Date: Tue, 20 Sep 2022 05:14:31 +0800
Subject: [PATCH] fix(pikascript): fix some warnings (#3697)

---
 env_support/pikascript/pika_lv_point_t.c      |  2 ++
 env_support/pikascript/pika_lv_timer_t.c      |  2 ++
 env_support/pikascript/pika_lv_wegit.c        | 17 +++++++++--------
 env_support/pikascript/pika_lvgl.c            |  3 ++-
 env_support/pikascript/pika_lvgl.pyi          |  2 +-
 env_support/pikascript/pika_lvgl_indev_t.c    |  2 ++
 env_support/pikascript/pika_lvgl_lv_event.c   |  2 ++
 env_support/pikascript/pika_lvgl_lv_obj.c     |  6 ++++--
 env_support/pikascript/pika_lvgl_lv_style_t.c |  4 +++-
 9 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/env_support/pikascript/pika_lv_point_t.c b/env_support/pikascript/pika_lv_point_t.c
index f51feaa51..7fe31cbe2 100644
--- a/env_support/pikascript/pika_lv_point_t.c
+++ b/env_support/pikascript/pika_lv_point_t.c
@@ -3,7 +3,9 @@
 #else
 #include "../../lvgl.h"
 #endif
+
 #ifdef PIKASCRIPT
+
 #include "pika_lvgl_point_t.h"
 
 void pika_lvgl_point_t___init__(PikaObj* self) {
diff --git a/env_support/pikascript/pika_lv_timer_t.c b/env_support/pikascript/pika_lv_timer_t.c
index 8aa876498..c97b9b20d 100644
--- a/env_support/pikascript/pika_lv_timer_t.c
+++ b/env_support/pikascript/pika_lv_timer_t.c
@@ -3,7 +3,9 @@
 #else
 #include "../../lvgl.h"
 #endif
+
 #ifdef PIKASCRIPT
+
 #include "pika_lvgl_lv_timer_t.h"
 
 PikaEventListener* g_pika_lv_timer_event_listener;
diff --git a/env_support/pikascript/pika_lv_wegit.c b/env_support/pikascript/pika_lv_wegit.c
index 91da51b1f..2dc958dc4 100644
--- a/env_support/pikascript/pika_lv_wegit.c
+++ b/env_support/pikascript/pika_lv_wegit.c
@@ -1,8 +1,9 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"
 #endif
+
 #ifdef PIKASCRIPT
 #include "BaseObj.h"
 #include "pika_lvgl.h"
@@ -181,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) {
@@ -225,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");
@@ -239,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");
@@ -360,4 +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
+#endif
\ No newline at end of file
diff --git a/env_support/pikascript/pika_lvgl.c b/env_support/pikascript/pika_lvgl.c
index 2b6424a94..1d42b0dc8 100644
--- a/env_support/pikascript/pika_lvgl.c
+++ b/env_support/pikascript/pika_lvgl.c
@@ -1,8 +1,9 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"
 #endif
+
 #ifdef PIKASCRIPT
 #include "pika_lvgl.h"
 #include "BaseObj.h"
diff --git a/env_support/pikascript/pika_lvgl.pyi b/env_support/pikascript/pika_lvgl.pyi
index cf07d71df..e86e1b751 100644
--- a/env_support/pikascript/pika_lvgl.pyi
+++ b/env_support/pikascript/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/env_support/pikascript/pika_lvgl_indev_t.c b/env_support/pikascript/pika_lvgl_indev_t.c
index db3998f85..591ee8a62 100644
--- a/env_support/pikascript/pika_lvgl_indev_t.c
+++ b/env_support/pikascript/pika_lvgl_indev_t.c
@@ -3,7 +3,9 @@
 #else
 #include "../../lvgl.h"
 #endif
+
 #ifdef PIKASCRIPT
+
 #include "pika_lvgl_indev_t.h"
 
 void pika_lvgl_indev_t_get_vect(PikaObj* self, PikaObj* point) {
diff --git a/env_support/pikascript/pika_lvgl_lv_event.c b/env_support/pikascript/pika_lvgl_lv_event.c
index 3cb49adbb..575cf1648 100644
--- a/env_support/pikascript/pika_lvgl_lv_event.c
+++ b/env_support/pikascript/pika_lvgl_lv_event.c
@@ -3,7 +3,9 @@
 #else
 #include "../../lvgl.h"
 #endif
+
 #ifdef PIKASCRIPT
+
 #include "pika_lvgl_lv_event.h"
 
 int pika_lvgl_lv_event_get_code(PikaObj *self){
diff --git a/env_support/pikascript/pika_lvgl_lv_obj.c b/env_support/pikascript/pika_lvgl_lv_obj.c
index 445dc0be3..700b4dad2 100644
--- a/env_support/pikascript/pika_lvgl_lv_obj.c
+++ b/env_support/pikascript/pika_lvgl_lv_obj.c
@@ -1,9 +1,11 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#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"
@@ -93,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);
 }
 
diff --git a/env_support/pikascript/pika_lvgl_lv_style_t.c b/env_support/pikascript/pika_lvgl_lv_style_t.c
index 4cfa2159a..478300898 100644
--- a/env_support/pikascript/pika_lvgl_lv_style_t.c
+++ b/env_support/pikascript/pika_lvgl_lv_style_t.c
@@ -1,9 +1,11 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#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) {