Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@qmk-bot
qmk-bot committed Feb 28, 2023
2 parents 209e652 + ee90ad2 commit 0472399
Show file tree
Hide file tree
Showing 7 changed files with 248 additions and 0 deletions.
26 changes: 26 additions & 0 deletions keyboards/studiokestra/frl84/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Copyright 2023 Studio Kestra
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#define RGB_DI_PIN B0
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING

/* 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
118 changes: 118 additions & 0 deletions keyboards/studiokestra/frl84/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
{
"manufacturer": "Studio Kestra",
"keyboard_name": "FRL84",
"maintainer": "studiokestra",
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
"rgblight": true
},
"matrix_pins": {
"cols": ["D3", "D5", "D0", "F0", "F1", "F4", "F5", "F6", "F7"],
"rows": ["D6", "D4", "B4", "D7", "B6", "B5", "C7", "C6", "D2", "D1"]
},
"processor": "atmega32u4",
"url": "",
"usb": {
"device_version": "1.0.0",
"pid": "0x0F84",
"vid": "0x7C10"
},
"layouts": {
"LAYOUT": {
"layout": [
{"label":"Esc", "matrix": [0, 0], "x":0, "y":0},
{"label":"1", "matrix": [1, 0], "x":1, "y":0},
{"label":"2", "matrix": [0, 1], "x":2, "y":0},
{"label":"3", "matrix": [1, 1], "x":3, "y":0},
{"label":"4", "matrix": [0, 2], "x":4, "y":0},
{"label":"5", "matrix": [1, 2], "x":5, "y":0},
{"label":"6", "matrix": [0, 3], "x":6, "y":0},
{"label":"7", "matrix": [1, 3], "x":7, "y":0},
{"label":"8", "matrix": [0, 4], "x":8, "y":0},
{"label":"9", "matrix": [1, 4], "x":9, "y":0},
{"label":"0", "matrix": [0, 5], "x":10, "y":0},
{"label":"_", "matrix": [1, 5], "x":11, "y":0},
{"label":"+", "matrix": [0, 6], "x":12, "y":0},
{"label":"|", "matrix": [1, 6], "x":13, "y":0},
{"label":"~", "matrix": [0, 7], "x":14, "y":0},
{"label":"Num Lock", "matrix": [1, 7], "x":15, "y":0},
{"label":"/", "matrix": [0, 8], "x":16, "y":0},
{"label":"*", "matrix": [1, 8], "x":17, "y":0},
{"label":"-", "matrix": [3, 8], "x":18, "y":0},

{"label":"Tab", "matrix": [2, 0], "x":0, "y":1, "w":1.5},
{"label":"Q", "matrix": [3, 0], "x":1.5, "y":1},
{"label":"W", "matrix": [2, 1], "x":2.5, "y":1},
{"label":"E", "matrix": [3, 1], "x":3.5, "y":1},
{"label":"R", "matrix": [2, 2], "x":4.5, "y":1},
{"label":"T", "matrix": [3, 2], "x":5.5, "y":1},
{"label":"Y", "matrix": [2, 3], "x":6.5, "y":1},
{"label":"U", "matrix": [3, 3], "x":7.5, "y":1},
{"label":"I", "matrix": [2, 4], "x":8.5, "y":1},
{"label":"O", "matrix": [3, 4], "x":9.5, "y":1},
{"label":"P", "matrix": [2, 5], "x":10.5, "y":1},
{"label":"{", "matrix": [3, 5], "x":11.5, "y":1},
{"label":"}", "matrix": [2, 6], "x":12.5, "y":1},
{"label":"Backspace", "matrix": [3, 6], "x":13.5, "y":1, "w":1.5},
{"label":"7", "matrix": [2, 7], "x":15, "y":1},
{"label":"8", "matrix": [3, 7], "x":16, "y":1},
{"label":"9", "matrix": [2, 8], "x":17, "y":1},
{"label":"+", "matrix": [5, 8], "x":18, "y":1, "h":2},

{"label":"Caps Lock", "matrix": [4, 0], "x":0, "y":2, "w":1.75},
{"label":"A", "matrix": [5, 0], "x":1.75, "y":2},
{"label":"S", "matrix": [4, 1], "x":2.75, "y":2},
{"label":"D", "matrix": [5, 1], "x":3.75, "y":2},
{"label":"F", "matrix": [4, 2], "x":4.75, "y":2},
{"label":"G", "matrix": [5, 2], "x":5.75, "y":2},
{"label":"H", "matrix": [4, 3], "x":6.75, "y":2},
{"label":"J", "matrix": [5, 3], "x":7.75, "y":2},
{"label":"K", "matrix": [4, 4], "x":8.75, "y":2},
{"label":"L", "matrix": [5, 4], "x":9.75, "y":2},
{"label":":", "matrix": [4, 5], "x":10.75, "y":2},
{"label":"\"", "matrix": [5, 5], "x":11.75, "y":2},
{"label":"Enter", "matrix": [4, 6], "x":12.75, "y":2, "w":2.25},
{"label":"4", "matrix": [4, 7], "x":15, "y":2},
{"label":"5", "matrix": [5, 7], "x":16, "y":2},
{"label":"6", "matrix": [4, 8], "x":17, "y":2},

{"label":"Shift", "matrix": [6, 0], "x":0, "y":3, "w":2.25},
{"label":"Z", "matrix": [7, 0], "x":2.25, "y":3},
{"label":"X", "matrix": [6, 1], "x":3.25, "y":3},
{"label":"C", "matrix": [7, 1], "x":4.25, "y":3},
{"label":"V", "matrix": [6, 2], "x":5.25, "y":3},
{"label":"B", "matrix": [7, 2], "x":6.25, "y":3},
{"label":"N", "matrix": [6, 3], "x":7.25, "y":3},
{"label":"M", "matrix": [7, 3], "x":8.25, "y":3},
{"label":"<", "matrix": [6, 4], "x":9.25, "y":3},
{"label":">", "matrix": [7, 4], "x":10.25, "y":3},
{"label":"?", "matrix": [6, 5], "x":11.25, "y":3},
{"label":"Shift", "matrix": [7, 5], "x":12.25, "y":3, "w":1.75},
{"label":"\u2191", "matrix": [6, 6], "x":14, "y":3},
{"label":"1", "matrix": [6, 7], "x":15, "y":3},
{"label":"2", "matrix": [7, 7], "x":16, "y":3},
{"label":"3", "matrix": [6, 8], "x":17, "y":3},
{"label":"Enter", "matrix": [7, 8], "x":18, "y":3, "h":2},

{"label":"Ctrl", "matrix": [8, 0], "x":0, "y":4, "w":1.25},
{"label":"Win", "matrix": [9, 0], "x":1.25, "y":4, "w":1.25},
{"label":"Alt", "matrix": [8, 1], "x":2.5, "y":4, "w":1.25},
{"label":"Space", "matrix": [8, 3], "x":3.75, "y":4, "w":6.25},
{"label":"Alt", "matrix": [8, 4], "x":10, "y":4, "w":1.25},
{"label":"Ctrl", "matrix": [8, 5], "x":11.25, "y":4, "w":1.25},
{"label":"\u2190", "matrix": [8, 6], "x":13, "y":4},
{"label":"\u2193", "matrix": [9, 6], "x":14, "y":4},
{"label":"\u2192", "matrix": [8, 7], "x":15, "y":4},
{"label":"0", "matrix": [9, 7], "x":16, "y":4},
{"label":".", "matrix": [8, 8], "x":17, "y":4}
]
}
}
}
34 changes: 34 additions & 0 deletions keyboards/studiokestra/frl84/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright 2023 Studio Kestra
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐───┬───┬───┬───┐
* │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ~ │Num│ / │ * │ - │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┼───┼───┼───┤
* │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ Bksp│ 7 │ 8 │ 9 │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┼───┼───┤ + │
* │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ 4 │ 5 │ 6 │ │
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┼───┼───┼───┤
* │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │ 1 │ 2 │ 3 │ │
* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┤───┼───┼───┤Ent│
* │Ctrl│GUI │Alt │ │ Alt│Ctrl│ │ ← │ ↓ │ → │ 0 │ . │ │
* └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┴───┴───┴───┘
*/
[0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRAVE,KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
),
[1] = LAYOUT(
KC_TRNS, KC_F1, KC_F2 , KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_PGUP, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_PGDN, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL
)
};
41 changes: 41 additions & 0 deletions keyboards/studiokestra/frl84/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright 2023 Studio Kestra
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐───┬───┬───┬───┐
* │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ~ │Num│ / │ * │ - │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┼───┼───┼───┤
* │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ Bksp│ 7 │ 8 │ 9 │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┼───┼───┤ + │
* │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ 4 │ 5 │ 6 │ │
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┼───┼───┼───┤
* │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │ 1 │ 2 │ 3 │ │
* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┤───┼───┼───┤Ent│
* │Ctrl│GUI │Alt │ │ Alt│Ctrl│ │ ← │ ↓ │ → │ 0 │ . │ │
* └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┴───┴───┴───┘
*/
[0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRAVE,KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
),
[1] = LAYOUT(
KC_TRNS, KC_F1, KC_F2 , KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_PGUP, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_PGDN, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL
),
[2] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};
1 change: 1 addition & 0 deletions keyboards/studiokestra/frl84/keymaps/via/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
27 changes: 27 additions & 0 deletions keyboards/studiokestra/frl84/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# studiokestra/frl84

![studiokestra/frl84](https://i.imgur.com/XzO7Ly0h.png)

FRL84 is a hotswap, via-compatible 65+Numpad layout.

* Keyboard Maintainer: [studiokestra](https://github.com/studiokestra)
* Hardware Supported: FRL84 Invisibolt Case
* Hardware Availability: [FRL84 Invisibolt Case and PCB Group Buy](https://p3dstore.com/products/frl84-invisibolt-case-and-pcb-group-buy)

Make example for this keyboard (after setting up your build environment):

make studiokestra/frl84:default

Flashing example for this keyboard:

make studiokestra/frl84:default:flash

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

## Bootloader

Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
1 change: 1 addition & 0 deletions keyboards/studiokestra/frl84/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# This file intentionally left blank

0 comments on commit 0472399

Please sign in to comment.