From 51ac9a90ee3ef8d5db34394204be724576ac1af2 Mon Sep 17 00:00:00 2001
From: fvanroie <fvanroie@users.noreply.github.com>
Date: Wed, 8 Apr 2020 13:51:47 +0200
Subject: [PATCH] Removed hasp_attr_get

---
 src/hasp_attr_get.cpp |  8 ++++----
 src/hasp_attr_get.h   | 18 ------------------
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 src/hasp_attr_get.h

diff --git a/src/hasp_attr_get.cpp b/src/hasp_attr_get.cpp
index 8b9c2d8c..d85d3a45 100644
--- a/src/hasp_attr_get.cpp
+++ b/src/hasp_attr_get.cpp
@@ -3,14 +3,13 @@
 
 #include "lvgl.h"
 #include "hasp.h"
-#include "hasp_attr_get.h"
+//#include "hasp_attr_get.h"
 
 #define LVGL7 1
 
 bool haspGetObjAttribute(lv_obj_t * obj, String strAttr, std::string & strPayload)
 {
     if(!obj) return false;
-    uint16_t val = 0;
 
     switch(strAttr.length()) {
         case 4:
@@ -36,7 +35,8 @@ bool haspGetObjAttribute(lv_obj_t * obj, String strAttr, std::string & strPayloa
                 if(check_obj_type(list.type[0], LV_HASP_BAR)) strPayload = String(lv_bar_get_value(obj)).c_str();
                 if(check_obj_type(list.type[0], LV_HASP_LMETER))
                     strPayload = String(lv_linemeter_get_value(obj)).c_str();
-                if(check_obj_type(list.type[0], LV_HASP_CPICKER)) strPayload = String(get_cpicker_value(obj)).c_str();
+                // if(check_obj_type(list.type[0], LV_HASP_CPICKER)) strPayload =
+                // String(lv_cpicker_get_color(obj)).c_str();
                 if(check_obj_type(list.type[0], LV_HASP_CHECKBOX))
                     strPayload = String(!lv_checkbox_is_checked(obj) ? 0 : 1).c_str();
                 if(check_obj_type(list.type[0], LV_HASP_DDLIST))
@@ -47,6 +47,6 @@ bool haspGetObjAttribute(lv_obj_t * obj, String strAttr, std::string & strPayloa
                 if(check_obj_type(list.type[0], LV_HASP_LED)) strPayload = String(lv_led_get_bright(obj)).c_str();
                 if(check_obj_type(list.type[0], LV_HASP_SWITCH)) strPayload = String(lv_switch_get_state(obj)).c_str();
             }
-    }
+        }
     return false;
 }
\ No newline at end of file
diff --git a/src/hasp_attr_get.h b/src/hasp_attr_get.h
deleted file mode 100644
index bc684f48..00000000
--- a/src/hasp_attr_get.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef HASP_ATTR_GET_H
-#define HASP_ATTR_GET_H
-
-#include "Arduino.h"
-#include "lvgl.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool haspGetObjAttribute(lv_obj_t * obj, String strAttr, std::string & strPayload);
-uint32_t get_cpicker_value(lv_obj_t * obj);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif