summaryrefslogtreecommitdiff
path: root/keyboards/rmi_kb/herringbone
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rmi_kb/herringbone')
-rw-r--r--keyboards/rmi_kb/herringbone/pro/config.h18
-rw-r--r--keyboards/rmi_kb/herringbone/pro/info.json5
-rw-r--r--keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c16
-rw-r--r--keyboards/rmi_kb/herringbone/pro/pro.c17
-rw-r--r--keyboards/rmi_kb/herringbone/v1/config.h18
-rw-r--r--keyboards/rmi_kb/herringbone/v1/info.json5
-rw-r--r--keyboards/rmi_kb/herringbone/v1/v1.c17
7 files changed, 19 insertions, 77 deletions
diff --git a/keyboards/rmi_kb/herringbone/pro/config.h b/keyboards/rmi_kb/herringbone/pro/config.h
index ddf1d3199d..27cd8fb6b6 100644
--- a/keyboards/rmi_kb/herringbone/pro/config.h
+++ b/keyboards/rmi_kb/herringbone/pro/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 { C4, C5, C6, C7, A7, A6, NO_PIN }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 }
-
-/* 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 */
@@ -41,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Small QoL improvements */
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
/*
* Feature disable options
diff --git a/keyboards/rmi_kb/herringbone/pro/info.json b/keyboards/rmi_kb/herringbone/pro/info.json
index 5eebdf3b79..8545cfc95d 100644
--- a/keyboards/rmi_kb/herringbone/pro/info.json
+++ b/keyboards/rmi_kb/herringbone/pro/info.json
@@ -8,6 +8,11 @@
"pid": "0x440B",
"device_version": "0.1.2"
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"],
+ "rows": ["C4", "C5", "C6", "C7", "A7", "A6", null]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "C3", "pin_b": "C2"}
diff --git a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
index 71622cddcf..fa85436e48 100644
--- a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
@@ -54,24 +54,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
keyevent_t encoder_ccw = {
.key = (keypos_t){.row = 6, .col = 0},
- .pressed = false
-};
+ .pressed = false,
+ .type = KEY_EVENT
+ };
keyevent_t encoder_cw = {
.key = (keypos_t){.row = 6, .col = 1},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
void matrix_scan_user(void) {
if (IS_PRESSED(encoder_ccw)) {
encoder_ccw.pressed = false;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
if (IS_PRESSED(encoder_cw)) {
encoder_cw.pressed = false;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
}
}
@@ -86,14 +88,14 @@ uint8_t current_frame = 0;
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);
anim_sleep = timer_read32();
oled_on();
} else {
encoder_ccw.pressed = true;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
wait_ms(20);
anim_sleep = timer_read32();
diff --git a/keyboards/rmi_kb/herringbone/pro/pro.c b/keyboards/rmi_kb/herringbone/pro/pro.c
deleted file mode 100644
index 4c11baefcc..0000000000
--- a/keyboards/rmi_kb/herringbone/pro/pro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 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 "pro.h"
diff --git a/keyboards/rmi_kb/herringbone/v1/config.h b/keyboards/rmi_kb/herringbone/v1/config.h
index f5ea6b0f4e..27cd8fb6b6 100644
--- a/keyboards/rmi_kb/herringbone/v1/config.h
+++ b/keyboards/rmi_kb/herringbone/v1/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 { C4, C5, C6, C7, A7, A6 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 }
-
-/* 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 */
@@ -41,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Small QoL improvements */
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
/*
* Feature disable options
diff --git a/keyboards/rmi_kb/herringbone/v1/info.json b/keyboards/rmi_kb/herringbone/v1/info.json
index 2e12362994..f81f47813a 100644
--- a/keyboards/rmi_kb/herringbone/v1/info.json
+++ b/keyboards/rmi_kb/herringbone/v1/info.json
@@ -8,6 +8,11 @@
"pid": "0x04E5",
"device_version": "0.1.2"
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"],
+ "rows": ["C4", "C5", "C6", "C7", "A7", "A6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32a",
"bootloader": "usbasploader",
"layouts": {
diff --git a/keyboards/rmi_kb/herringbone/v1/v1.c b/keyboards/rmi_kb/herringbone/v1/v1.c
deleted file mode 100644
index 4bdb5fad38..0000000000
--- a/keyboards/rmi_kb/herringbone/v1/v1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 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 "v1.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 19:34:24 +0000