summaryrefslogtreecommitdiff
path: root/keyboards/rmi_kb/chevron
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rmi_kb/chevron')
-rw-r--r--keyboards/rmi_kb/chevron/chevron.c17
-rw-r--r--keyboards/rmi_kb/chevron/chevron.h75
-rw-r--r--keyboards/rmi_kb/chevron/config.h18
-rw-r--r--keyboards/rmi_kb/chevron/info.json309
-rw-r--r--keyboards/rmi_kb/chevron/keymaps/via/keymap.c18
5 files changed, 167 insertions, 270 deletions
diff --git a/keyboards/rmi_kb/chevron/chevron.c b/keyboards/rmi_kb/chevron/chevron.c
deleted file mode 100644
index 5b15d3324c..0000000000
--- a/keyboards/rmi_kb/chevron/chevron.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * 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 "chevron.h"
diff --git a/keyboards/rmi_kb/chevron/chevron.h b/keyboards/rmi_kb/chevron/chevron.h
deleted file mode 100644
index 0f95555c55..0000000000
--- a/keyboards/rmi_kb/chevron/chevron.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * 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 XXX KC_NO
-
-#define LAYOUT_ansi( \
- k1d, \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, k2d, \
- k30, k31, k32, k34, k36, k38, k3b, k3c, k3d \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c, k2d }, \
- { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, XXX, XXX, k3b, k3c, k3d }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-}
-
-#define LAYOUT_iso( \
- k1d, \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k0d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, k2d, \
- k30, k31, k32, k34, k36, k38, k3b, k3c, k3d \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c, k2d }, \
- { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, XXX, XXX, k3b, k3c, k3d }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-}
-
-#define LAYOUT_all( \
- k40, k1d, k41, \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, k2d, \
- k30, k31, k32, k34, k36, k38, k3b, k3c, k3d \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c, k2d }, \
- { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, XXX, XXX, k3b, k3c, k3d }, \
- { k40, k41, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-}
diff --git a/keyboards/rmi_kb/chevron/config.h b/keyboards/rmi_kb/chevron/config.h
index cd4c43391b..7cc6ae4689 100644
--- a/keyboards/rmi_kb/chevron/config.h
+++ b/keyboards/rmi_kb/chevron/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 { D5, D6, C0, D7, NO_PIN }
-#define MATRIX_COL_PINS { A5, A6, A7, C7, C6, C5, C4, C3, C2, C1, A4, A3, A2, B4 }
-
-/* 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 */
@@ -57,4 +40,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* QoL improvements */
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/rmi_kb/chevron/info.json b/keyboards/rmi_kb/chevron/info.json
index bdca6506f1..ef1d823536 100644
--- a/keyboards/rmi_kb/chevron/info.json
+++ b/keyboards/rmi_kb/chevron/info.json
@@ -8,6 +8,11 @@
"pid": "0xC4EE",
"device_version": "0.1.2"
},
+ "matrix_pins": {
+ "cols": ["A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "A4", "A3", "A2", "B4"],
+ "rows": ["D5", "D6", "C0", "D7", null]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A0", "pin_b": "A1"}
@@ -18,178 +23,178 @@
"layouts": {
"LAYOUT_ansi": {
"layout": [
- {"x":13.5, "y":0},
+ {"matrix": [1, 13], "x": 13.5, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
- {"x":12, "y":1},
- {"x":13, "y":1, "w":1.5},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 8], "x": 8, "y": 1},
+ {"matrix": [0, 9], "x": 9, "y": 1},
+ {"matrix": [0, 10], "x": 10, "y": 1},
+ {"matrix": [0, 11], "x": 11, "y": 1},
+ {"matrix": [0, 12], "x": 12, "y": 1},
+ {"matrix": [0, 13], "x": 13, "y": 1, "w": 1.5},
- {"x":0, "y":2, "w":1.25},
- {"x":1.25, "y":2},
- {"x":2.25, "y":2},
- {"x":3.25, "y":2},
- {"x":4.25, "y":2},
- {"x":5.25, "y":2},
- {"x":6.25, "y":2},
- {"x":7.25, "y":2},
- {"x":8.25, "y":2},
- {"x":9.25, "y":2},
- {"x":10.25, "y":2},
- {"x":11.25, "y":2},
- {"x":12.25, "y":2, "w":2.25},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2},
+ {"matrix": [1, 2], "x": 2.25, "y": 2},
+ {"matrix": [1, 3], "x": 3.25, "y": 2},
+ {"matrix": [1, 4], "x": 4.25, "y": 2},
+ {"matrix": [1, 5], "x": 5.25, "y": 2},
+ {"matrix": [1, 6], "x": 6.25, "y": 2},
+ {"matrix": [1, 7], "x": 7.25, "y": 2},
+ {"matrix": [1, 8], "x": 8.25, "y": 2},
+ {"matrix": [1, 9], "x": 9.25, "y": 2},
+ {"matrix": [1, 10], "x": 10.25, "y": 2},
+ {"matrix": [1, 11], "x": 11.25, "y": 2},
+ {"matrix": [1, 12], "x": 12.25, "y": 2, "w": 2.25},
- {"x":0, "y":3, "w":1.75},
- {"x":1.75, "y":3},
- {"x":2.75, "y":3},
- {"x":3.75, "y":3},
- {"x":4.75, "y":3},
- {"x":5.75, "y":3},
- {"x":6.75, "y":3},
- {"x":7.75, "y":3},
- {"x":8.75, "y":3},
- {"x":9.75, "y":3},
- {"x":10.75, "y":3},
- {"x":11.75, "y":3, "w":1.75},
- {"x":13.5, "y":3},
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3},
+ {"matrix": [2, 2], "x": 2.75, "y": 3},
+ {"matrix": [2, 3], "x": 3.75, "y": 3},
+ {"matrix": [2, 4], "x": 4.75, "y": 3},
+ {"matrix": [2, 5], "x": 5.75, "y": 3},
+ {"matrix": [2, 6], "x": 6.75, "y": 3},
+ {"matrix": [2, 7], "x": 7.75, "y": 3},
+ {"matrix": [2, 8], "x": 8.75, "y": 3},
+ {"matrix": [2, 9], "x": 9.75, "y": 3},
+ {"matrix": [2, 10], "x": 10.75, "y": 3},
+ {"matrix": [2, 12], "x": 11.75, "y": 3, "w": 1.75},
+ {"matrix": [2, 13], "x": 13.5, "y": 3},
- {"x":0, "y":4, "w":1.25},
- {"x":1.25, "y":4, "w":1.25},
- {"x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":3},
- {"x":6.75, "y":4},
- {"x":7.75, "y":4, "w":3},
- {"x":10.75, "y":4, "w":1.25},
- {"x":12, "y":4, "w":1.25},
- {"x":13.25, "y":4, "w":1.25}
+ {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 4, "w": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 4},
+ {"matrix": [3, 8], "x": 7.75, "y": 4, "w": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 4, "w": 1.25},
+ {"matrix": [3, 12], "x": 12, "y": 4, "w": 1.25},
+ {"matrix": [3, 13], "x": 13.25, "y": 4, "w": 1.25}
]
},
"LAYOUT_iso": {
"layout": [
- {"x":13.5, "y":0},
+ {"matrix": [1, 13], "x": 13.5, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
- {"x":12, "y":1},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 8], "x": 8, "y": 1},
+ {"matrix": [0, 9], "x": 9, "y": 1},
+ {"matrix": [0, 10], "x": 10, "y": 1},
+ {"matrix": [0, 11], "x": 11, "y": 1},
+ {"matrix": [0, 12], "x": 12, "y": 1},
- {"x":0, "y":2, "w":1.25},
- {"x":1.25, "y":2},
- {"x":2.25, "y":2},
- {"x":3.25, "y":2},
- {"x":4.25, "y":2},
- {"x":5.25, "y":2},
- {"x":6.25, "y":2},
- {"x":7.25, "y":2},
- {"x":8.25, "y":2},
- {"x":9.25, "y":2},
- {"x":10.25, "y":2},
- {"x":11.25, "y":2},
- {"x":12.25, "y":2},
- {"x":13.25, "y":1, "w":1.25, "h":2},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2},
+ {"matrix": [1, 2], "x": 2.25, "y": 2},
+ {"matrix": [1, 3], "x": 3.25, "y": 2},
+ {"matrix": [1, 4], "x": 4.25, "y": 2},
+ {"matrix": [1, 5], "x": 5.25, "y": 2},
+ {"matrix": [1, 6], "x": 6.25, "y": 2},
+ {"matrix": [1, 7], "x": 7.25, "y": 2},
+ {"matrix": [1, 8], "x": 8.25, "y": 2},
+ {"matrix": [1, 9], "x": 9.25, "y": 2},
+ {"matrix": [1, 10], "x": 10.25, "y": 2},
+ {"matrix": [1, 11], "x": 11.25, "y": 2},
+ {"matrix": [1, 12], "x": 12.25, "y": 2},
+ {"matrix": [0, 13], "x": 13.25, "y": 1, "w": 1.25, "h": 2},
- {"x":0, "y":3, "w":1.75},
- {"x":1.75, "y":3},
- {"x":2.75, "y":3},
- {"x":3.75, "y":3},
- {"x":4.75, "y":3},
- {"x":5.75, "y":3},
- {"x":6.75, "y":3},
- {"x":7.75, "y":3},
- {"x":8.75, "y":3},
- {"x":9.75, "y":3},
- {"x":10.75, "y":3},
- {"x":11.75, "y":3, "w":1.75},
- {"x":13.5, "y":3},
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3},
+ {"matrix": [2, 2], "x": 2.75, "y": 3},
+ {"matrix": [2, 3], "x": 3.75, "y": 3},
+ {"matrix": [2, 4], "x": 4.75, "y": 3},
+ {"matrix": [2, 5], "x": 5.75, "y": 3},
+ {"matrix": [2, 6], "x": 6.75, "y": 3},
+ {"matrix": [2, 7], "x": 7.75, "y": 3},
+ {"matrix": [2, 8], "x": 8.75, "y": 3},
+ {"matrix": [2, 9], "x": 9.75, "y": 3},
+ {"matrix": [2, 10], "x": 10.75, "y": 3},
+ {"matrix": [2, 12], "x": 11.75, "y": 3, "w": 1.75},
+ {"matrix": [2, 13], "x": 13.5, "y": 3},
- {"x":0, "y":4, "w":1.25},
- {"x":1.25, "y":4, "w":1.25},
- {"x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":3},
- {"x":6.75, "y":4},
- {"x":7.75, "y":4, "w":3},
- {"x":10.75, "y":4, "w":1.25},
- {"x":12, "y":4, "w":1.25},
- {"x":13.25, "y":4, "w":1.25}
+ {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 4, "w": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 4},
+ {"matrix": [3, 8], "x": 7.75, "y": 4, "w": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 4, "w": 1.25},
+ {"matrix": [3, 12], "x": 12, "y": 4, "w": 1.25},
+ {"matrix": [3, 13], "x": 13.25, "y": 4, "w": 1.25}
]
},
"LAYOUT_all": {
"layout": [
- {"x":11.5, "y":0},
- {"x":12.5, "y":0},
- {"x":13.5, "y":0},
+ {"matrix": [4, 0], "x": 11.5, "y": 0},
+ {"matrix": [1, 13], "x": 12.5, "y": 0},
+ {"matrix": [4, 1], "x": 13.5, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
- {"x":12, "y":1},
- {"x":13, "y":1, "w":1.5},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 8], "x": 8, "y": 1},
+ {"matrix": [0, 9], "x": 9, "y": 1},
+ {"matrix": [0, 10], "x": 10, "y": 1},
+ {"matrix": [0, 11], "x": 11, "y": 1},
+ {"matrix": [0, 12], "x": 12, "y": 1},
+ {"matrix": [0, 13], "x": 13, "y": 1, "w": 1.5},
- {"x":0, "y":2, "w":1.25},
- {"x":1.25, "y":2},
- {"x":2.25, "y":2},
- {"x":3.25, "y":2},
- {"x":4.25, "y":2},
- {"x":5.25, "y":2},
- {"x":6.25, "y":2},
- {"x":7.25, "y":2},
- {"x":8.25, "y":2},
- {"x":9.25, "y":2},
- {"x":10.25, "y":2},
- {"x":11.25, "y":2},
- {"x":12.25, "y":2, "w":2.25},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2},
+ {"matrix": [1, 2], "x": 2.25, "y": 2},
+ {"matrix": [1, 3], "x": 3.25, "y": 2},
+ {"matrix": [1, 4], "x": 4.25, "y": 2},
+ {"matrix": [1, 5], "x": 5.25, "y": 2},
+ {"matrix": [1, 6], "x": 6.25, "y": 2},
+ {"matrix": [1, 7], "x": 7.25, "y": 2},
+ {"matrix": [1, 8], "x": 8.25, "y": 2},
+ {"matrix": [1, 9], "x": 9.25, "y": 2},
+ {"matrix": [1, 10], "x": 10.25, "y": 2},
+ {"matrix": [1, 11], "x": 11.25, "y": 2},
+ {"matrix": [1, 12], "x": 12.25, "y": 2, "w": 2.25},
- {"x":0, "y":3, "w":1.75},
- {"x":1.75, "y":3},
- {"x":2.75, "y":3},
- {"x":3.75, "y":3},
- {"x":4.75, "y":3},
- {"x":5.75, "y":3},
- {"x":6.75, "y":3},
- {"x":7.75, "y":3},
- {"x":8.75, "y":3},
- {"x":9.75, "y":3},
- {"x":10.75, "y":3},
- {"x":11.75, "y":3, "w":1.75},
- {"x":13.5, "y":3},
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3},
+ {"matrix": [2, 2], "x": 2.75, "y": 3},
+ {"matrix": [2, 3], "x": 3.75, "y": 3},
+ {"matrix": [2, 4], "x": 4.75, "y": 3},
+ {"matrix": [2, 5], "x": 5.75, "y": 3},
+ {"matrix": [2, 6], "x": 6.75, "y": 3},
+ {"matrix": [2, 7], "x": 7.75, "y": 3},
+ {"matrix": [2, 8], "x": 8.75, "y": 3},
+ {"matrix": [2, 9], "x": 9.75, "y": 3},
+ {"matrix": [2, 10], "x": 10.75, "y": 3},
+ {"matrix": [2, 12], "x": 11.75, "y": 3, "w": 1.75},
+ {"matrix": [2, 13], "x": 13.5, "y": 3},
- {"x":0, "y":4, "w":1.25},
- {"x":1.25, "y":4, "w":1.25},
- {"x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":3},
- {"x":6.75, "y":4},
- {"x":7.75, "y":4, "w":3},
- {"x":10.75, "y":4, "w":1.25},
- {"x":12, "y":4, "w":1.25},
- {"x":13.25, "y":4, "w":1.25}
+ {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 4, "w": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 4},
+ {"matrix": [3, 8], "x": 7.75, "y": 4, "w": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 4, "w": 1.25},
+ {"matrix": [3, 12], "x": 12, "y": 4, "w": 1.25},
+ {"matrix": [3, 13], "x": 13.25, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/rmi_kb/chevron/keymaps/via/keymap.c b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
index 190a39e257..8651a3dee7 100644
--- a/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
@@ -48,24 +48,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
keyevent_t encoder_ccw = {
.key = (keypos_t){.row = 4, .col = 0},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder_cw = {
.key = (keypos_t){.row = 4, .col = 1},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
void matrix_scan_user(void) {
- if (IS_PRESSED(encoder_ccw)) {
+ if (encoder_ccw.pressed) {
encoder_ccw.pressed = false;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
- if (IS_PRESSED(encoder_cw)) {
+ if (encoder_cw.pressed) {
encoder_cw.pressed = false;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
}
}
@@ -73,12 +75,12 @@ void matrix_scan_user(void) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
encoder_cw.pressed = true;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
wait_ms(20);
} else {
encoder_ccw.pressed = true;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
wait_ms(20);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-06 14:31:33 +0000