diff options
Diffstat (limited to 'keyboards/keebio/iris')
40 files changed, 120 insertions, 193 deletions
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/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/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/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..0fa11194c1 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,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/keebio/iris/rev1/rev1.h b/keyboards/keebio/iris/rev1/rev1.h index 19df105c2e..d94716242c 100644 --- a/keyboards/keebio/iris/rev1/rev1.h +++ b/keyboards/keebio/iris/rev1/rev1.h @@ -1,17 +1,7 @@ #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, \ 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..1d51067d52 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,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/keebio/iris/rev1_led/rev1_led.h b/keyboards/keebio/iris/rev1_led/rev1_led.h index 19df105c2e..d94716242c 100644 --- a/keyboards/keebio/iris/rev1_led/rev1_led.h +++ b/keyboards/keebio/iris/rev1_led/rev1_led.h @@ -1,17 +1,7 @@ #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, \ diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h index 71a5e3ad01..59867e6ef9 100644 --- a/keyboards/keebio/iris/rev2/config.h +++ b/keyboards/keebio/iris/rev2/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, D2, 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 RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json index 7ac3883bb5..447c1cfddf 100644 --- a/keyboards/keebio/iris/rev2/info.json +++ b/keyboards/keebio/iris/rev2/info.json @@ -4,6 +4,11 @@ "pid": "0x2256", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D7", "E6", "B4", "D2", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5", "levels": 5 @@ -11,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/keebio/iris/rev2/rev2.h b/keyboards/keebio/iris/rev2/rev2.h index 19df105c2e..d94716242c 100644 --- a/keyboards/keebio/iris/rev2/rev2.h +++ b/keyboards/keebio/iris/rev2/rev2.h @@ -1,17 +1,7 @@ #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, \ diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h index 932daf4396..c7a7222fdc 100644 --- a/keyboards/keebio/iris/rev3/config.h +++ b/keyboards/keebio/iris/rev3/config.h @@ -17,21 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D2, D3, D5, D7, D6 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, D4, B4 } #define SPLIT_HAND_PIN F0 -/* 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 F7 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json index 0fc9aa4832..ecee0bc87e 100644 --- a/keyboards/keebio/iris/rev3/info.json +++ b/keyboards/keebio/iris/rev3/info.json @@ -4,6 +4,11 @@ "pid": "0x3256", "device_version": "3.0.0" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "D4", "B4"], + "rows": ["D2", "D3", "D5", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B7"} @@ -13,6 +18,9 @@ "pin": "B6", "levels": 5 }, + "ws2812": { + "pin": "F7" + }, "qmk_lufa_bootloader": { "esc_input": "D2", "esc_output": "F1", diff --git a/keyboards/keebio/iris/rev3/rev3.h b/keyboards/keebio/iris/rev3/rev3.h index a968c47ed6..c808c4bef3 100644 --- a/keyboards/keebio/iris/rev3/rev3.h +++ b/keyboards/keebio/iris/rev3/rev3.h @@ -1,17 +1,7 @@ #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, \ diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h index d1e542d774..eaeca3a4b9 100644 --- a/keyboards/keebio/iris/rev4/config.h +++ b/keyboards/keebio/iris/rev4/config.h @@ -17,23 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { B1, F0, F5, F6, F7 } -#define MATRIX_COL_PINS { F1, F4, D3, D2, B7, D4 } -#define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 } -#define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 } #define SPLIT_HAND_PIN D5 -/* 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 D6 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json index a0689c0ed4..db7dd32ae5 100644 --- a/keyboards/keebio/iris/rev4/info.json +++ b/keyboards/keebio/iris/rev4/info.json @@ -4,6 +4,11 @@ "pid": "0x4256", "device_version": "4.0.0" }, + "matrix_pins": { + "cols": ["F1", "F4", "D3", "D2", "B7", "D4"], + "rows": ["B1", "F0", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B3"} @@ -13,6 +18,9 @@ "pin": "B5", "levels": 5 }, + "ws2812": { + "pin": "D6" + }, "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "F1", @@ -27,6 +35,12 @@ {"pin_a": "F7", "pin_b": "F6"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["D4", "D7", "D3", "B7", "F0", "B3"], + "rows": ["B1", "B2", "D2", "F1", "F4"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/keebio/iris/rev4/rev4.h b/keyboards/keebio/iris/rev4/rev4.h index 06e515ebc6..0e99bd501a 100644 --- a/keyboards/keebio/iris/rev4/rev4.h +++ b/keyboards/keebio/iris/rev4/rev4.h @@ -1,16 +1,7 @@ #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( \ LA1, LA2, LA3, LA4, LA5, LA6, RA6, RA5, RA4, RA3, RA2, RA1, \ LB1, LB2, LB3, LB4, LB5, LB6, RB6, RB5, RB4, RB3, RB2, RB1, \ diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h index 2444970342..12ff3a2a4d 100644 --- a/keyboards/keebio/iris/rev5/config.h +++ b/keyboards/keebio/iris/rev5/config.h @@ -17,20 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { B1, F0, F5, F6, F7 } -#define MATRIX_COL_PINS { F1, F4, D3, D2, B7, D4 } -#define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 } -#define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 } #define SPLIT_HAND_PIN D5 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_DEFAULT_LEVEL 3 /* ws2812 RGB LED */ -#define RGB_DI_PIN D6 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json index 8279cdcc2b..92bea8d83f 100644 --- a/keyboards/keebio/iris/rev5/info.json +++ b/keyboards/keebio/iris/rev5/info.json @@ -4,6 +4,11 @@ "pid": "0x5256", "device_version": "5.0.0" }, + "matrix_pins": { + "cols": ["F1", "F4", "D3", "D2", "B7", "D4"], + "rows": ["B1", "F0", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B3"} @@ -13,6 +18,9 @@ "pin": "B5", "levels": 5 }, + "ws2812": { + "pin": "D6" + }, "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "F1", @@ -27,6 +35,12 @@ {"pin_a": "F7", "pin_b": "F6"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["D4", "D7", "D3", "B7", "F0", "B3"], + "rows": ["B1", "B2", "D2", "F1", "F4"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/keebio/iris/rev5/rev5.h b/keyboards/keebio/iris/rev5/rev5.h index d13e24410e..cbc032ad31 100644 --- a/keyboards/keebio/iris/rev5/rev5.h +++ b/keyboards/keebio/iris/rev5/rev5.h @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "iris.h" #include "quantum.h" diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h index 0c6b1e38f8..3d30d023ac 100644 --- a/keyboards/keebio/iris/rev6/config.h +++ b/keyboards/keebio/iris/rev6/config.h @@ -17,19 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 } -#define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 } -#define MATRIX_ROW_PINS_RIGHT { B1, F0, F5, B4, B5 } -#define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 } #define SPLIT_HAND_PIN D5 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 68 # define RGBLED_SPLIT { 34, 34 } # define RGBLIGHT_HUE_STEP 8 @@ -96,4 +86,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_MATRIX_KEYPRESSES # endif -#endif diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json index 8470624a31..ab2842c08f 100644 --- a/keyboards/keebio/iris/rev6/info.json +++ b/keyboards/keebio/iris/rev6/info.json @@ -4,13 +4,27 @@ "pid": "0x6256", "device_version": "6.0.0" }, + "matrix_pins": { + "cols": ["F1", "F4", "B5", "C7", "D4", "D6"], + "rows": ["B1", "F0", "F5", "B4", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B2"} ] }, + "ws2812": { + "pin": "E6" + }, "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["D4", "D6", "D7", "C7", "F1", "F4"], + "rows": ["B1", "F0", "F5", "B4", "B5"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu" diff --git a/keyboards/keebio/iris/rev6/rev6.h b/keyboards/keebio/iris/rev6/rev6.h index d13e24410e..cbc032ad31 100644 --- a/keyboards/keebio/iris/rev6/rev6.h +++ b/keyboards/keebio/iris/rev6/rev6.h @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "iris.h" #include "quantum.h" diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h index dd05a6ec3b..4031da |