summaryrefslogtreecommitdiff
path: root/keyboards/dailycraft/wings42/rev2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/dailycraft/wings42/rev2')
-rw-r--r--keyboards/dailycraft/wings42/rev2/config.h17
-rw-r--r--keyboards/dailycraft/wings42/rev2/info.json101
-rw-r--r--keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c72
-rw-r--r--keyboards/dailycraft/wings42/rev2/rev2.c17
-rw-r--r--keyboards/dailycraft/wings42/rev2/rev2.h46
5 files changed, 95 insertions, 158 deletions
diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h
index bd115ee140..7da6e3f1bf 100644
--- a/keyboards/dailycraft/wings42/rev2/config.h
+++ b/keyboards/dailycraft/wings42/rev2/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, NO_PIN }
-#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json
index bd8e97916a..09cf423e93 100644
--- a/keyboards/dailycraft/wings42/rev2/info.json
+++ b/keyboards/dailycraft/wings42/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0x0005",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D4", "C6", "D7", "E6", null]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
@@ -16,55 +21,59 @@
"layouts": {
"LAYOUT_split_3x6_3_2": {
"layout": [
- {"label":"L00", "x":0, "y":0.875},
- {"label":"L01", "x":1, "y":0.625},
- {"label":"L02", "x":2, "y":0.375},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0.125},
- {"label":"R00", "x":9, "y":0.125},
- {"label":"R01", "x":10, "y":0},
- {"label":"R02", "x":11, "y":0},
- {"label":"R03", "x":12, "y":0.375},
- {"label":"R04", "x":13, "y":0.625},
- {"label":"R05", "x":14, "y":0.875},
+ {"matrix": [0, 0], "x": 0, "y": 0.875},
+ {"matrix": [0, 1], "x": 1, "y": 0.625},
+ {"matrix": [0, 2], "x": 2, "y": 0.375},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0.125},
+
+ {"matrix": [5, 5], "x": 9, "y": 0.125},
+ {"matrix": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0.375},
+ {"matrix": [5, 1], "x": 13, "y": 0.625},
+ {"matrix": [5, 0], "x": 14, "y": 0.875},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.875},
+ {"matrix": [1, 1], "x": 1, "y": 1.625},
+ {"matrix": [1, 2], "x": 2, "y": 1.375},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1.125},
+ {"matrix": [3, 1], "x": 6, "y": 1.625},
+
+ {"matrix": [8, 2], "x": 8, "y": 1.625},
+ {"matrix": [6, 5], "x": 9, "y": 1.125},
+ {"matrix": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1.375},
+ {"matrix": [6, 1], "x": 13, "y": 1.625},
+ {"matrix": [6, 0], "x": 14, "y": 1.875},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.875},
+ {"matrix": [2, 1], "x": 1, "y": 2.625},
+ {"matrix": [2, 2], "x": 2, "y": 2.375},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2.125},
+ {"matrix": [3, 2], "x": 6, "y": 2.625},
- {"label":"L10", "x":0, "y":1.875},
- {"label":"L11", "x":1, "y":1.625},
- {"label":"L12", "x":2, "y":1.375},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1.125},
- {"label":"L31", "x":6, "y":1.625},
- {"label":"R33", "x":8, "y":1.625},
- {"label":"R10", "x":9, "y":1.125},
- {"label":"R11", "x":10, "y":1},
- {"label":"R12", "x":11, "y":1},
- {"label":"R13", "x":12, "y":1.375},
- {"label":"R14", "x":13, "y":1.625},
- {"label":"R15", "x":14, "y":1.875},
+ {"matrix": [8, 1], "x": 8, "y": 2.625},
+ {"matrix": [7, 5], "x": 9, "y": 2.125},
+ {"matrix": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2.375},
+ {"matrix": [7, 1], "x": 13, "y": 2.625},
+ {"matrix": [7, 0], "x": 14, "y": 2.875},
- {"label":"L20", "x":0, "y":2.875},
- {"label":"L21", "x":1, "y":2.625},
- {"label":"L22", "x":2, "y":2.375},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2.125},
- {"label":"L32", "x":6, "y":2.625},
- {"label":"R34", "x":8, "y":2.625},
- {"label":"R20", "x":9, "y":2.125},
- {"label":"R21", "x":10, "y":2},
- {"label":"R22", "x":11, "y":2},
- {"label":"R23", "x":12, "y":2.375},
- {"label":"R24", "x":13, "y":2.625},
- {"label":"R25", "x":14, "y":2.875},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3.125},
+ {"matrix": [3, 5], "x": 6, "y": 3.375},
- {"label":"L33", "x":4, "y":3},
- {"label":"L34", "x":5, "y":3.125},
- {"label":"L35", "x":6, "y":3.375},
- {"label":"R30", "x":8, "y":3.375},
- {"label":"R31", "x":9, "y":3.125},
- {"label":"R32", "x":10, "y":3}
+ {"matrix": [8, 5], "x": 8, "y": 3.375},
+ {"matrix": [8, 4], "x": 9, "y": 3.125},
+ {"matrix": [8, 3], "x": 10, "y": 3}
]
}
}
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
index 97f94366a8..7349bf2411 100644
--- a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
@@ -82,91 +82,99 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
keyevent_t encoder1_ccw = {
.key = (keypos_t){.row = 4, .col = 0},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder1_cw = {
.key = (keypos_t){.row = 4, .col = 1},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder2_ccw = {
.key = (keypos_t){.row = 4, .col = 2},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder2_cw = {
.key = (keypos_t){.row = 4, .col = 3},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder3_ccw = {
.key = (keypos_t){.row = 9, .col = 1},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder3_cw = {
.key = (keypos_t){.row = 9, .col = 0},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder4_ccw = {
.key = (keypos_t){.row = 9, .col = 3},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder4_cw = {
.key = (keypos_t){.row = 9, .col = 2},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
void matrix_scan_user(void) {
- if (IS_PRESSED(encoder1_ccw)) {
+ if (encoder1_ccw.pressed) {
encoder1_ccw.pressed = false;
- encoder1_ccw.time = (timer_read() | 1);
+ encoder1_ccw.time = timer_read();
action_exec(encoder1_ccw);
}
- if (IS_PRESSED(encoder1_cw)) {
+ if (encoder1_cw.pressed) {
encoder1_cw.pressed = false;
- encoder1_cw.time = (timer_read() | 1);
+ encoder1_cw.time = timer_read();
action_exec(encoder1_cw);
}
- if (IS_PRESSED(encoder2_ccw)) {
+ if (encoder2_ccw.pressed) {
encoder2_ccw.pressed = false;
- encoder2_ccw.time = (timer_read() | 1);
+ encoder2_ccw.time = timer_read();
action_exec(encoder2_ccw);
}
- if (IS_PRESSED(encoder2_cw)) {
+ if (encoder2_cw.pressed) {
encoder2_cw.pressed = false;
- encoder2_cw.time = (timer_read() | 1);
+ encoder2_cw.time = timer_read();
action_exec(encoder2_cw);
}
- if (IS_PRESSED(encoder3_ccw)) {
+ if (encoder3_ccw.pressed) {
encoder3_ccw.pressed = false;
- encoder3_ccw.time = (timer_read() | 1);
+ encoder3_ccw.time = timer_read();
action_exec(encoder3_ccw);
}
- if (IS_PRESSED(encoder3_cw)) {
+ if (encoder3_cw.pressed) {
encoder3_cw.pressed = false;
- encoder3_cw.time = (timer_read() | 1);
+ encoder3_cw.time = timer_read();
action_exec(encoder3_cw);
}
- if (IS_PRESSED(encoder4_ccw)) {
+ if (encoder4_ccw.pressed) {
encoder4_ccw.pressed = false;
- encoder4_ccw.time = (timer_read() | 1);
+ encoder4_ccw.time = timer_read();
action_exec(encoder4_ccw);
}
- if (IS_PRESSED(encoder4_cw)) {
+ if (encoder4_cw.pressed) {
encoder4_cw.pressed = false;
- encoder4_cw.time = (timer_read() | 1);
+ encoder4_cw.time = timer_read();
action_exec(encoder4_cw);
}
}
@@ -175,41 +183,41 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
if (clockwise) {
encoder1_cw.pressed = true;
- encoder1_cw.time = (timer_read() | 1);
+ encoder1_cw.time = timer_read();
action_exec(encoder1_cw);
} else {
encoder1_ccw.pressed = true;
- encoder1_ccw.time = (timer_read() | 1);
+ encoder1_ccw.time = timer_read();
action_exec(encoder1_ccw);
}
} else if (index == 1) {
if (clockwise) {
encoder2_cw.pressed = true;
- encoder2_cw.time = (timer_read() | 1);
+ encoder2_cw.time = timer_read();
action_exec(encoder2_cw);
} else {
encoder2_ccw.pressed = true;
- encoder2_ccw.time = (timer_read() | 1);
+ encoder2_ccw.time = timer_read();
action_exec(encoder2_ccw);
}
} else if (index == 2) {
if (clockwise) {
encoder3_cw.pressed = true;
- encoder3_cw.time = (timer_read() | 1);
+ encoder3_cw.time = timer_read();
action_exec(encoder3_cw);
} else {
encoder3_ccw.pressed = true;
- encoder3_ccw.time = (timer_read() | 1);
+ encoder3_ccw.time = timer_read();
action_exec(encoder3_ccw);
}
} else if (index == 3) {
if (clockwise) {
encoder4_cw.pressed = true;
- encoder4_cw.time = (timer_read() | 1);
+ encoder4_cw.time = timer_read();
action_exec(encoder4_cw);
} else {
encoder4_ccw.pressed = true;
- encoder4_ccw.time = (timer_read() | 1);
+ encoder4_ccw.time = timer_read();
action_exec(encoder4_ccw);
}
}
diff --git a/keyboards/dailycraft/wings42/rev2/rev2.c b/keyboards/dailycraft/wings42/rev2/rev2.c
deleted file mode 100644
index 96aa6cd314..0000000000
--- a/keyboards/dailycraft/wings42/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/dailycraft/wings42/rev2/rev2.h b/keyboards/dailycraft/wings42/rev2/rev2.h
deleted file mode 100644
index 4720592264..0000000000
--- a/keyboards/dailycraft/wings42/rev2/rev2.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x6_3_2( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, L31, R33, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L32, R34, R20, R21, R22, R23, R24, R25, \
- L33, L34, L35, R30, R31, R32 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { KC_NO, L31, L32, L33, L34, L35 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { KC_NO, R34, R33, R32, R31, R30 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
- }