jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 05:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comment out v7 code to be reviewed

Browse Source
This commit is contained in:
fvanroie 2021-07-21 19:50:40 +02:00
parent bdfa400809
commit d71a59d9fc
2 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/hasp/hasp_attribute.cpp
View File

@ -719,16 +719,18 @@ static hasp_attribute_type_t hasp_local_style_attr(lv_obj_t* obj, const char* at
// result = false; // result = false;
return HASP_ATTR_TYPE_NOT_FOUND; return HASP_ATTR_TYPE_NOT_FOUND;
} }
#endif
#if LV_USE_ARC
static hasp_attribute_type_t hasp_process_arc_attribute(lv_obj_t* obj, uint16_t attr_hash, int32_t& val, bool update) static hasp_attribute_type_t hasp_process_arc_attribute(lv_obj_t* obj, uint16_t attr_hash, int32_t& val, bool update)
{ {
// We already know it's a arc object // We already know it's a arc object
switch(attr_hash) { switch(attr_hash) {
case ATTR_TYPE: case ATTR_TYPE:
if(update) if(update)
lv_arc_set_type(obj, val % 3); lv_arc_set_mode(obj, val % 3);
else else
val = lv_arc_get_type(obj); val = lv_arc_get_mode(obj);
break; break;
default: default:
@ -737,7 +739,9 @@ static hasp_attribute_type_t hasp_process_arc_attribute(lv_obj_t* obj, uint16_t
return HASP_ATTR_TYPE_INT; return HASP_ATTR_TYPE_INT;
} }
#endif
#if LVGL_VERSION_MAJOR == 7
static hasp_attribute_type_t hasp_process_lmeter_attribute(lv_obj_t* obj, uint16_t attr_hash, int32_t& val, bool update) static hasp_attribute_type_t hasp_process_lmeter_attribute(lv_obj_t* obj, uint16_t attr_hash, int32_t& val, bool update)
{ {
// We already know it's a linemeter object // We already know it's a linemeter object
@ -949,7 +953,7 @@ static hasp_attribute_type_t special_attribute_src(lv_obj_t* obj, const char* pa
static hasp_attribute_type_t attribute_common_align(lv_obj_t* obj, const char* attr, const char* payload, char** text, static hasp_attribute_type_t attribute_common_align(lv_obj_t* obj, const char* attr, const char* payload, char** text,
bool update) bool update)
{ {
lv_text_align_t val; lv_text_align_t val = LV_TEXT_ALIGN_AUTO;
if(update) { if(update) {
if(!strcasecmp_P(payload, PSTR("left"))) { if(!strcasecmp_P(payload, PSTR("left"))) {
@ -1529,6 +1533,7 @@ static hasp_attribute_type_t attribute_common_range(lv_obj_t* obj, int32_t& val,
return HASP_ATTR_TYPE_INT; return HASP_ATTR_TYPE_INT;
} }
#endif
// ##################### Default Attributes ######################################################## // ##################### Default Attributes ########################################################
@ -1579,8 +1584,6 @@ static hasp_attribute_type_t attribute_common_method(lv_obj_t* obj, uint16_t att
return HASP_ATTR_TYPE_METHOD_OK; return HASP_ATTR_TYPE_METHOD_OK;
} }
#endif
static hasp_attribute_type_t attribute_common_text(lv_obj_t* obj, const char* attr, const char* payload, char** text, static hasp_attribute_type_t attribute_common_text(lv_obj_t* obj, const char* attr, const char* payload, char** text,
bool update) bool update)
{ {
@ -2068,12 +2071,12 @@ void hasp_process_obj_attribute(lv_obj_t* obj, const char* attribute, const char
if(ret == HASP_ATTR_TYPE_NOT_FOUND) { if(ret == HASP_ATTR_TYPE_NOT_FOUND) {
switch(obj_get_type(obj)) { // Properties by object type switch(obj_get_type(obj)) { // Properties by object type
#if LV_USE_ARC
case LV_HASP_ARC: case LV_HASP_ARC:
val = strtol(payload, nullptr, DEC); val = strtol(payload, nullptr, DEC);
// ret = hasp_process_arc_attribute(obj, attr_hash, val, update); ret = hasp_process_arc_attribute(obj, attr_hash, val, update);
break; break;
#endif
case LV_HASP_GAUGE: case LV_HASP_GAUGE:
val = strtol(payload, nullptr, DEC); val = strtol(payload, nullptr, DEC);
// ret = hasp_process_gauge_attribute(obj, attr_hash, val, update); // ret = hasp_process_gauge_attribute(obj, attr_hash, val, update);
@ -2084,11 +2087,13 @@ void hasp_process_obj_attribute(lv_obj_t* obj, const char* attribute, const char
// ret = hasp_process_lmeter_attribute(obj, attr_hash, val, update); // ret = hasp_process_lmeter_attribute(obj, attr_hash, val, update);
break; break;
#if LV_USE_LINE
case LV_HASP_LINE: case LV_HASP_LINE:
// if(attr_hash == ATTR_POINTS) // if(attr_hash == ATTR_POINTS)
// ret = my_line_set_points(obj, payload) ? HASP_ATTR_TYPE_METHOD_OK : HASP_ATTR_TYPE_RANGE_ERROR; // ret = my_line_set_points(obj, payload) ? HASP_ATTR_TYPE_METHOD_OK : HASP_ATTR_TYPE_RANGE_ERROR;
break; break;
#endif
#if LV_USE_COLORWHEEL
case LV_HASP_CPICKER: case LV_HASP_CPICKER:
if(attr_hash == ATTR_COLOR) { if(attr_hash == ATTR_COLOR) {
if(update) { if(update) {
@ -2101,7 +2106,7 @@ void hasp_process_obj_attribute(lv_obj_t* obj, const char* attribute, const char
ret = HASP_ATTR_TYPE_COLOR; ret = HASP_ATTR_TYPE_COLOR;
} }
break; break;
#endif
default: default:
break; // not found break; // not found
} }

16
src/hasp/hasp_object.cpp
View File

@ -327,6 +327,7 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
// } // }
// break; // break;
#if LV_USE_TABLE
case LV_HASP_TABLE: case LV_HASP_TABLE:
case HASP_OBJ_TABLE: case HASP_OBJ_TABLE:
objid = LV_HASP_TABLE; objid = LV_HASP_TABLE;
@ -336,7 +337,9 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
// obj->user_data.objid = LV_HASP_TABLE; // obj->user_data.objid = LV_HASP_TABLE;
} }
break; break;
#endif
#if LV_USE_BTN
case LV_HASP_BUTTON: case LV_HASP_BUTTON:
case HASP_OBJ_BTN: case HASP_OBJ_BTN:
objid = LV_HASP_BUTTON; objid = LV_HASP_BUTTON;
@ -353,7 +356,9 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
// obj->user_data.objid = LV_HASP_BUTTON; // obj->user_data.objid = LV_HASP_BUTTON;
} }
break; break;
#endif
#if LV_USE_CHECKBOX
case LV_HASP_CHECKBOX: case LV_HASP_CHECKBOX:
case HASP_OBJ_CHECKBOX: case HASP_OBJ_CHECKBOX:
objid = LV_HASP_CHECKBOX; objid = LV_HASP_CHECKBOX;
@ -363,7 +368,9 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
// obj->user_data.objid = LV_HASP_CHECKBOX; // obj->user_data.objid = LV_HASP_CHECKBOX;
} }
break; break;
#endif
#if LV_USE_LABEL
case LV_HASP_LABEL: case LV_HASP_LABEL:
case HASP_OBJ_LABEL: case HASP_OBJ_LABEL:
objid = LV_HASP_LABEL; objid = LV_HASP_LABEL;
@ -377,7 +384,9 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
// object_add_task(obj, pageid, id, event_timer_clock, 1000); // object_add_task(obj, pageid, id, event_timer_clock, 1000);
} }
break; break;
#endif
#if LV_USE_IMAGE
case LV_HASP_IMAGE: case LV_HASP_IMAGE:
case HASP_OBJ_IMG: case HASP_OBJ_IMG:
objid = LV_HASP_IMAGE; objid = LV_HASP_IMAGE;
@ -387,7 +396,9 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
// obj->user_data.objid = LV_HASP_IMAGE; // obj->user_data.objid = LV_HASP_IMAGE;
} }
break; break;
#endif
#if LV_USE_ARC
case LV_HASP_ARC: case LV_HASP_ARC:
case HASP_OBJ_ARC: case HASP_OBJ_ARC:
objid = LV_HASP_ARC; objid = LV_HASP_ARC;
@ -397,6 +408,7 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
// obj->user_data.objid = LV_HASP_ARC; // obj->user_data.objid = LV_HASP_ARC;
} }
break; break;
#endif
case LV_HASP_CONTAINER: case LV_HASP_CONTAINER:
case HASP_OBJ_CONT: case HASP_OBJ_CONT:
@ -434,7 +446,6 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
// if(obj) obj->user_data.objid = LV_HASP_WINDOW; // if(obj) obj->user_data.objid = LV_HASP_WINDOW;
// No event handler for pages // No event handler for pages
break; break;
#endif #endif
#if LVGL_VERSION_MAJOR == 8 #if LVGL_VERSION_MAJOR == 8
@ -514,7 +525,9 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
break; break;
#endif #endif
/* ----- Color Objects ------ */ /* ----- Color Objects ------ */
#if LV_USE_COLORWHEEL
case LV_HASP_CPICKER: case LV_HASP_CPICKER:
case HASP_OBJ_CPICKER: case HASP_OBJ_CPICKER:
objid = LV_HASP_CPICKER; objid = LV_HASP_CPICKER;
@ -524,6 +537,7 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
// obj->user_data.objid = LV_HASP_CPICKER; // obj->user_data.objid = LV_HASP_CPICKER;
} }
break; break;
#endif
#if LV_USE_SPINNER != 0 #if LV_USE_SPINNER != 0
case LV_HASP_SPINNER: case LV_HASP_SPINNER: