summaryrefslogtreecommitdiff
path: root/keyboards/dailycraft
diff options
context:
space:
mode:
authorjack <0x6A73@pm.me>2023-06-19 09:46:27 -0600
committerGitHub <noreply@github.com>2023-06-19 09:46:27 -0600
commitc4a67d3f3302f3096bb6b15921c9587643164ba9 (patch)
treebf10e469333ba42b708e76cfc085eb450d92359e /keyboards/dailycraft
parent74fbd5a0313769655914166bc872d41461509bd3 (diff)
Remove encoder in-matrix workaround code (#20389)
Diffstat (limited to 'keyboards/dailycraft')
-rw-r--r--keyboards/dailycraft/owl8/info.json15
-rw-r--r--keyboards/dailycraft/owl8/keymaps/default/keymap.c6
-rw-r--r--keyboards/dailycraft/owl8/keymaps/via/keymap.c85
-rw-r--r--keyboards/dailycraft/owl8/keymaps/via/rules.mk1
-rw-r--r--keyboards/dailycraft/stickey4/info.json9
-rw-r--r--keyboards/dailycraft/stickey4/keymaps/default/keymap.c15
-rw-r--r--keyboards/dailycraft/stickey4/keymaps/via/keymap.c87
-rw-r--r--keyboards/dailycraft/stickey4/keymaps/via/rules.mk1
-rw-r--r--keyboards/dailycraft/wings42/rev2/info.json13
-rw-r--r--keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c16
-rw-r--r--keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c166
-rw-r--r--keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk2
12 files changed, 59 insertions, 357 deletions
diff --git a/keyboards/dailycraft/owl8/info.json b/keyboards/dailycraft/owl8/info.json
index b1bcacb60b..194bd5bdb6 100644
--- a/keyboards/dailycraft/owl8/info.json
+++ b/keyboards/dailycraft/owl8/info.json
@@ -18,21 +18,16 @@
18 "bootloader": "atmel-dfu", 18 "bootloader": "atmel-dfu",
19 "matrix_pins": { 19 "matrix_pins": {
20 "direct": [ 20 "direct": [
21 ["F4", "F7", "B3", "B6", "F5", "F6", "B1", "B2", "D4", "C6", "D7", "E6", null, null, null, null] 21 ["F4", "F7", "B3", "B6", "F5", "F6", "B1", "B2", "D4", "C6", "D7", "E6"]
22 ] 22 ]
23 }, 23 },
24 "layouts": { 24 "layouts": {
25 "LAYOUT": { 25 "LAYOUT": {
26 "layout": [ 26 "layout": [
27 {"x": 0, "y": 0, "matrix": [0, 12]}, 27 {"x":0, "y":1.25, "matrix": [0, 8]},
28 {"x": 1, "y": 0, "matrix": [0, 13]}, 28 {"x":1, "y":1.25, "matrix": [0, 9]},
29 {"x": 2, "y": 0, "matrix": [0, 14]}, 29 {"x":2, "y":1.25, "matrix": [0, 10]},
30 {"x": 3, "y": 0, "matrix": [0, 15]}, 30 {"x":3, "y":1.25, "matrix": [0, 11]},
31
32 {"x": 0, "y": 1.25, "matrix": [0, 8]},
33 {"x": 1, "y": 1.25, "matrix": [0, 9]},
34 {"x": 2, "y": 1.25, "matrix": [0, 10]},
35 {"x": 3, "y": 1.25, "matrix": [0, 11]},
36 31
37 {"x": 0, "y": 2.5, "matrix": [0, 0]}, 32 {"x": 0, "y": 2.5, "matrix": [0, 0]},
38 {"x": 1, "y": 2.5, "matrix": [0, 1]}, 33 {"x": 1, "y": 2.5, "matrix": [0, 1]},
diff --git a/keyboards/dailycraft/owl8/keymaps/default/keymap.c b/keyboards/dailycraft/owl8/keymaps/default/keymap.c
index e840263639..7ff5519e5a 100644
--- a/keyboards/dailycraft/owl8/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/owl8/keymaps/default/keymap.c
@@ -25,26 +25,22 @@ enum layer_names {
25 25
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 [_BASE] = LAYOUT( 27 [_BASE] = LAYOUT(
28 KC_NO, KC_NO, KC_NO, KC_NO, // for encoders
29 KC_NO, KC_NO, KC_NO, KC_NO, // for ext keys 28 KC_NO, KC_NO, KC_NO, KC_NO, // for ext keys
30 MO(1), KC_BSPC, KC_SPC, KC_ENT, 29 MO(1), KC_BSPC, KC_SPC, KC_ENT,
31 KC_LEFT, KC_DOWN, KC_UP, KC_RGHT 30 KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
32 ), 31 ),
33 [_FN1] = LAYOUT( 32 [_FN1] = LAYOUT(
34 KC_NO, KC_NO, KC_NO, KC_NO, 33 KC_NO, KC_NO, KC_NO, KC_NO,
35 KC_NO, KC_NO, KC_NO, KC_NO,
36 KC_1, KC_2, KC_3, KC_4, 34 KC_1, KC_2, KC_3, KC_4,
37 KC_5, KC_6, KC_7, KC_8 35 KC_5, KC_6, KC_7, KC_8
38 ), 36 ),
39 [_FN2] = LAYOUT( 37 [_FN2] = LAYOUT(
40 KC_NO, KC_NO, KC_NO, KC_NO, 38 KC_NO, KC_NO, KC_NO, KC_NO,
41 KC_NO, KC_NO, KC_NO, KC_NO,
42 KC_1, KC_2, KC_3, KC_4, 39 KC_1, KC_2, KC_3, KC_4,
43 KC_5, KC_6, KC_7, KC_8 40 KC_5, KC_6, KC_7, KC_8
44 ), 41 ),
45 [_FN3] = LAYOUT( 42 [_FN3] = LAYOUT(
46 KC_NO, KC_NO, KC_NO, KC_NO, 43 KC_NO, KC_NO, KC_NO, KC_NO,
47 KC_NO, KC_NO, KC_NO, KC_NO,
48 KC_1, KC_2, KC_3, KC_4, 44 KC_1, KC_2, KC_3, KC_4,
49 KC_5, KC_6, KC_7, KC_8 45 KC_5, KC_6, KC_7, KC_8
50 ) 46 )
@@ -64,5 +60,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
64 tap_code(KC_UP); 60 tap_code(KC_UP);
65 } 61 }
66 } 62 }
67 return true; 63 return false;
68} 64}
diff --git a/keyboards/dailycraft/owl8/keymaps/via/keymap.c b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
index 1a3bb0f0ae..fcce35bf2b 100644
--- a/keyboards/dailycraft/owl8/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
@@ -25,103 +25,32 @@ enum layer_names {
25 25
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 [_BASE] = LAYOUT( 27 [_BASE] = LAYOUT(
28 KC_NO, KC_NO, KC_NO, KC_NO, // for encoders
29 KC_NO, KC_NO, KC_NO, KC_NO, // for ext keys 28 KC_NO, KC_NO, KC_NO, KC_NO, // for ext keys
30 MO(1), KC_BSPC, KC_SPC, KC_ENT, 29 MO(1), KC_BSPC, KC_SPC, KC_ENT,
31 KC_LEFT, KC_DOWN, KC_UP, KC_RGHT 30 KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
32 ), 31 ),
33 [_FN1] = LAYOUT( 32 [_FN1] = LAYOUT(
34 KC_NO, KC_NO, KC_NO, KC_NO, 33 KC_NO, KC_NO, KC_NO, KC_NO,
35 KC_NO, KC_NO, KC_NO, KC_NO,
36 KC_1, KC_2, KC_3, KC_4, 34 KC_1, KC_2, KC_3, KC_4,
37 KC_5, KC_6, KC_7, KC_8 35 KC_5, KC_6, KC_7, KC_8
38 ), 36 ),
39 [_FN2] = LAYOUT( 37 [_FN2] = LAYOUT(
40 KC_NO, KC_NO, KC_NO, KC_NO, 38 KC_NO, KC_NO, KC_NO, KC_NO,
41 KC_NO, KC_NO, KC_NO, KC_NO,
42 KC_1, KC_2, KC_3, KC_4, 39 KC_1, KC_2, KC_3, KC_4,
43 KC_5, KC_6, KC_7, KC_8 40 KC_5, KC_6, KC_7, KC_8
44 ), 41 ),
45 [_FN3] = LAYOUT( 42 [_FN3] = LAYOUT(
46 KC_NO, KC_NO, KC_NO, KC_NO, 43 KC_NO, KC_NO, KC_NO, KC_NO,
47 KC_NO, KC_NO, KC_NO, KC_NO,
48 KC_1, KC_2, KC_3, KC_4, 44 KC_1, KC_2, KC_3, KC_4,
49 KC_5, KC_6, KC_7, KC_8 45 KC_5, KC_6, KC_7, KC_8
50 ) 46 )
51}; 47};
52 48
53keyevent_t encoder1_ccw = { 49#ifdef ENCODER_MAP_ENABLE
54 .key = (keypos_t){.row = 0, .col = 12}, 50const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
55 .pressed = false, 51 [0] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
56 .type = KEY_EVENT 52 [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
57}; 53 [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
58 54 [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
59keyevent_t encoder1_cw = {
60 .key = (keypos_t){.row = 0, .col = 13},
61 .pressed = false,
62 .type = KEY_EVENT
63};
64
65keyevent_t encoder2_ccw = {
66 .key = (keypos_t){.row = 0, .col = 14},
67 .pressed = false,
68 .type = KEY_EVENT
69}; 55};
70 56#endif
71keyevent_t encoder2_cw = {
72 .key = (keypos_t){.row = 0, .col = 15},
73 .pressed = false,
74 .type = KEY_EVENT
75};
76
77void matrix_scan_user(void) {
78 if (encoder1_ccw.pressed) {
79 encoder1_ccw.pressed = false;
80 encoder1_ccw.time = timer_read();
81 action_exec(encoder1_ccw);
82 }
83
84 if (encoder1_cw.pressed) {
85 encoder1_cw.pressed = false;
86 encoder1_cw.time = timer_read();
87 action_exec(encoder1_cw);
88 }
89
90 if (encoder2_ccw.pressed) {
91 encoder2_ccw.pressed = false;
92 encoder2_ccw.time = timer_read();
93 action_exec(encoder2_ccw);
94 }
95
96 if (encoder2_cw.pressed) {
97 encoder2_cw.pressed = false;
98 encoder2_cw.time = timer_read();
99 action_exec(encoder2_cw);
100 }
101}
102
103bool encoder_update_user(uint8_t index, bool clockwise) {
104 if (index == 0) { /* First encoder */
105 if (clockwise) {
106 encoder1_cw.pressed = true;
107 encoder1_cw.time = timer_read();
108 action_exec(encoder1_cw);
109 } else {
110 encoder1_ccw.pressed = true;
111 encoder1_ccw.time = timer_read();
112 action_exec(encoder1_ccw);
113 }
114 } else if (index == 1) {
115 if (clockwise) {
116 encoder2_cw.pressed = true;
117 encoder2_cw.time = timer_read();
118 action_exec(encoder2_cw);
119 } else {
120 encoder2_ccw.pressed = true;
121 encoder2_ccw.time = timer_read();
122 action_exec(encoder2_ccw);
123 }
124 }
125
126 return true;
127}
diff --git a/keyboards/dailycraft/owl8/keymaps/via/rules.mk b/keyboards/dailycraft/owl8/keymaps/via/rules.mk
index 1e5b99807c..f1adcab005 100644
--- a/keyboards/dailycraft/owl8/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/owl8/keymaps/via/rules.mk
@@ -1 +1,2 @@
1VIA_ENABLE = yes 1VIA_ENABLE = yes
2ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/dailycraft/stickey4/info.json b/keyboards/dailycraft/stickey4/info.json
index c8d5803718..156a6d63a1 100644
--- a/keyboards/dailycraft/stickey4/info.json
+++ b/keyboards/dailycraft/stickey4/info.json
@@ -18,7 +18,7 @@
18 "bootloader": "atmel-dfu", 18 "bootloader": "atmel-dfu",
19 "matrix_pins": { 19 "matrix_pins": {
20 "direct": [ 20 "direct": [
21 ["D4", "C6", "D7", "E6", null, null, null, null] 21 ["D4", "C6", "D7", "E6"]
22 ] 22 ]
23 }, 23 },
24 "layouts": { 24 "layouts": {
@@ -27,12 +27,7 @@
27 {"x": 0, "y": 0, "matrix": [0, 0]}, 27 {"x": 0, "y": 0, "matrix": [0, 0]},
28 {"x": 1, "y": 0, "matrix": [0, 1]}, 28 {"x": 1, "y": 0, "matrix": [0, 1]},
29 {"x": 2, "y": 0, "matrix": [0, 2]}, 29 {"x": 2, "y": 0, "matrix": [0, 2]},
30 {"x": 3, "y": 0, "matrix": [0, 3]}, 30 {"x": 3, "y": 0, "matrix": [0, 3]}
31
32 {"label": "Encoder 1 CCW", "x": 0, "y": 1, "matrix": [0, 4]},
33 {"label": "Encoder 1 CW", "x": 1, "y": 1, "matrix": [0, 5]},
34 {"label": "Encoder 2 CCW", "x": 2, "y": 1, "matrix": [0, 6]},
35 {"label": "Encoder 2 CW", "x": 3, "y": 1, "matrix": [0, 7]}
36 ] 31 ]
37 } 32 }
38 } 33 }
diff --git a/keyboards/dailycraft/stickey4/keymaps/default/keymap.c b/keyboards/dailycraft/stickey4/keymaps/default/keymap.c
index 70de5dca44..40cfc22a0f 100644
--- a/keyboards/dailycraft/stickey4/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/stickey4/keymaps/default/keymap.c
@@ -25,19 +25,6 @@ enum layer_names {
25 25
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 [_BASE] = LAYOUT( 27 [_BASE] = LAYOUT(
28 KC_A, KC_B, KC_C, KC_D, 28 KC_A, KC_B, KC_C, KC_D
29 KC_NO, KC_NO, KC_NO, KC_NO // for encoders
30 ),
31 [_FN1] = LAYOUT(
32 KC_NO, KC_NO, KC_NO, KC_NO,
33 KC_NO, KC_NO, KC_NO, KC_NO
34 ),
35 [_FN2] = LAYOUT(
36 KC_NO, KC_NO, KC_NO, KC_NO,
37 KC_NO, KC_NO, KC_NO, KC_NO
38 ),
39 [_FN3] = LAYOUT(
40 KC_NO, KC_NO, KC_NO, KC_NO,
41 KC_NO, KC_NO, KC_NO, KC_NO
42 ) 29 )
43}; 30};
diff --git a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
index 30de32fa60..d0c681a0d1 100644
--- a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
@@ -25,95 +25,24 @@ enum layer_names {
25 25
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 [_BASE] = LAYOUT( 27 [_BASE] = LAYOUT(
28 KC_A, KC_B, KC_C, KC_D, 28 KC_A, KC_B, KC_C, KC_D
29 KC_NO, KC_NO, KC_NO, KC_NO // for encoders
30 ), 29 ),
31 [_FN1] = LAYOUT( 30 [_FN1] = LAYOUT(
32 KC_NO, KC_NO, KC_NO, KC_NO,
33 KC_NO, KC_NO, KC_NO, KC_NO 31 KC_NO, KC_NO, KC_NO, KC_NO
34 ), 32 ),
35 [_FN2] = LAYOUT( 33 [_FN2] = LAYOUT(
36 KC_NO, KC_NO, KC_NO, KC_NO,
37 KC_NO, KC_NO, KC_NO, KC_NO 34 KC_NO, KC_NO, KC_NO, KC_NO
38 ), 35 ),
39 [_FN3] = LAYOUT( 36 [_FN3] = LAYOUT(
40 KC_NO, KC_NO, KC_NO, KC_NO,
41 KC_NO, KC_NO, KC_NO, KC_NO 37 KC_NO, KC_NO, KC_NO, KC_NO
42 ) 38 )
43}; 39};
44 40
45keyevent_t encoder1_ccw = { 41#ifdef ENCODER_MAP_ENABLE
46 .key = (keypos_t){.row = 0, .col = 4}, 42const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
47 .pressed = false, 43 [0] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
48 .type = KEY_EVENT 44 [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
45 [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
46 [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
49}; 47};
50 48#endif
51keyevent_t encoder1_cw = {
52 .key = (keypos_t){.row = 0, .col = 5},
53 .pressed = false,
54 .type = KEY_EVENT
55};
56
57keyevent_t encoder2_ccw = {
58 .key = (keypos_t){.row = 0, .col = 6},
59 .pressed = false,
60 .type = KEY_EVENT
61};
62
63keyevent_t encoder2_cw = {
64 .key = (keypos_t){.row = 0, .col = 7},
65 .pressed = false,
66 .type = KEY_EVENT
67};
68
69void matrix_scan_user(void) {
70 if (encoder1_ccw.pressed) {
71 encoder1_ccw.pressed = false;
72 encoder1_ccw.time = timer_read();
73 action_exec(encoder1_ccw);
74 }
75
76 if (encoder1_cw.pressed) {
77 encoder1_cw.pressed = false;
78 encoder1_cw.time = timer_read();
79 action_exec(encoder1_cw);
80 }
81
82 if (encoder2_ccw.pressed) {
83 encoder2_ccw.pressed = false;
84 encoder2_ccw.time = timer_read();
85 action_exec(encoder2_ccw);
86 }
87
88 if (encoder2_cw.pressed) {
89 encoder2_cw.pressed = false;
90 encoder2_cw.time = timer_read();
91 action_exec(encoder2_cw);
92 }
93}
94
95bool encoder_update_user(uint8_t index, bool clockwise) {
96 if (index == 0) { /* First encoder */
97 if (clockwise) {
98 encoder1_cw.pressed = true;
99 encoder1_cw.time = timer_read();
100 action_exec(encoder1_cw);
101 } else {
102 encoder1_ccw.pressed = true;
103 encoder1_ccw.time = timer_read();
104 action_exec(encoder1_ccw);
105 }
106 } else if (index == 1) {
107 if (clockwise) {
108 encoder2_cw.pressed = true;
109 encoder2_cw.time = timer_read();
110 action_exec(encoder2_cw);
111 } else {
112 encoder2_ccw.pressed = true;
113 encoder2_ccw.time = timer_read();
114 action_exec(encoder2_ccw);
115 }
116 }
117
118 return true;
119}
diff --git a/keyboards/dailycraft/stickey4/keymaps/via/rules.mk b/keyboards/dailycraft/stickey4/keymaps/via/rules.mk
index 1e5b99807c..f1adcab005 100644
--- a/keyboards/dailycraft/stickey4/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/stickey4/keymaps/via/rules.mk
@@ -1 +1,2 @@
1VIA_ENABLE = yes 1VIA_ENABLE = yes
2ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json
index 09cf423e93..261157627a 100644
--- a/keyboards/dailycraft/wings42/rev2/info.json
+++ b/keyboards/dailycraft/wings42/rev2/info.json
@@ -16,6 +16,15 @@
16 "split": { 16 "split": {
17 "soft_serial_pin": "D2" 17 "soft_serial_pin": "D2"
18 }, 18 },
19 "features": {
20 "encoder": true
21 },
22 "encoder": {
23 "rotary": [
24 { "pin_a": "B5", "pin_b": "B4" },
25 { "pin_a": "B6", "pin_b": "B2" }
26 ]
27 },
19 "processor": "atmega32u4", 28 "processor": "atmega32u4",
20 "bootloader": "caterina", 29 "bootloader": "caterina",
21 "layouts": { 30 "layouts": {
@@ -41,9 +50,7 @@
41 {"matrix": [1, 3], "x": 3, "y": 1}, 50 {"matrix": [1, 3], "x": 3, "y": 1},
42 {"matrix": [1, 4], "x": 4, "y": 1}, 51 {"matrix": [1, 4], "x": 4, "y": 1},
43 {"matrix": [1, 5], "x": 5, "y": 1.125}, 52 {"matrix": [1, 5], "x": 5, "y": 1.125},
44 {"matrix": [3, 1], "x": 6, "y": 1.625},
45 53
46 {"matrix": [8, 2], "x": 8, "y": 1.625},
47 {"matrix": [6, 5], "x": 9, "y": 1.125}, 54 {"matrix": [6, 5], "x": 9, "y": 1.125},
48 {"matrix": [6, 4], "x": 10, "y": 1}, 55 {"matrix": [6, 4], "x": 10, "y": 1},
49 {"matrix": [6, 3], "x": 11, "y": 1}, 56 {"matrix": [6, 3], "x": 11, "y": 1},
@@ -57,9 +64,7 @@
57 {"matrix": [2, 3], "x": 3, "y": 2}, 64 {"matrix": [2, 3], "x": 3, "y": 2},
58 {"matrix": [2, 4], "x": 4, "y": 2}, 65 {"matrix": [2, 4], "x": 4, "y": 2},
59 {"matrix": [2, 5], "x": 5, "y": 2.125}, 66 {"matrix": [2, 5], "x": 5, "y": 2.125},
60 {"matrix": [3, 2], "x": 6, "y": 2.625},
61 67
62 {"matrix": [8, 1], "x": 8, "y": 2.625},
63 {"matrix": [7, 5], "x": 9, "y": 2.125}, 68 {"matrix": [7, 5], "x": 9, "y": 2.125},
64 {"matrix": [7, 4], "x": 10, "y": 2}, 69 {"matrix": [7, 4], "x": 10, "y": 2},
65 {"matrix": [7, 3], "x": 11, "y": 2}, 70 {"matrix": [7, 3], "x": 11, "y": 2},
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
index 501b5d2e12..d809d59f4c 100644
--- a/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
@@ -35,9 +35,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 //,--------+--------+--------+--------+--------+--------. ,--------+---------+--------+---------+--------+--------. 35 //,--------+--------+--------+--------+--------+--------. ,--------+---------+--------+---------+--------+--------.
36 KC_ESC , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS, 36 KC_ESC , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS,
37 //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------| 37 //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
38 KC_G_TAB, KC_A , KC_S , KC_D , KC_F , KC_G , KC_BSPC, KC_BSPC, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_G_BS, 38 KC_G_TAB, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_G_BS,
39 //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------| 39 //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
40 KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_DEL , KC_DEL , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RCTL, 40 KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RCTL,
41 //`--------+--------+--------+--------+--------+--------/ \--------+---------+--------+---------+--------+--------' 41 //`--------+--------+--------+--------+--------+--------/ \--------+---------+--------+---------+--------+--------'
42 KC_A_DEL,KC_S_EN ,KC_L_SPC, KC_R_ENT, KC_S_JA , KC_A_DEL 42 KC_A_DEL,KC_S_EN ,KC_L_SPC, KC_R_ENT, KC_S_JA , KC_A_DEL
43 // `+--------+--------+--------' `--------+---------+--------+' 43 // `+--------+--------+--------' `--------+---------+--------+'
@@ -47,9 +47,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
47 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. 47 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
48 _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE, KC_AT , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS, 48 _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE, KC_AT , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
49 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 49 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
50 KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD, _______, _______, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_GRV , KC_RPRN, 50 KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
51 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 51 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
52 _______, _______, _______, _______, KC_LCBR, KC_LBRC, _______, _______, KC_RBRC, KC_RCBR, _______, _______, _______, _______, 52 _______, _______, _______, _______, KC_LCBR, KC_LBRC, KC_RBRC, KC_RCBR, _______, _______, _______, _______,
53 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' 53 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
54 _______, _______, _______, _______, _______, QK_BOOT 54 _______, _______, _______, _______, _______, QK_BOOT
55 // `+--------+--------+--------' `--------+-------+--------+' 55 // `+--------+--------+--------' `--------+-------+--------+'
@@ -59,9 +59,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
59 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. 59 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
60 KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS, 60 KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
61 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 61 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
62 _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , _______, _______, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______, 62 _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______,
63 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 63 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
64 KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______, 64 KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
65 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' 65 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
66 QK_BOOT , _______, _______, _______, _______, _______ 66 QK_BOOT , _______, _______, _______, _______, _______
67 // `+--------+--------+--------' `--------+--------+--------+' 67 // `+--------+--------+--------' `--------+--------+--------+'
@@ -71,9 +71,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
71 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. 71 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
72 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 72 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
73 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 73 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
74 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 74 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
75 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 75 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
76 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 76 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
77 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' 77 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
78 _______, _______, _______, _______, _______, _______ 78 _______, _______, _______, _______, _______, _______
79 // `+--------+--------+--------' `--------+--------+--------+' 79 // `+--------+--------+--------' `--------+--------+--------+'
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
index 7349bf2411..b52b054881 100644
--- a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
@@ -35,9 +35,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 //,--------+--------+--------+--------+--------+--------. ,--------+---------+--------+---------+--------+--------. 35 //,--------+--------+--------+--------+--------+--------. ,--------+---------+--------+---------+--------+--------.
36 KC_ESC , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS, 36 KC_ESC , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS,
37 //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------| 37 //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
38 KC_G_TAB, KC_A , KC_S , KC_D , KC_F , KC_G , KC_BSPC, KC_BSPC, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_G_BS, 38 KC_G_TAB, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_G_BS,
39 //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------| 39 //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
40 KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_DEL , KC_DEL , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RCTL, 40 KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RCTL,
41 //`--------+--------+--------+--------+--------+--------/ \--------+---------+--------+---------+--------+--------' 41 //`--------+--------+--------+--------+--------+--------/ \--------+---------+--------+---------+--------+--------'
42 KC_A_DEL,KC_S_EN ,KC_L_SPC, KC_R_ENT, KC_S_JA , KC_A_DEL 42 KC_A_DEL,KC_S_EN ,KC_L_SPC, KC_R_ENT, KC_S_JA , KC_A_DEL
43 // `+--------+--------+--------' `--------+---------+--------+' 43 // `+--------+--------+--------' `--------+---------+--------+'
@@ -47,9 +47,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
47 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. 47 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
48 _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE, KC_AT , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS, 48 _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE, KC_AT , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
49 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 49 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
50 KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD, _______, _______, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_GRV , KC_RPRN, 50 KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
51 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 51 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
52 _______, _______, _______, _______, KC_LCBR, KC_LBRC, _______, _______, KC_RBRC, KC_RCBR, _______, _______, _______, _______, 52 _______, _______, _______, _______, KC_LCBR, KC_LBRC, KC_RBRC, KC_RCBR, _______, _______, _______, _______,
53 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' 53 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
54 _______, _______, _______, _______, _______, QK_BOOT 54 _______, _______, _______, _______, _______, QK_BOOT
55 // `+--------+--------+--------' `--------+-------+--------+' 55 // `+--------+--------+--------' `--------+-------+--------+'
@@ -59,9 +59,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
59 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. 59 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
60 KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS, 60 KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
61 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 61 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
62 _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , _______, _______, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______, 62 _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______,
63 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 63 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
64 KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______, 64 KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
65 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' 65 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
66 QK_BOOT , _______, _______, _______, _______, _______ 66 QK_BOOT , _______, _______, _______, _______, _______
67 // `+--------+--------+--------' `--------+--------+--------+' 67 // `+--------+--------+--------' `--------+--------+--------+'
@@ -71,156 +71,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
71 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. 71 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
72 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 72 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
73 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 73 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
74 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 74 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
75 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 75 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
76 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 76 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
77 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' 77 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
78 _______, _______, _______, _______, _______, _______ 78 _______, _______, _______, _______, _______, _______
79 // `+--------+--------+--------' `--------+--------+--------+' 79 // `+--------+--------+--------' `--------+--------+--------+'
80 ), 80 ),
81}; 81};
82 82
83keyevent_t encoder1_ccw = { 83#ifdef ENCODER_MAP_ENABLE
84 .key = (keypos_t){.row = 4, .col = 0}, 84const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
85 .pressed = false, 85 [0] = { ENCODER_CCW_CW(KC_BSPC, KC_DEL), ENCODER_CCW_CW(KC_BSPC, KC_DEL) },
86 .type = KEY_EVENT 86 [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
87}; 87 [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
88 88 [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
89keyevent_t encoder1_cw = {
90 .key = (keypos_t){.row = 4, .col = 1},
91 .pressed = false,
92 .type = KEY_EVENT
93};
94
95keyevent_t encoder2_ccw = {
96 .key = (keypos_t){.row = 4, .col = 2},
97 .pressed = false,
98 .type = KEY_EVENT
99};
100
101keyevent_t encoder2_cw = {
102 .key = (keypos_t){.row = 4, .col = 3},
103 .pressed = false,
104 .type = KEY_EVENT
105};
106
107keyevent_t encoder3_ccw = {
108 .key = (keypos_t){.row = 9, .col = 1},
109 .pressed = false,
110 .type = KEY_EVENT
111};
112
113keyevent_t encoder3_cw = {
114 .key = (keypos_t){.row = 9, .col = 0},
115 .pressed = false,
116 .type = KEY_EVENT
117};
118
119keyevent_t encoder4_ccw = {
120 .key = (keypos_t){.row = 9, .col = 3},
121 .pressed = false,
122 .type = KEY_EVENT
123}; 89};
124 90#endif
125keyevent_t encoder4_cw = {
126 .key = (keypos_t){.row = 9, .col = 2},
127 .pressed = false,
128 .type = KEY_EVENT
129};
130
131
132void matrix_scan_user(void) {
133 if (encoder1_ccw.pressed) {
134 encoder1_ccw.pressed = false;
135 encoder1_ccw.time = timer_read();
136 action_exec(encoder1_ccw);
137 }
138
139 if (encoder1_cw.pressed) {
140 encoder1_cw.pressed = false;
141 encoder1_cw.time = timer_read();
142 action_exec(encoder1_cw);
143 }
144
145 if (encoder2_ccw.pressed) {
146 encoder2_ccw.pressed = false;
147 encoder2_ccw.time = timer_read();
148 action_exec(encoder2_ccw);
149 }
150
151 if (encoder2_cw.pressed) {
152 encoder2_cw.pressed = false;
153 encoder2_cw.time = timer_read();
154 action_exec(encoder2_cw);
155 }
156
157 if (encoder3_ccw.pressed) {
158 encoder3_ccw.pressed = false;
159 encoder3_ccw.time = timer_read();
160 action_exec(encoder3_ccw);
161 }
162
163 if (encoder3_cw.pressed) {
164 encoder3_cw.pressed = false;
165 encoder3_cw.time = timer_read();
166 action_exec(encoder3_cw);
167 }
168
169 if (encoder4_ccw.pressed) {
170 encoder4_ccw.pressed = false;
171 encoder4_ccw.time = timer_read();
172 action_exec(encoder4_ccw);
173 }
174
175 if (encoder4_cw.pressed) {
176 encoder4_cw.pressed = false;
177 encoder4_cw.time = timer_read();
178 action_exec(encoder4_cw);
179 }
180}
181
182bool encoder_update_user(uint8_t index, bool clockwise) {
183 if (index == 0) {
184 if (clockwise) {
185 encoder1_cw.pressed = true;
186 encoder1_cw.time = timer_read();
187 action_exec(encoder1_cw);
188 } else {
189 encoder1_ccw.pressed = true;
190 encoder1_ccw.time = timer_read();
191 action_exec(encoder1_ccw);
192 }
193 } else if (index == 1) {
194 if (clockwise) {
195 encoder2_cw.pressed = true;
196 encoder2_cw.time = timer_read();
197 action_exec(encoder2_cw);
198 } else {
199 encoder2_ccw.pressed = true;
200 encoder2_ccw.time = timer_read();
201 action_exec(encoder2_ccw);
202 }
203 } else if (index == 2) {
204 if (clockwise) {
205 encoder3_cw.pressed = true;
206 encoder3_cw.time = timer_read();
207 action_exec(encoder3_cw);
208 } else {
209 encoder3_ccw.pressed = true;
210 encoder3_ccw.time = timer_read();
211 action_exec(encoder3_ccw);
212 }
213 } else if (index == 3) {
214 if (clockwise) {
215 encoder4_cw.pressed = true;
216 encoder4_cw.time = timer_read();
217 action_exec(encoder4_cw);
218 } else {
219 encoder4_ccw.pressed = true;
220 encoder4_ccw.time = timer_read();
221 action_exec(encoder4_ccw);
222 }
223 }
224
225 return true;
226}
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk b/keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk
index eea5e1e2a2..f1adcab005 100644
--- a/keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
1ENCODER_ENABLE = yes
2VIA_ENABLE = yes 1VIA_ENABLE = yes
2ENCODER_MAP_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:37:34 +0000