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

Fix missing hex color code

Browse Source
This commit is contained in:
fvanroie 2021-05-08 08:10:51 +02:00
parent afdd106df8
commit b49818e8c2
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hasp/hasp_event.cpp
View File

@ -40,7 +40,7 @@ void swipe_event_handler(lv_obj_t* obj, lv_event_t event);
*/ */
static void event_delete_object(lv_obj_t* obj) static void event_delete_object(lv_obj_t* obj)
{ {
switch(obj->user_data.objid) { switch(obj_get_type(obj)) {
case LV_HASP_LINE: case LV_HASP_LINE:
line_clear_points(obj); line_clear_points(obj);
break; break;
@ -49,8 +49,15 @@ static void event_delete_object(lv_obj_t* obj)
my_btnmatrix_map_clear(obj); my_btnmatrix_map_clear(obj);
break; break;
case LV_HASP_MSGBOX:
my_msgbox_map_clear(obj);
break;
case LV_HASP_GAUGE: case LV_HASP_GAUGE:
break; break;
default:
break;
} }
// TODO: delete value_str data for ALL parts // TODO: delete value_str data for ALL parts
@ -61,7 +68,7 @@ static void event_delete_object(lv_obj_t* obj)
void event_timer_calendar(lv_task_t* task) void event_timer_calendar(lv_task_t* task)
{ {
hasp_task_user_data_t* data = (hasp_task_user_data_t*)task->user_data; hasp_task_user_data_t* data = (hasp_task_user_data_t*)task->user_data;
lv_obj_t* obj; lv_obj_t* obj = NULL;
if(data) obj = hasp_find_obj_from_page_id(data->pageid, data->objid); if(data) obj = hasp_find_obj_from_page_id(data->pageid, data->objid);
if(!obj || !data) { if(!obj || !data) {
@ -118,9 +125,9 @@ void event_timer_clock(lv_task_t* task)
tm* timeinfo = localtime(&seconds); tm* timeinfo = localtime(&seconds);
(void)rslt; // unused (void)rslt; // unused
char buffer[24]; char buffer[24] = {0};
if(timeinfo->tm_year < 120) { if(timeinfo->tm_year < 120) {
snprintf_P(buffer, sizeof(buffer), PSTR("%il"), seconds); snprintf_P(buffer, sizeof(buffer), PSTR("%d"), seconds);
} else { } else {
strftime(buffer, sizeof(buffer), D_TIMESTAMP, timeinfo); // Literal String strftime(buffer, sizeof(buffer), D_TIMESTAMP, timeinfo); // Literal String
} }
@ -689,8 +696,8 @@ void cpicker_event_handler(lv_obj_t* obj, lv_event_t event)
c32.full = lv_color_to32(color); c32.full = lv_color_to32(color);
last_color_sent = color; last_color_sent = color;
snprintf_P(data, sizeof(data), PSTR("{\"event\":\"%s\",\"color\":\"#\",\"r\":%d,\"g\":%d,\"b\":%d}"), eventname, snprintf_P(data, sizeof(data), PSTR("{\"event\":\"%s\",\"color\":\"#%02x%02x%02x\",\"r\":%d,\"g\":%d,\"b\":%d}"),
c32.ch.red, c32.ch.green, c32.ch.blue, c32.ch.red, c32.ch.green, c32.ch.blue); eventname, c32.ch.red, c32.ch.green, c32.ch.blue, c32.ch.red, c32.ch.green, c32.ch.blue);
event_send_object_data(obj, data); event_send_object_data(obj, data);
// dispatch_normalized_group_values(obj->user_data.groupid, obj, val, min, max); // dispatch_normalized_group_values(obj->user_data.groupid, obj, val, min, max);