DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

roccat-drv: fix macro parsing

Browse Source 
If the time is not given in the macro, the device still accepts it and
works properly by setting 10 ms of delay after a key press and 50 ms
between the keys.

Problem is: without this, the RATBAG_MACRO_EVENT_WAIT is not set during
parsing, so we end up having a RATBAG_MACRO_EVENT_NONE between 2 key
events, and the library ends up truncating the macro after the first
RATBAG_MACRO_EVENT_NONE.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Benjamin Tissoires
2015-09-18 11:08:37 -04:00
parent 0f1b11a874
commit bb4b8d729b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/driver-roccat.c
View File

@@ -643,7 +643,7 @@ roccat_read_button(struct ratbag_button *button)
struct roccat_macro *macro;
struct roccat_data *drv_data;
uint8_t *buf;
unsigned j;
unsigned j, time;
int rc;
device = button->profile->device;
@@ -708,10 +708,13 @@ roccat_read_button(struct ratbag_button *button)
macro->keys[j].flag & 0x01 ? RATBAG_MACRO_EVENT_KEY_PRESSED : RATBAG_MACRO_EVENT_KEY_RELEASED,
macro_mapping[macro->keys[j].keycode]);
if (macro->keys[j].time)
ratbag_button_set_macro_event(button,
j * 2 + 1,
RATBAG_MACRO_EVENT_WAIT,
macro->keys[j].time);
time = macro->keys[j].time;
else
time = macro->keys[j].flag & 0x01 ? 10 : 50;
ratbag_button_set_macro_event(button,
j * 2 + 1,
RATBAG_MACRO_EVENT_WAIT,
time);
log_raw(device->ratbag,
" - %s %s\n",