From fcf8b804ed95a98561bd4c1d6c85604be0f7cc7b Mon Sep 17 00:00:00 2001 From: Stefan Kerkmann Date: Mon, 3 Apr 2023 10:33:45 +0200 Subject: [Core] Refactor `keyevent_t` for 1ms timing resolution (#15847) --- keyboards/synthlabs/solo/keymaps/via/keymap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'keyboards/synthlabs/solo') diff --git a/keyboards/synthlabs/solo/keymaps/via/keymap.c b/keyboards/synthlabs/solo/keymaps/via/keymap.c index c6634c42d4..84f99df9ab 100644 --- a/keyboards/synthlabs/solo/keymaps/via/keymap.c +++ b/keyboards/synthlabs/solo/keymaps/via/keymap.c @@ -37,7 +37,8 @@ void encoder_action_unregister(void) { keyevent_t encoder_event = (keyevent_t) { .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state[index] = 0; action_exec(encoder_event); @@ -49,7 +50,8 @@ void encoder_action_register(uint8_t index, bool clockwise) { keyevent_t encoder_event = (keyevent_t) { .key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); action_exec(encoder_event); -- cgit v1.2.3 From c9f619124d41637ece157570703423c3890cb6c2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 16 Apr 2023 01:18:44 +1000 Subject: Encodermap direction define. (#20454) --- keyboards/synthlabs/solo/keymaps/iidx/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/synthlabs/solo') diff --git a/keyboards/synthlabs/solo/keymaps/iidx/keymap.c b/keyboards/synthlabs/solo/keymaps/iidx/keymap.c index aedb00d968..d124a011f6 100644 --- a/keyboards/synthlabs/solo/keymaps/iidx/keymap.c +++ b/keyboards/synthlabs/solo/keymaps/iidx/keymap.c @@ -62,7 +62,7 @@ void housekeeping_task_user(void) { } } -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW( CCW_MACRO, CW_MACRO -- cgit v1.2.3 From 12d42cedd2624db0d5cfe6f538211f9dfcd19822 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 1 May 2023 13:33:10 +1000 Subject: Move `FORCE_NKRO` to data driven (#20604) --- keyboards/synthlabs/solo/config.h | 2 -- keyboards/synthlabs/solo/info.json | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'keyboards/synthlabs/solo') diff --git a/keyboards/synthlabs/solo/config.h b/keyboards/synthlabs/solo/config.h index 3411aa9f68..71170a12ce 100644 --- a/keyboards/synthlabs/solo/config.h +++ b/keyboards/synthlabs/solo/config.h @@ -6,8 +6,6 @@ #define ENCODERS_CW_KEY { { 2, 1 } } #define ENCODERS_CCW_KEY { { 0, 1 } } -#define FORCE_NKRO - #define JOYSTICK_BUTTON_COUNT 13 #define JOYSTICK_AXIS_COUNT 1 #define JOYSTICK_AXIS_RESOLUTION 16 diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json index 14d39d63cc..e90884fc0f 100644 --- a/keyboards/synthlabs/solo/info.json +++ b/keyboards/synthlabs/solo/info.json @@ -15,7 +15,8 @@ "usb": { "vid": "0x534E", "pid": "0x3031", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "encoder": { "rotary": [ -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/synthlabs/solo/info.json | 74 +++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'keyboards/synthlabs/solo') diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json index e90884fc0f..72bd8ae91b 100644 --- a/keyboards/synthlabs/solo/info.json +++ b/keyboards/synthlabs/solo/info.json @@ -29,57 +29,57 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0,0]}, - {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]}, - {"label":"P2 3", "x":4, "y":0, "w":0.5, "h":1.5, "matrix":[0,2]}, - {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]}, - {"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0,4]}, - {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]}, - {"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0,6]}, + {"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0, 0]}, + {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 1]}, + {"label":"P2 3", "x":4, "y":0, "w":0.5, "h":1.5, "matrix":[0, 2]}, + {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 3]}, + {"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 4]}, + {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 5]}, + {"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0, 6]}, - {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]}, - {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]}, - {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]}, + {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1, 0]}, + {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]}, + {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1, 2]}, - {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]}, - {"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,1]}, - {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]}, - {"label":"P2 4", "x":4.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,3]}, - {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]}, - {"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,5]}, - {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]} + {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2, 0]}, + {"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 1]}, + {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2, 2]}, + {"label":"P2 4", "x":4.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 3]}, + {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 4]}, + {"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 5]}, + {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2, 6]} ] }, "LAYOUT_left": { "layout": [ - {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]}, - {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]}, - {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]}, + {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 1]}, + {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 3]}, + {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 5]}, - {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]}, - {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]}, - {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]}, + {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1, 0]}, + {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]}, + {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1, 2]}, - {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]}, - {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]}, - {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]}, - {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]} + {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2, 0]}, + {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2, 2]}, + {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 4]}, + {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2, 6]} ] }, "LAYOUT_right": { "layout": [ - {"label":"P2 6", "x":0.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,5]}, - {"label":"P2 4", "x":1.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,3]}, - {"label":"P2 2", "x":2.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,1]}, + {"label":"P2 6", "x":0.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 5]}, + {"label":"P2 4", "x":1.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 3]}, + {"label":"P2 2", "x":2.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 1]}, - {"label":"Knob CCW", "x":4, "y":1.25, "w":0.5, "matrix":[1,0] }, - {"label":"Knob Press", "x":4.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]}, - {"label":"Knob CW", "x":6, "y":1.25, "w":0.5, "matrix":[1,2]}, + {"label":"Knob CCW", "x":4, "y":1.25, "w":0.5, "matrix":[1, 0]}, + {"label":"Knob Press", "x":4.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]}, + {"label":"Knob CW", "x":6, "y":1.25, "w":0.5, "matrix":[1, 2]}, - {"label":"P2 7", "x":0, "y":2, "w":0.5, "h":1.5, "matrix":[0,6]}, - {"label":"P2 5", "x":1, "y":2, "w":0.5, "h":1.5, "matrix":[0,4]}, - {"label":"P2 3", "x":2, "y":2, "w":0.5, "h":1.5, "matrix":[0,2]}, - {"label":"P2 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[0,0]} + {"label":"P2 7", "x":0, "y":2, "w":0.5, "h":1.5, "matrix":[0, 6]}, + {"label":"P2 5", "x":1, "y":2, "w":0.5, "h":1.5, "matrix":[0, 4]}, + {"label":"P2 3", "x":2, "y":2, "w":0.5, "h":1.5, "matrix":[0, 2]}, + {"label":"P2 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[0, 0]} ] } } -- cgit v1.2.3 From a5e46d80822797cd2e0dc2a2b81c4ccce9e167f4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 May 2023 12:19:34 +1000 Subject: More `info.json` whitespace cleanups (#20665) --- keyboards/synthlabs/solo/info.json | 74 +++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'keyboards/synthlabs/solo') diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json index 72bd8ae91b..168d2d06dc 100644 --- a/keyboards/synthlabs/solo/info.json +++ b/keyboards/synthlabs/solo/info.json @@ -29,57 +29,57 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0, 0]}, - {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 1]}, - {"label":"P2 3", "x":4, "y":0, "w":0.5, "h":1.5, "matrix":[0, 2]}, - {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 3]}, - {"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 4]}, - {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 5]}, - {"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0, 6]}, + {"label": "P2 1", "x": 3, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 0]}, + {"label": "P1 2", "x": 3.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 1]}, + {"label": "P2 3", "x": 4, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 2]}, + {"label": "P1 4", "x": 4.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 3]}, + {"label": "P2 5", "x": 5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 4]}, + {"label": "P1 6", "x": 5.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 5]}, + {"label": "P2 7", "x": 6, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 6]}, - {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1, 0]}, - {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]}, - {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1, 2]}, + {"label": "Knob CCW", "x": 0, "y": 1.25, "w": 0.5, "matrix": [1, 0]}, + {"label": "Knob Press", "x": 0.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]}, + {"label": "Knob CW", "x": 2, "y": 1.25, "w": 0.5, "matrix": [1, 2]}, - {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2, 0]}, - {"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 1]}, - {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2, 2]}, - {"label":"P2 4", "x":4.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 3]}, - {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 4]}, - {"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 5]}, - {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2, 6]} + {"label": "P1 1", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 0]}, + {"label": "P2 2", "x": 3.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 1]}, + {"label": "P1 3", "x": 4, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 2]}, + {"label": "P2 4", "x": 4.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 3]}, + {"label": "P1 5", "x": 5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 4]}, + {"label": "P2 6", "x": 5.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 5]}, + {"label": "P1 7", "x": 6, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 6]} ] }, "LAYOUT_left": { "layout": [ - {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 1]}, - {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 3]}, - {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 5]}, + {"label": "P1 2", "x": 3.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 1]}, + {"label": "P1 4", "x": 4.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 3]}, + {"label": "P1 6", "x": 5.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 5]}, - {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1, 0]}, - {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]}, - {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1, 2]}, + {"label": "Knob CCW", "x": 0, "y": 1.25, "w": 0.5, "matrix": [1, 0]}, + {"label": "Knob Press", "x": 0.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]}, + {"label": "Knob CW", "x": 2, "y": 1.25, "w": 0.5, "matrix": [1, 2]}, - {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2, 0]}, - {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2, 2]}, - {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 4]}, - {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2, 6]} + {"label": "P1 1", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 0]}, + {"label": "P1 3", "x": 4, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 2]}, + {"label": "P1 5", "x": 5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 4]}, + {"label": "P1 7", "x": 6, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 6]} ] }, "LAYOUT_right": { "layout": [ - {"label":"P2 6", "x":0.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 5]}, - {"label":"P2 4", "x":1.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 3]}, - {"label":"P2 2", "x":2.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 1]}, + {"label": "P2 6", "x": 0.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 5]}, + {"label": "P2 4", "x": 1.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 3]}, + {"label": "P2 2", "x": 2.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 1]}, - {"label":"Knob CCW", "x":4, "y":1.25, "w":0.5, "matrix":[1, 0]}, - {"label":"Knob Press", "x":4.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]}, - {"label":"Knob CW", "x":6, "y":1.25, "w":0.5, "matrix":[1, 2]}, + {"label": "Knob CCW", "x": 4, "y": 1.25, "w": 0.5, "matrix": [1, 0]}, + {"label": "Knob Press", "x": 4.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]}, + {"label": "Knob CW", "x": 6, "y": 1.25, "w": 0.5, "matrix": [1, 2]}, - {"label":"P2 7", "x":0, "y":2, "w":0.5, "h":1.5, "matrix":[0, 6]}, - {"label":"P2 5", "x":1, "y":2, "w":0.5, "h":1.5, "matrix":[0, 4]}, - {"label":"P2 3", "x":2, "y":2, "w":0.5, "h":1.5, "matrix":[0, 2]}, - {"label":"P2 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[0, 0]} + {"label": "P2 7", "x": 0, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 6]}, + {"label": "P2 5", "x": 1, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 4]}, + {"label": "P2 3", "x": 2, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 2]}, + {"label": "P2 1", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 0]} ] } } -- cgit v1.2.3