summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-09-29 23:03:03 +0000
committerQMK Bot <hello@qmk.fm>2022-09-29 23:03:03 +0000
commit2d98485f55a92fd6e86022b0656e57afbf971f0b (patch)
tree24685881ab1969b89298193c2fb658136c50e62d /keyboards
parent700723e046a16ad7a2d9679e83dadbdd7e23ed74 (diff)
parent96c1ac24eea52fa0b69829ff04a64d2c38febea7 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ramonimbao/tkl_ff/info.json12
-rw-r--r--keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c2
-rw-r--r--keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c2
-rw-r--r--keyboards/ramonimbao/tkl_ff/tkl_ff.h4
4 files changed, 14 insertions, 6 deletions
diff --git a/keyboards/ramonimbao/tkl_ff/info.json b/keyboards/ramonimbao/tkl_ff/info.json
index a3a22e34d8..1ff3133deb 100644
--- a/keyboards/ramonimbao/tkl_ff/info.json
+++ b/keyboards/ramonimbao/tkl_ff/info.json
@@ -7,8 +7,16 @@
"vid": "0xB16B",
"device_version": "0.0.1"
},
+ "layout_aliases": {
+ "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi",
+ "LAYOUT_iso": "LAYOUT_tkl_f13_iso"
+ },
+ "community_layouts": [
+ "tkl_f13_ansi",
+ "tkl_f13_iso"
+ ],
"layouts": {
- "LAYOUT_ansi": {
+ "LAYOUT_tkl_f13_ansi": {
"layout": [
{"x":0, "y":0},
{"x":1.25, "y":0},
@@ -105,7 +113,7 @@
{"x":17.25, "y":5.25}
]
},
- "LAYOUT_iso": {
+ "LAYOUT_tkl_f13_iso": {
"layout": [
{"x":0, "y":0},
{"x":1.25, "y":0},
diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c b/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c
index e44b56e55f..1f7c9c6388 100644
--- a/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_ansi(
+ [0] = LAYOUT_tkl_f13_ansi(
KC_ESC, 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_F13, KC_PSCR, KC_SLCK, KC_PAUS,
KC_GRV, 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_BSPC, KC_INS, KC_HOME, KC_PGUP,
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_BSLS, KC_DEL, KC_END, KC_PGDN,
diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c b/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c
index 17997828df..dcd383794d 100644
--- a/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c
@@ -16,7 +16,7 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_iso(
+ [0] = LAYOUT_tkl_f13_iso(
KC_ESC, 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_F13, KC_PSCR, KC_SLCK, KC_PAUS,
KC_GRV, 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_BSPC, KC_INS, KC_HOME, KC_PGUP,
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_DEL, KC_END, KC_PGDN,
diff --git a/keyboards/ramonimbao/tkl_ff/tkl_ff.h b/keyboards/ramonimbao/tkl_ff/tkl_ff.h
index 2fc2a98948..cdc4ab60cb 100644
--- a/keyboards/ramonimbao/tkl_ff/tkl_ff.h
+++ b/keyboards/ramonimbao/tkl_ff/tkl_ff.h
@@ -34,7 +34,7 @@
// Full right shift
// Full left shift
// 6.25u bottom row
-#define LAYOUT_ansi( \
+#define LAYOUT_tkl_f13_ansi( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
@@ -55,7 +55,7 @@
// Full right shift
// Split left shift
// 6.25u bottom row
-#define LAYOUT_iso( \
+#define LAYOUT_tkl_f13_iso( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, \