Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Iris Rev. 8 #21392

Merged
merged 7 commits into from
Jul 1, 2023
Merged

Add Iris Rev. 8 #21392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f38364a
Initial commit of Iris Rev. 8
nooges Jun 19, 2023
101a616
Add encoder pinouts
nooges Jun 20, 2023
ab657ac
Move more settings to info.json
nooges Jun 20, 2023
7999783
Enabled more features
nooges Jun 22, 2023
fb49be5
Enable more RGB modes
nooges Jun 22, 2023
ae0ce29
Fix volume orientation, move encoder movements
nooges Jun 28, 2023
e23b103
Move animations enabled to info.json
nooges Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions keyboards/keebio/iris/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

#ifdef ENCODER_MAP_ENABLE
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) },
# if defined(KEYBOARD_keebio_iris_rev7) || defined(KEYBOARD_keebio_iris_rev8)
[_MAIN] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), 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) },
[_FN2] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[_FN3] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_UP, KC_DOWN) },
Expand Down
23 changes: 23 additions & 0 deletions keyboards/keebio/iris/rev8/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2023 Danny Nguyen (danny@keeb.io)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#define SPLIT_HAND_PIN GP4
#define USB_VBUS_PIN GP8
#define SERIAL_USART_FULL_DUPLEX
#define SERIAL_USART_TX_PIN GP12
#define SERIAL_USART_RX_PIN GP13
#define SERIAL_USART_PIN_SWAP
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
#define I2C_DRIVER I2CD2
#define I2C1_SDA_PIN GP10
#define I2C1_SCL_PIN GP11

// RGB Matrix
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_LED_COUNT 68
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
242 changes: 242 additions & 0 deletions keyboards/keebio/iris/rev8/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
{
"keyboard_name": "Iris Rev. 8",
"bootloader": "rp2040",
"diode_direction": "COL2ROW",
"features": {
"extrakey": true,
"mousekey": true,
"rgb_matrix": true
},
"encoder": {
"enabled": true,
"rotary": [
{"pin_a": "GP14", "pin_b": "GP15"},
{"pin_a": "GP26", "pin_b": "GP25"}
]
},
"ws2812": {
"driver": "vendor",
"pin": "GP9"
},
"matrix_pins": {
"cols": ["GP2", "GP3", "GP29", "GP27", "GP6", "GP5"],
"rows": ["GP0", "GP1", "GP7", "GP16", "GP28"]
},
"split": {
"enabled": true,
nooges marked this conversation as resolved.
Show resolved Hide resolved
"matrix_pins": {
"right": {
"cols": ["GP27", "GP28", "GP3", "GP6", "GP29", "GP16"],
"rows": ["GP22", "GP19", "GP18", "GP17", "GP7"]
}
},
"transport": {
"sync_matrix_state": true
}
},
"processor": "RP2040",
"usb": {
"device_version": "8.0.0",
"pid": "0x8256"
},
"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, 5], "x": 6.15, "y": 3.75},

{"matrix": [9, 5], "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, 2], "x": 3.5, "y": 4.25},
{"matrix": [4, 3], "x": 4.5, "y": 4.375},
{"matrix": [4, 4], "x": 5.6, "y": 4.75},

{"matrix": [9, 4], "x": 8.4, "y": 4.75},
{"matrix": [9, 3], "x": 9.5, "y": 4.375},
{"matrix": [9, 2], "x": 10.5, "y": 4.25}
]
}
},
"rgb_matrix": {
nooges marked this conversation as resolved.
Show resolved Hide resolved
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"gradient_left_right": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"band_spiral_sat": true,
"band_spiral_val": true,
"cycle_all": true,
"cycle_left_right": true,
"cycle_up_down": true,
"cycle_out_in": true,
"cycle_out_in_dual": true,
"rainbow_moving_chevron": true,
"cycle_pinwheel": true,
"cycle_spiral": true,
"dual_beacon": true,
"rainbow_beacon": true,
"rainbow_pinwheels": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_fractal": true,
"pixel_flow": true,
"pixel_rain": true,
"typing_heatmap": true,
"digital_rain": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_wide": true,
"solid_reactive_multiwide": true,
"solid_reactive_cross": true,
"solid_reactive_multicross": true,
"solid_reactive_nexus": true,
"solid_reactive_multinexus": true,
"splash": true,
"multisplash": true,
"solid_splash": true,
"solid_multisplash": true
},
"driver": "WS2812",
"split_count": [34, 34],
"max_brightness": 120,
"layout": [
{"matrix": [0,0], "flags":4, "x":0, "y":5},
{"flags":2, "x":8, "y":5},
{"matrix": [0,1], "flags":4, "x":16, "y":5},
{"matrix": [0,2], "flags":4, "x":32, "y":2},
{"flags":2, "x":40, "y":1},
{"matrix": [0,3], "flags":4, "x":48, "y":0},
{"matrix": [0,4], "flags":4, "x":64, "y":5},
{"flags":2, "x":72, "y":3},
{"matrix": [0,5], "flags":4, "x":80, "y":3},

{"matrix": [1,5], "flags":4, "x":80, "y":17},
{"matrix": [1,4], "flags":4, "x":64, "y":15},
{"matrix": [1,3], "flags":4, "x":48, "y":13},
{"matrix": [1,2], "flags":4, "x":32, "y":15},
{"matrix": [1,1], "flags":4, "x":16, "y":18},
{"matrix": [1,0], "flags":4, "x":0, "y":18},

{"matrix": [2,0], "flags":4, "x":0, "y":32},
{"matrix": [2,1], "flags":4, "x":16, "y":32},
{"matrix": [2,2], "flags":4, "x":32, "y":28},
{"matrix": [2,3], "flags":4, "x":48, "y":27},
{"matrix": [2,4], "flags":4, "x":64, "y":28},
{"matrix": [2,5], "flags":4, "x":80, "y":30},

{"matrix": [3,5], "flags":4, "x":80, "y":43},
{"matrix": [3,4], "flags":4, "x":64, "y":42},
{"matrix": [3,3], "flags":4, "x":48, "y":40},
{"flags":2, "x":40, "y":50},
{"matrix": [3,2], "flags":4, "x":32, "y":42},
{"matrix": [3,1], "flags":4, "x":16, "y":45},
{"flags":2, "x":8, "y":43},
{"matrix": [3,0], "flags":4, "x":0, "y":45},

{"matrix": [4,5], "flags":4, "x":98, "y":52},
{"matrix": [4,4], "flags":4, "x":90, "y":64},
{"flags":2, "x":80, "y":58},
{"matrix": [4,3], "flags":4, "x":72, "y":58},
{"matrix": [4,2], "flags":4, "x":56, "y":47},

{"matrix": [5,0], "flags":4, "x":224, "y":5},
{"flags":2, "x":216, "y":5},
{"matrix": [5,1], "flags":4, "x":208, "y":5},
{"matrix": [5,2], "flags":4, "x":192, "y":2},
{"flags":2, "x":184, "y":1},
{"matrix": [5,3], "flags":4, "x":176, "y":0},
{"matrix": [5,4], "flags":4, "x":160, "y":5},
{"flags":2, "x":152, "y":3},
{"matrix": [5,5], "flags":4, "x":144, "y":3},

{"matrix": [6,5], "flags":4, "x":144, "y":17},
{"matrix": [6,4], "flags":4, "x":160, "y":15},
{"matrix": [6,3], "flags":4, "x":176, "y":13},
{"matrix": [6,2], "flags":4, "x":192, "y":15},
{"matrix": [6,1], "flags":4, "x":208, "y":18},
{"matrix": [6,0], "flags":4, "x":224, "y":18},

{"matrix": [7,0], "flags":4, "x":224, "y":32},
{"matrix": [7,1], "flags":4, "x":208, "y":32},
{"matrix": [7,2], "flags":4, "x":192, "y":28},
{"matrix": [7,3], "flags":4, "x":176, "y":27},
{"matrix": [7,4], "flags":4, "x":160, "y":28},
{"matrix": [7,5], "flags":4, "x":144, "y":30},

{"matrix": [8,5], "flags":4, "x":144, "y":43},
{"matrix": [8,4], "flags":4, "x":160, "y":42},
{"matrix": [8,3], "flags":4, "x":176, "y":40},
{"flags":2, "x":184, "y":50},
{"matrix": [8,2], "flags":4, "x":192, "y":42},
{"matrix": [8,1], "flags":4, "x":208, "y":45},
{"flags":2, "x":216, "y":43},
{"matrix": [8,0], "flags":4, "x":224, "y":45},

{"matrix": [9,2], "flags":4, "x":168, "y":47},
{"matrix": [9,3], "flags":4, "x":152, "y":58},
{"flags":2, "x":144, "y":58},
{"matrix": [9,4], "flags":4, "x":134, "y":64},
{"matrix": [9,5], "flags":4, "x":126, "y":52},
]
}
}
36 changes: 36 additions & 0 deletions keyboards/keebio/iris/rev8/rev8.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Copyright 2023 Danny Nguyen (danny@keeb.io)
// SPDX-License-Identifier: GPL-2.0-or-later

#include "quantum.h"

#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (index == 0) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
} else if (index == 1) {
if (clockwise) {
tap_code(KC_PGDN);
} else {
tap_code(KC_PGUP);
}
} else if (index == 2) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
} else if (index == 3) {
if (clockwise) {
tap_code(KC_PGDN);
} else {
tap_code(KC_PGUP);
}
}
return false;
}
#endif
1 change: 1 addition & 0 deletions keyboards/keebio/iris/rev8/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SERIAL_DRIVER = vendor