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

Add swipe property

Browse Source
This commit is contained in:
fvanroie 2021-04-17 00:45:59 +02:00
parent 8dc5ffc7ff
commit 7713f4afab
7 changed files with 69 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/lv_conf_v7.h
View File

@ -523,6 +523,7 @@ typedef struct {
uint8_t transitionid:4;
uint8_t actionid:4;
uint8_t groupid:4;
uint8_t swipeid:4;
} lv_obj_user_data_t;
/*1: enable `lv_obj_realaign()` based on `lv_obj_align()` parameters*/

10
src/hasp/hasp_attribute.cpp
View File

@ -178,6 +178,11 @@ static bool attribute_update_lv_property(lv_obj_t * obj, const char * attr_p, ui
}
#endif
static void my_obj_set_swipeid(lv_obj_t* obj, uint8_t swipeid)
{
if(obj) obj->user_data.swipeid = swipeid % 16;
}
// OK - this function is missing in lvgl
static uint8_t my_roller_get_visible_row_count(lv_obj_t* roller)
{
@ -1537,6 +1542,11 @@ void hasp_process_obj_attribute(lv_obj_t* obj, const char* attr_p, const char* p
update ? lv_obj_set_click(obj, Parser::is_true(payload)) : attr_out_int(obj, attr, lv_obj_get_click(obj));
break; // attribute_found
case ATTR_SWIPE:
update ? my_obj_set_swipeid(obj, Parser::is_true(payload))
: attr_out_int(obj, attr, obj->user_data.swipeid);
break; // attribute_found
case ATTR_SRC:
if(check_obj_type(obj, LV_HASP_IMAGE)) {
if(update) {

1
src/hasp/hasp_attribute.h
View File

@ -271,6 +271,7 @@ _HASP_ATTRIBUTE(SCALE_END_LINE_WIDTH, scale_end_line_width, lv_style_int_t)
#define ATTR_TOGGLE 38580
#define ATTR_HIDDEN 11082
#define ATTR_VIS 16320
#define ATTR_SWIPE 11802
#define ATTR_MODE 45891
// #define ATTR_RECT 11204
#define ATTR_ALIGN 34213

63
src/hasp/hasp_event.cpp
View File

@ -7,6 +7,10 @@
* - Value Senders : Convert values and events into topic/payload before forwarding
* - Event Handlers : Callbacks for object event processing
*
* To avoid race conditions:
* - Objects need to send consistent events encapsulated between `up`and `down` events
* - Where appropriate include the current value of the object
*
******************************************************************************************** */
#include "hasp_conf.h"
@ -15,6 +19,8 @@
static lv_style_int_t last_value_sent;
static lv_color_t last_color_sent;
void swipe_event_handler(lv_obj_t* obj, lv_event_t event);
/**
* Clean-up allocated memory before an object is deleted
* @param obj pointer to an object to clean-up
@ -56,6 +62,10 @@ static void event_delete_object(lv_obj_t* obj)
static bool translate_event(lv_obj_t* obj, lv_event_t event, uint8_t& eventid)
{
switch(event) {
case LV_EVENT_GESTURE:
swipe_event_handler(obj, event);
break;
case LV_EVENT_DELETE:
LOG_VERBOSE(TAG_EVENT, F(D_OBJECT_DELETED));
event_delete_object(obj);
@ -67,6 +77,7 @@ static bool translate_event(lv_obj_t* obj, lv_event_t event, uint8_t& eventid)
return true;
case LV_EVENT_LONG_PRESSED_REPEAT:
case LV_EVENT_LONG_PRESSED:
eventid = HASP_EVENT_CHANGED;
return true;
@ -97,10 +108,7 @@ void event_send_object_data(lv_obj_t* obj, const char* data)
}
}
void event_dispatch(lv_obj_t* obj, uint8_t eventid, const char* data)
{}
// Send out the on/off event, with the val
// Send out events with a val attribute
void event_object_val_event(lv_obj_t* obj, uint8_t eventid, int16_t val)
{
char data[40];
@ -111,7 +119,7 @@ void event_object_val_event(lv_obj_t* obj, uint8_t eventid, int16_t val)
event_send_object_data(obj, data);
}
// Send out the changed event, with the val and text
// Send out events with a val and text attribute
void event_object_selection_changed(lv_obj_t* obj, uint8_t eventid, int16_t val, const char* text)
{
char data[200];
@ -209,17 +217,16 @@ void wakeup_event_handler(lv_obj_t* obj, lv_event_t event)
if(event == LV_EVENT_RELEASED && obj == lv_disp_get_layer_sys(NULL)) {
hasp_update_sleep_state(); // wakeup?
if(!haspDevice.get_backlight_power())
if(!haspDevice.get_backlight_power()) {
dispatch_backlight(NULL, "1"); // backlight on and also disable wakeup touch
else {
}
hasp_disable_wakeup_touch(); // only disable wakeup touch
}
}
}
void page_event_handler(lv_obj_t* obj, lv_event_t event)
void swipe_event_handler(lv_obj_t* obj, lv_event_t event)
{
log_event("page", event);
if(!obj || obj->user_data.swipeid == 0) return;
if(event == LV_EVENT_GESTURE) {
lv_gesture_dir_t dir = lv_indev_get_gesture_dir(lv_indev_get_act());
@ -247,6 +254,10 @@ void generic_event_handler(lv_obj_t* obj, lv_event_t event)
log_event("generic", event);
switch(event) {
case LV_EVENT_GESTURE:
swipe_event_handler(obj, event);
return;
case LV_EVENT_PRESSED:
hasp_update_sleep_state(); // wakeup?
last_value_sent = HASP_EVENT_DOWN;
@ -288,7 +299,6 @@ void generic_event_handler(lv_obj_t* obj, lv_event_t event)
case LV_EVENT_PRESSING:
case LV_EVENT_FOCUSED:
case LV_EVENT_DEFOCUSED:
case LV_EVENT_GESTURE:
return; // Don't care about these
case LV_EVENT_VALUE_CHANGED: // Should not occur in this event handler
@ -348,10 +358,13 @@ void toggle_event_handler(lv_obj_t* obj, lv_event_t event)
last_value_sent = lv_switch_get_state(obj);
break;
case LV_HASP_CHECKBOX:
last_value_sent = lv_checkbox_is_checked(obj);
break;
/* case LV_HASP_CHECKBOX:
// This lvgl value is incorrect, it returns pressed instead of checked
// last_value_sent = lv_checkbox_is_checked(obj);
last_value_sent = lv_obj_get_state(obj, LV_BTN_PART_MAIN) & LV_STATE_CHECKED;
break; */
case LV_HASP_CHECKBOX:
case LV_HASP_BUTTON: {
last_value_sent = lv_obj_get_state(obj, LV_BTN_PART_MAIN) & LV_STATE_CHECKED;
break;
@ -414,11 +427,10 @@ void selector_event_handler(lv_obj_t* obj, lv_event_t event)
return; // Invalid selector type
}
if((event == LV_EVENT_LONG_PRESSED_REPEAT && last_value_sent != val) || event != LV_EVENT_LONG_PRESSED_REPEAT) {
if(hasp_event_id == HASP_EVENT_CHANGED && last_value_sent == val) return; // same value as before
last_value_sent = val;
event_object_selection_changed(obj, hasp_event_id, val, buffer);
// if(max > 0) dispatch_normalized_group_value(obj->user_data.groupid, obj, val, 0, max);
}
// set the property
// snprintf_P(property, sizeof(property), PSTR("val\":%d,\"text"), val);
@ -451,11 +463,11 @@ void btnmatrix_event_handler(lv_obj_t* obj, lv_event_t event)
buffer[0] = 0; // empty string
}
if((event == LV_EVENT_LONG_PRESSED_REPEAT && last_value_sent != val) || event != LV_EVENT_LONG_PRESSED_REPEAT) {
if(hasp_event_id == HASP_EVENT_CHANGED && last_value_sent == val) return; // same value as before
last_value_sent = val;
event_object_selection_changed(obj, hasp_event_id, val, buffer);
// if(max > 0) dispatch_normalized_group_value(obj->user_data.groupid, obj, val, 0, max);
}
// set the property
// snprintf_P(property, sizeof(property), PSTR("val\":%d,\"text"), val);
@ -493,12 +505,12 @@ void slider_event_handler(lv_obj_t* obj, lv_event_t event)
return; // not a slider
}
if((event == LV_EVENT_LONG_PRESSED_REPEAT && last_value_sent != val) || event != LV_EVENT_LONG_PRESSED_REPEAT) {
if(hasp_event_id == HASP_EVENT_CHANGED && last_value_sent == val) return; // same value as before
last_value_sent = val;
event_object_val_event(obj, hasp_event_id, val);
dispatch_normalized_group_value(obj->user_data.groupid, obj, val, min, max);
}
}
/**
* Called when a color picker is clicked
@ -510,13 +522,12 @@ void cpicker_event_handler(lv_obj_t* obj, lv_event_t event)
log_event("cpicker", event);
uint8_t hasp_event_id;
if(!translate_event(obj, event, hasp_event_id) || event == LV_EVENT_LONG_PRESSED_REPEAT) return;
if(!translate_event(obj, event, hasp_event_id) || event == LV_EVENT_VALUE_CHANGED) return;
/* Get the new value */
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) {
if(hasp_event_id == HASP_EVENT_CHANGED && last_color_sent.full == color.full) return; // same value as before
char data[100];
char eventname[8];
@ -526,11 +537,9 @@ void cpicker_event_handler(lv_obj_t* obj, lv_event_t event)
c32.full = lv_color_to32(color);
last_color_sent = color;
snprintf_P(data, sizeof(data),
PSTR("{\"event\":\"%s\",\"color\":\"#%02x%02x%02x\",\"r\":%d,\"g\":%d,\"b\":%d}"), eventname,
c32.ch.red, c32.ch.green, c32.ch.blue, c32.ch.red, c32.ch.green, c32.ch.blue);
snprintf_P(data, sizeof(data), PSTR("{\"event\":\"%s\",\"color\":\"#%02x%02x%02x\",\"r\":%d,\"g\":%d,\"b\":%d}"),
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);
// dispatch_normalized_group_value(obj->user_data.groupid, obj, val, min, max);
}
}

1
src/hasp/hasp_event.h
View File

@ -12,7 +12,6 @@
#define HASP_NUM_PAGE_NEXT (HASP_NUM_PAGES + 3)
void wakeup_event_handler(lv_obj_t* obj, lv_event_t event);
void page_event_handler(lv_obj_t* obj, lv_event_t event);
void generic_event_handler(lv_obj_t* obj, lv_event_t event);
void toggle_event_handler(lv_obj_t* obj, lv_event_t event);
void slider_event_handler(lv_obj_t* obj, lv_event_t event);

4
src/hasp/hasp_object.cpp
View File

@ -67,8 +67,8 @@ lv_obj_t* hasp_find_obj_from_parent_id(lv_obj_t* parent, uint8_t objid)
bool hasp_find_id_from_obj(lv_obj_t* obj, uint8_t* pageid, uint8_t* objid)
{
if(!haspPages.get_id(obj, pageid)) return false;
if(!obj || obj->user_data.id == 0) return false;
if(!obj || !haspPages.get_id(obj, pageid)) return false;
if(obj->user_data.id == 0 && obj != haspPages.get_obj(*pageid)) return false;
*objid = obj->user_data.id;
return true;
}

2
src/hasp/hasp_page.cpp
View File

@ -22,7 +22,7 @@ void Page::init(uint8_t start_page)
{
for(int i = 0; i < count(); i++) {
_pages[i] = lv_obj_create(NULL, NULL);
lv_obj_set_event_cb(_pages[i], page_event_handler);
lv_obj_set_event_cb(_pages[i], generic_event_handler);
/**< If the `indev` was pressing this object but swiped out while pressing do not search other object.*/
lv_obj_add_protect(_pages[i], LV_PROTECT_PRESS_LOST);