jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce colorpickers value updates #119

Browse Source
This commit is contained in:
fvanroie 2021-04-13 02:37:07 +02:00
parent 0e7bd6c2bb
commit 44cb84e6a7
1 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/hasp/hasp_event.cpp
View File

@ -15,6 +15,7 @@
// static unsigned long last_change_event = 0; // static unsigned long last_change_event = 0;
static bool last_press_was_short = false; // Avoid SHORT + UP double events static bool last_press_was_short = false; // Avoid SHORT + UP double events
static lv_style_int_t last_value_sent; static lv_style_int_t last_value_sent;
static lv_color_t last_color_sent;
/* ============================== Event Senders ============================ */ /* ============================== Event Senders ============================ */
@ -74,15 +75,16 @@ void event_object_selection_changed(lv_obj_t* obj, int16_t val, const char* text
} }
// Send out the changed event, with the color // Send out the changed event, with the color
void event_object_color_changed(lv_obj_t* obj, lv_color_t color) void event_object_color_event(lv_obj_t* obj, uint8_t eventid, lv_color_t color)
{ {
char data[80]; char data[80];
char eventname[8];
lv_color32_t c32; lv_color32_t c32;
c32.full = lv_color_to32(color); c32.full = lv_color_to32(color);
snprintf_P(data, sizeof(data), Parser::get_event_name(eventid, eventname, sizeof(eventname));
PSTR("{\"event\":\"changed\",\"color\":\"#%02x%02x%02x\",\"r\":%d,\"g\":%d,\"b\":%d}"), c32.ch.red, snprintf_P(data, sizeof(data), PSTR("{\"event\":\"%s\",\"color\":\"#%02x%02x%02x\",\"r\":%d,\"g\":%d,\"b\":%d}"),
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_obj_data(obj, data); event_obj_data(obj, data);
} }
@ -425,13 +427,6 @@ void slider_event_handler(lv_obj_t* obj, lv_event_t event)
uint16_t evt; uint16_t evt;
switch(event) { switch(event) {
case LV_EVENT_VALUE_CHANGED:
break;
case LV_EVENT_DELETE:
LOG_VERBOSE(TAG_EVENT, F(D_OBJECT_DELETED));
event_delete_object(obj);
break;
case LV_EVENT_PRESSED: case LV_EVENT_PRESSED:
hasp_update_sleep_state(); // wakeup on press down? hasp_update_sleep_state(); // wakeup on press down?
@ -467,6 +462,14 @@ void slider_event_handler(lv_obj_t* obj, lv_event_t event)
break; break;
} }
case LV_EVENT_VALUE_CHANGED:
break;
case LV_EVENT_DELETE:
LOG_VERBOSE(TAG_EVENT, F(D_OBJECT_DELETED));
event_delete_object(obj);
break;
default: default:
// LOG_VERBOSE(TAG_EVENT, F("Event ID: %d"), event); // LOG_VERBOSE(TAG_EVENT, F("Event ID: %d"), event);
; ;
@ -484,13 +487,37 @@ void cpicker_event_handler(lv_obj_t* obj, lv_event_t event)
snprintf_P(color, sizeof(color), PSTR("color")); snprintf_P(color, sizeof(color), PSTR("color"));
log_event("cpicker", event); log_event("cpicker", event);
if(event == LV_EVENT_VALUE_CHANGED) { uint16_t evt;
hasp_update_sleep_state(); // wakeup? switch(event) {
// attr_out_color(obj, color, lv_cpicker_get_color(obj));
event_object_color_changed(obj, lv_cpicker_get_color(obj));
} else if(event == LV_EVENT_DELETE) { case LV_EVENT_PRESSED:
LOG_VERBOSE(TAG_EVENT, F(D_OBJECT_DELETED)); hasp_update_sleep_state(); // wakeup on press down?
event_delete_object(obj); evt = HASP_EVENT_DOWN;
case LV_EVENT_LONG_PRESSED_REPEAT:
if(event == LV_EVENT_LONG_PRESSED_REPEAT) evt = HASP_EVENT_CHANGED;
case LV_EVENT_RELEASED: {
if(event == LV_EVENT_RELEASED) evt = HASP_EVENT_UP;
lv_color_t color = lv_cpicker_get_color(obj);
if((event == LV_EVENT_LONG_PRESSED_REPEAT && last_color_sent.full != color.full) ||
event != LV_EVENT_LONG_PRESSED_REPEAT) {
last_color_sent = color;
event_object_color_event(obj, evt, color);
// dispatch_normalized_group_value(obj->user_data.groupid, obj, val, min, max);
}
break;
}
case LV_EVENT_VALUE_CHANGED:
break;
case LV_EVENT_DELETE:
LOG_VERBOSE(TAG_EVENT, F(D_OBJECT_DELETED));
event_delete_object(obj);
break;
default:
// LOG_VERBOSE(TAG_EVENT, F("Event ID: %d"), event);
;
} }
} }