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

Remove obj from events

Browse Source
This commit is contained in:
fvanroie 2021-04-15 16:51:35 +02:00
parent 13935ca1a1
commit 9a940b2bcd
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hasp/hasp_event.cpp
View File

@ -107,8 +107,7 @@ void event_object_val_event(lv_obj_t* obj, uint8_t eventid, int16_t val)
char eventname[8]; char eventname[8];
Parser::get_event_name(eventid, eventname, sizeof(eventname)); Parser::get_event_name(eventid, eventname, sizeof(eventname));
snprintf_P(data, sizeof(data), PSTR("{\"obj\":\"%s\",\"event\":\"%s\",\"val\":%d}"), get_obj_type_name(obj), snprintf_P(data, sizeof(data), PSTR("{\"event\":\"%s\",\"val\":%d}"), eventname, val);
eventname, val);
event_send_object_data(obj, data); event_send_object_data(obj, data);
} }
@ -119,8 +118,7 @@ void event_object_selection_changed(lv_obj_t* obj, uint8_t eventid, int16_t val,
char eventname[8]; char eventname[8];
Parser::get_event_name(eventid, eventname, sizeof(eventname)); Parser::get_event_name(eventid, eventname, sizeof(eventname));
snprintf_P(data, sizeof(data), PSTR("{\"obj\":\"%s\",\"event\":\"%s\",\"val\":%d,\"text\":\"%s\"}"), snprintf_P(data, sizeof(data), PSTR("{\"event\":\"%s\",\"val\":%d,\"text\":\"%s\"}"), eventname, val, text);
get_obj_type_name(obj), eventname, val, text);
event_send_object_data(obj, data); event_send_object_data(obj, data);
} }
@ -528,10 +526,9 @@ 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( snprintf_P(data, sizeof(data),
data, sizeof(data), PSTR("{\"event\":\"%s\",\"color\":\"#%02x%02x%02x\",\"r\":%d,\"g\":%d,\"b\":%d}"), eventname,
PSTR("{\"obj\":\"cpicker\",\"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_value(obj->user_data.groupid, obj, val, min, max); // dispatch_normalized_group_value(obj->user_data.groupid, obj, val, min, max);