diff options
Diffstat (limited to 'keyboards/keebio/iris')
59 files changed, 695 insertions, 974 deletions
diff --git a/keyboards/keebio/iris/info.json b/keyboards/keebio/iris/info.json index 8641eed9c1..669038aff1 100644 --- a/keyboards/keebio/iris/info.json +++ b/keyboards/keebio/iris/info.json @@ -4,21 +4,5 @@ "maintainer": "Keebio", "usb": { "vid": "0xCB10" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0.375}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, - {"x":9, "y":0.25}, {"x":10, "y":0.125}, {"x":11, "y":0}, {"x":12, "y":0.125}, {"x":13, "y":0.375}, {"x":14, "y":0.375}, - {"x":0, "y":1.375}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, - {"x":9, "y":1.25}, {"x":10, "y":1.125}, {"x":11, "y":1}, {"x":12, "y":1.125}, {"x":13, "y":1.375}, {"x":14, "y":1.375}, - {"x":0, "y":2.375}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, - {"x":9, "y":2.25}, {"x":10, "y":2.125}, {"x":11, "y":2}, {"x":12, "y":2.125}, {"x":13, "y":2.375}, {"x":14, "y":2.375}, - {"x":0, "y":3.375}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, - {"x":6.15, "y":3.75}, {"x":7.85, "y":3.75}, - {"x":9, "y":3.25}, {"x":10, "y":3.125}, {"x":11, "y":3}, {"x":12, "y":3.125}, {"x":13, "y":3.375}, {"x":14, "y":3.375}, - {"x":3.5, "y":4.25}, {"x":4.5, "y":4.375}, {"x":5.6, "y":4.75}, {"x":8.4, "y":4.75}, {"x":9.5, "y":4.375}, {"x":10.5, "y":4.25} - ] - } } } diff --git a/keyboards/keebio/iris/iris.c b/keyboards/keebio/iris/iris.c deleted file mode 100644 index fb28b3a6d6..0000000000 --- a/keyboards/keebio/iris/iris.c +++ /dev/null @@ -1 +0,0 @@ -#include "iris.h" diff --git a/keyboards/keebio/iris/iris.h b/keyboards/keebio/iris/iris.h deleted file mode 100644 index b7be3fc59e..0000000000 --- a/keyboards/keebio/iris/iris.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#if defined(KEYBOARD_keebio_iris_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_keebio_iris_rev1_led) - #include "rev1_led.h" -#elif defined(KEYBOARD_keebio_iris_rev2) - #include "rev2.h" -#elif defined(KEYBOARD_keebio_iris_rev3) - #include "rev3.h" -#elif defined(KEYBOARD_keebio_iris_rev4) - #include "rev4.h" -#elif defined(KEYBOARD_keebio_iris_rev5) - #include "rev5.h" -#elif defined(KEYBOARD_keebio_iris_rev6) - #include "rev6.h" -#elif defined(KEYBOARD_keebio_iris_rev6a) - #include "rev6a.h" -#elif defined(KEYBOARD_keebio_iris_rev6b) - #include "rev6b.h" -#elif defined(KEYBOARD_keebio_iris_rev7) - #include "rev7.h" -#endif - -#include "quantum.h" -#include "via.h" diff --git a/keyboards/keebio/iris/keymaps/default/keymap.c b/keyboards/keebio/iris/keymaps/default/keymap.c index 7c95c6189b..e1e050ab1d 100644 --- a/keyboards/keebio/iris/keymaps/default/keymap.c +++ b/keyboards/keebio/iris/keymaps/default/keymap.c @@ -1,5 +1,7 @@ -#include QMK_KEYBOARD_H +// Copyright 2023 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H #define _QWERTY 0 #define _LOWER 1 diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/config.h b/keyboards/keebio/iris/keymaps/edvorakjp/config.h index 864cedae98..d5caa23369 100644 --- a/keyboards/keebio/iris/keymaps/edvorakjp/config.h +++ b/keyboards/keebio/iris/keymaps/edvorakjp/config.h @@ -8,7 +8,6 @@ #define SWAP_SCLN #define TAPPING_TERM 300 -#define IGNORE_MOD_TAP_INTERRUPT #undef RGBLED_NUM #define RGBLIGHT_EFFECT_STATIC_GRADIENT diff --git a/keyboards/keebio/iris/keymaps/emp/config.h b/keyboards/keebio/iris/keymaps/emp/config.h index 9f1982935a..0aa25a88bc 100644 --- a/keyboards/keebio/iris/keymaps/emp/config.h +++ b/keyboards/keebio/iris/keymaps/emp/config.h @@ -50,12 +50,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #undef PERMISSIVE_HOLD -/* IGNORE_MOD_TAP_INTERRUPT - * when on: rolling tap-hold keys taps all keys - * when off: rolling tap-hold keys modifies keys -*/ -#undef IGNORE_MOD_TAP_INTERRUPT - /* TAPPING_TERM x (ms) * how long before a tap becomes a hold. if set above 500, a key tapped during * the tapping term will turn it into a hold too diff --git a/keyboards/keebio/iris/keymaps/fluffactually/config.h b/keyboards/keebio/iris/keymaps/fluffactually/config.h index fd3ebfd94b..44c4fbd1e5 100644 --- a/keyboards/keebio/iris/keymaps/fluffactually/config.h +++ b/keyboards/keebio/iris/keymaps/fluffactually/config.h @@ -19,6 +19,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define USE_I2C #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 175 diff --git a/keyboards/keebio/iris/keymaps/khitsule/config.h b/keyboards/keebio/iris/keymaps/khitsule/config.h index 62760cce35..22b4d6eac7 100644 --- a/keyboards/keebio/iris/keymaps/khitsule/config.h +++ b/keyboards/keebio/iris/keymaps/khitsule/config.h @@ -19,6 +19,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define USE_I2C #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT #undef RGBLED_NUM diff --git a/keyboards/keebio/iris/keymaps/krusli/keymap.c b/keyboards/keebio/iris/keymaps/krusli/keymap.c index ef51a973f6..67eee220fc 100644 --- a/keyboards/keebio/iris/keymaps/krusli/keymap.c +++ b/keyboards/keebio/iris/keymaps/krusli/keymap.c @@ -1,6 +1,4 @@ -#include "iris.h" -#include "action_layer.h" -#include "eeconfig.h" +#include QMK_KEYBOARD_H extern keymap_config_t keymap_config; diff --git a/keyboards/keebio/iris/keymaps/mattly/rules.mk b/keyboards/keebio/iris/keymaps/mattly/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/keebio/iris/keymaps/mattly/rules.mk +++ /dev/null diff --git a/keyboards/keebio/iris/keymaps/radlinskii/config.h b/keyboards/keebio/iris/keymaps/radlinskii/config.h index 359dda7b61..c2ea15af87 100644 --- a/keyboards/keebio/iris/keymaps/radlinskii/config.h +++ b/keyboards/keebio/iris/keymaps/radlinskii/config.h @@ -8,7 +8,6 @@ #define TAPPING_TOGGLE 1 // tap just once for TT() to toggle the layer #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define RGBLIGHT_LAYERS diff --git a/keyboards/keebio/iris/keymaps/sq5rix/config.h b/keyboards/keebio/iris/keymaps/sq5rix/config.h index 8c576917e8..59004bfa8a 100644 --- a/keyboards/keebio/iris/keymaps/sq5rix/config.h +++ b/keyboards/keebio/iris/keymaps/sq5rix/config.h @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once #define EE_HANDS #define TAPPING_TERM 164 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define RGBLIGHT_LAYERS #define ENCODER_RESOLUTION 4 diff --git a/keyboards/keebio/iris/keymaps/two_knob/config.h b/keyboards/keebio/iris/keymaps/two_knob/config.h index 37ffb20a2f..83b0fcfc44 100644 --- a/keyboards/keebio/iris/keymaps/two_knob/config.h +++ b/keyboards/keebio/iris/keymaps/two_knob/config.h @@ -13,9 +13,6 @@ /* If you're setting colors per key, this is required. */ #define SPLIT_LAYER_STATE_ENABLE -/* If you type too fast, it confuses the Mod key combos. This resolves it: */ -#define IGNORE_MOD_TAP_INTERRUPT - /* Set tapdance speed */ #define TAPPING_TERM 210 diff --git a/keyboards/keebio/iris/keymaps/two_knob/keymap.c b/keyboards/keebio/iris/keymaps/two_knob/keymap.c index f6017d7266..f40392ba1e 100644 --- a/keyboards/keebio/iris/keymaps/two_knob/keymap.c +++ b/keyboards/keebio/iris/keymaps/two_knob/keymap.c @@ -232,7 +232,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { * https://docs.qmk.fm/#/feature_macros?id=super-alt%e2%86%aftab */ #if defined(ENCODER_MAP_ENABLE) - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { /* Left Hand */ /* Right Hand */ /* Switch between tabs. (Control + Tab). */ /* Switch between open apps on Mac. (Command + Tab + timer logic) */ [_QWERTY] = { ENCODER_CCW_CW(S(C(KC_TAB)), C(KC_TAB)), ENCODER_CCW_CW(CMD_TAB_CCW, CMD_TAB_CW) }, diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c index 65d3ac434e..7f793333cc 100644 --- a/keyboards/keebio/iris/keymaps/via/keymap.c +++ b/keyboards/keebio/iris/keymaps/via/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H enum custom_layer { @@ -67,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { # if defined(KEYBOARD_keebio_iris_rev7) [_MAIN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_FN1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_HOME, KC_END) }, diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h index 436c47ccac..7fd5c0ff95 100644 --- a/keyboards/keebio/iris/rev1/config.h +++ b/keyboards/keebio/iris/rev1/config.h @@ -17,20 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - -/* COL2ROW or 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 */ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json index 736b6006b9..af3c7acd42 100644 --- a/keyboards/keebio/iris/rev1/info.json +++ b/keyboards/keebio/iris/rev1/info.json @@ -4,6 +4,11 @@ "pid": "0x1256", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D7", "E6", "B4", "B5", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D2", "levels": 5 @@ -11,6 +16,80 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 9, "y": 1.25}, + {"matrix": [6, 4], "x": 10, "y": 1.125}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.125}, + {"matrix": [6, 1], "x": 13, "y": 1.375}, + {"matrix": [6, 0], "x": 14, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 9, "y": 2.25}, + {"matrix": [7, 4], "x": 10, "y": 2.125}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.125}, + {"matrix": [7, 1], "x": 13, "y": 2.375}, + {"matrix": [7, 0], "x": 14, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 2], "x": 6.15, "y": 3.75}, + + {"matrix": [9, 2], "x": 7.85, "y": 3.75}, + {"matrix": [8, 5], "x": 9, "y": 3.25}, + {"matrix": [8, 4], "x": 10, "y": 3.125}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.125}, + {"matrix": [8, 1], "x": 13, "y": 3.375}, + {"matrix": [8, 0], "x": 14, "y": 3.375}, + + {"matrix": [4, 3], "x": 3.5, "y": 4.25}, + {"matrix": [4, 4], "x": 4.5, "y": 4.375}, + {"matrix": [4, 5], "x": 5.6, "y": 4.75}, + + {"matrix": [9, 5], "x": 8.4, "y": 4.75}, + {"matrix": [9, 4], "x": 9.5, "y": 4.375}, + {"matrix": [9, 3], "x": 10.5, "y": 4.25} + ] + } + } } diff --git a/keyboards/keebio/iris/rev1/rev1.c b/keyboards/keebio/iris/rev1/rev1.c index 369af1bae7..e05b758a44 100644 --- a/keyboards/keebio/iris/rev1/rev1.c +++ b/keyboards/keebio/iris/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "rev1.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/keebio/iris/rev1/rev1.h b/keyboards/keebio/iris/rev1/rev1.h deleted file mode 100644 index 19df105c2e..0000000000 --- a/keyboards/keebio/iris/rev1/rev1.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "iris.h" - -#include "quantum.h" - -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ - #include <avr/io.h> - #include <avr/interrupt.h> -#endif -#endif - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, LT4, RT4, R30, R31, R32, R33, R34, R35, \ - LT1, LT2, LT3, RT3, RT2, RT1 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { KC_NO, KC_NO, LT4, LT1, LT2, LT3 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \ - } diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h index 3bd96004be..7fd5c0ff95 100644 --- a/keyboards/keebio/iris/rev1_led/config.h +++ b/keyboards/keebio/iris/rev1_led/config.h @@ -17,20 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, F4 } - -/* COL2ROW or 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 */ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json index e5d71a70b0..bc19a0cc8b 100644 --- a/keyboards/keebio/iris/rev1_led/info.json +++ b/keyboards/keebio/iris/rev1_led/info.json @@ -4,6 +4,11 @@ "pid": "0x1256", "device_version": "1.1.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "F4"], + "rows": ["D7", "E6", "B4", "B5", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 @@ -11,6 +16,80 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + |