Skip to content

Commit

Permalink
jorne: use rbg_matrix instead of rgb_light. WIP, cleanup needed
Browse files Browse the repository at this point in the history
  • Loading branch information
@xkonni
xkonni committed Oct 17, 2024
1 parent cdd245d commit 608b0e8
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 14 deletions.
19 changes: 10 additions & 9 deletions keyboards/jorne/keymaps/xk_vial/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_LOWER] = LAYOUT(
_______, KC_UNDS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, F12_RGU,
PLS_LCT, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, MIN_RCT,
PLS_LCT, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_RPRN, MIN_RCT,
EQL_LAL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
_______, _______, _______, _______, _______, _______
),
Expand All @@ -77,14 +77,15 @@ layer_state_t layer_state_set_user(layer_state_t state) {

#ifdef OLED_ENABLE
bool oled_task_user(void) {
if (is_keyboard_left()) {
render_bongocat();
// oled_write_P(get_u8_str(get_current_wpm(), ' '), false);
}
else {
render_layer_status();
// oled_write_P(get_u8_str(get_current_wpm(), ' '), false);
}
// if (is_keyboard_left()) {
// render_bongocat();
// // oled_write_P(get_u8_str(get_current_wpm(), ' '), false);
// }
// else {
// render_layer_status();
// // oled_write_P(get_u8_str(get_current_wpm(), ' '), false);
// }
render_layer_status();
return true;
}
#endif
Expand Down
6 changes: 4 additions & 2 deletions keyboards/jorne/keymaps/xk_vial/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ VIAL_ENABLE = yes
LTO_ENABLE = yes # compile optimization, reduce size

# Can't have RGBLIGHT and RGB_MATRIX at the same time.
RGBLIGHT_ENABLE = yes
RGB_MATRIX_ENABLE = no
RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = ws2812
VIALRGB_ENABLE = yes

OLED_ENABLE = yes
OLED_DRIVER = ssd1306
Expand Down
2 changes: 1 addition & 1 deletion keyboards/jorne/keymaps/xk_vial/vial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Jorne",
"vendorId": "0x4753",
"productId": "0x0001",
"lighting": "qmk_rgblight",
"lighting": "vialrgb",
"matrix": {"rows": 8, "cols": 6},
"layouts": {
"keymap": [
Expand Down
89 changes: 87 additions & 2 deletions keyboards/jorne/rev1/keyboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,91 @@
},
"rgblight": {
"led_count": 56,
"split_count": [28, 28]
"split_count": [28, 28],
"sleep": true
},
"rgb_matrix": {
"split_count": [22, 22],
"driver": "ws2812",
"sleep": true,
"animations": {
"breathing": true,
"rainbow_beacon": true,
"rainbow_pinwheels": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_rain": true,
"pixel_flow": true,
"pixel_fractal": 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
},
"default": {
"animation": "solid_reactive",
"on": true
},
"layout": [
{"matrix": [3, 5], "x": 96, "y": 63, "flags": 1},
{"matrix": [2, 5], "x": 84, "y": 39, "flags": 4},
{"matrix": [1, 5], "x": 84, "y": 21, "flags": 4},
{"matrix": [0, 5], "x": 84, "y": 4, "flags": 4},
{"matrix": [0, 4], "x": 70, "y": 2, "flags": 4},
{"matrix": [1, 4], "x": 70, "y": 19, "flags": 4},
{"matrix": [2, 4], "x": 70, "y": 37, "flags": 4},
{"matrix": [3, 4], "x": 78, "y": 58, "flags": 1},
{"matrix": [3, 3], "x": 66, "y": 55, "flags": 1},
{"matrix": [2, 3], "x": 56, "y": 35, "flags": 4},
{"matrix": [1, 3], "x": 56, "y": 13, "flags": 4},
{"matrix": [0, 3], "x": 56, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 42, "y": 3, "flags": 4},
{"matrix": [1, 2], "x": 42, "y": 20, "flags": 4},
{"matrix": [2, 2], "x": 42, "y": 37, "flags": 4},
{"matrix": [2, 1], "x": 28, "y": 42, "flags": 4},
{"matrix": [1, 1], "x": 28, "y": 24, "flags": 4},
{"matrix": [0, 1], "x": 28, "y": 7, "flags": 4},
{"matrix": [0, 0], "x": 14, "y": 7, "flags": 1},
{"matrix": [1, 0], "x": 14, "y": 24, "flags": 1},
{"matrix": [2, 0], "x": 14, "y": 41, "flags": 1},

{"matrix": [3, 0], "x": 0, "y": 63, "flags": 1},

{"matrix": [7, 5], "x": 126, "y": 63, "flags": 1},
{"matrix": [6, 5], "x": 140, "y": 39, "flags": 4},
{"matrix": [5, 5], "x": 140, "y": 21, "flags": 4},
{"matrix": [4, 5], "x": 140, "y": 4, "flags": 4},
{"matrix": [4, 4], "x": 154, "y": 2, "flags": 4},
{"matrix": [5, 4], "x": 154, "y": 19, "flags": 4},
{"matrix": [6, 4], "x": 154, "y": 37, "flags": 4},
{"matrix": [7, 4], "x": 144, "y": 58, "flags": 1},
{"matrix": [7, 3], "x": 158, "y": 55, "flags": 1},
{"matrix": [6, 3], "x": 168, "y": 35, "flags": 4},
{"matrix": [5, 3], "x": 168, "y": 13, "flags": 4},
{"matrix": [4, 3], "x": 168, "y": 0, "flags": 4},
{"matrix": [4, 2], "x": 182, "y": 3, "flags": 4},
{"matrix": [5, 2], "x": 182, "y": 20, "flags": 4},
{"matrix": [6, 2], "x": 182, "y": 37, "flags": 4},
{"matrix": [6, 1], "x": 196, "y": 42, "flags": 4},
{"matrix": [5, 1], "x": 196, "y": 24, "flags": 4},
{"matrix": [4, 1], "x": 196, "y": 7, "flags": 4},
{"matrix": [4, 0], "x": 210, "y": 7, "flags": 1},
{"matrix": [5, 0], "x": 210, "y": 24, "flags": 1},
{"matrix": [6, 0], "x": 210, "y": 41, "flags": 1},

{"matrix": [7, 0], "x": 224, "y": 41, "flags": 1}
]
},
"ws2812": {
"pin": "D3"
Expand All @@ -38,7 +122,8 @@
"bootmagic": false,
"mousekey": true,
"extrakey": true,
"rgblight": true,
"rgblight": false,
"rgb_matrix": true,
"oled": true
},
"qmk": {
Expand Down

0 comments on commit 608b0e8

Please sign in to comment.