Freyr refactor (#10833)

9 files changed, 496 insertions, 408 deletions

diff --git a/keyboards/freyr/config.h b/keyboards/freyr/config.h
index ce30fd5344..a4e34ea477 100644
--- a/keyboards/freyr/config.h
+++ b/keyboards/freyr/config.h
@@ -20,15 +20,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    HnahKB
-#define PRODUCT         Freyr
-#define DESCRIPTION     Custom PCB TKL keyboard 
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x1895
+#define DEVICE_VER   0x0002
+#define MANUFACTURER HnahKB
+#define PRODUCT      Freyr
 
 /* key matrix size */
-#define MATRIX_ROWS 10  
+#define MATRIX_ROWS 10
 #define MATRIX_COLS 10
 
 /*
@@ -40,26 +39,103 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
-*/
+ */
 #define MATRIX_ROW_PINS { D3, B2, B1, B0, E6, F0, D2, D5, F4, F1 }
 #define MATRIX_COL_PINS { B4, D7, D6, D4, B5, C7, C6, F5, F6, F7 }
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL*/
+/* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-
 #define BACKLIGHT_PIN B6
-#define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
+#define BACKLIGHT_BREATHING
 
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
 /* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/freyr/freyr.c b/keyboards/freyr/freyr.c
index 68c26294f5..336b327110 100644
--- a/keyboards/freyr/freyr.c
+++ b/keyboards/freyr/freyr.c
@@ -13,33 +13,24 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "freyr.h"
 
+#include "freyr.h"
 
 void matrix_init_kb(void) {
-  matrix_init_user();
-  led_init_ports();
-};
+    matrix_init_user();
+    led_init_ports();
+}
 
 void led_init_ports(void) {
-  setPinOutput(B3);     
-  setPinOutput(B7);
+    setPinOutput(B3);
+    setPinOutput(B7);
 }
 
-void led_set_kb(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    // Turn Caps Lock LED on
-    writePinLow(B3);
-  } else {
-    // Turn Caps Lock LED off
-    writePinHigh(B3);
-  }
-  if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-    // Turn Scroll Lock LED on
-    writePinLow(B7);
-  } else {
-    // Turn Scroll Lock LED off
-    writePinHigh(B7);
-  }
-      led_set_user(usb_led);
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        writePin(B3, !led_state.caps_lock);
+        writePin(B7, !led_state.scroll_lock);
+    }
+
+    return true;
 }
diff --git a/keyboards/freyr/freyr.h b/keyboards/freyr/freyr.h
index f18e74432f..ce41dfd255 100644
--- a/keyboards/freyr/freyr.h
+++ b/keyboards/freyr/freyr.h
@@ -13,60 +13,69 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #pragma once
 
 #include "quantum.h"
 
+#define XXX KC_NO
 
 #define LAYOUT_all( \
-    k00,    k01, k02, k03, k04,     k06, k07, k08,k09,     k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73, k74,        k75, k76, k67, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,   k83,         k78, k77, k68, \
-       k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84,                         \
-     k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94, k85, k93,                 k79,      \
-     k50,  k51,  k52,                  k53,            k54,  k55,  k56,  k57,         k58, k59, k69  \
+    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,        k64, k65, k66, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73, k74,   k75, k76, k67, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82, k83,        k78, k77, k68, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94, k85, k93,             k79, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,        k58, k59, k69 \
 ) { \
-    { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09 }, \
+    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49}, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
     { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
     { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
     { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79 }, \
-    { k80, k81, k82, k83, k84, k85, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { k90, k91, k92, k93, k94, k95, KC_NO, KC_NO, KC_NO, KC_NO } \
+    { k80, k81, k82, k83, k84, k85, XXX, XXX, XXX, XXX }, \
+    { k90, k91, k92, k93, k94, k95, XXX, XXX, XXX, XXX } \
 }
 
 #define LAYOUT_tkl_ansi( \
-    k00,    k01, k02, k03, k04,     k06, k07, k08,k09,     k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72,   k73,           k75, k76, k67, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,   k83,         k78, k77, k68, \
-       k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91,      k84,                         \
-        k40,   k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,     k93,                  k79,      \
-     k50,  k51,  k52,                  k53,            k54,  k55,  k56,  k57,         k58, k59, k69  \
-) LAYOUT_all( \
-    k00,    k01, k02, k03, k04,     k06, k07, k08,k09,     k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73, KC_NO,      k75, k76, k67, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,   k83,         k78, k77, k68, \
-       k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, KC_NO, k84,                         \
-     k40, KC_NO, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94, KC_NO, k93,             k79,      \
-     k50,  k51,  k52,                  k53,            k54,  k55,  k56,  k57,         k58, k59, k69  \
-) 
+    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,   k64, k65, k66, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73,   k75, k76, k67, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82, k83,   k78, k77, k68, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91,      k84, \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,      k93,        k79, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k69 \
+) { \
+    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
+    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
+    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79 }, \
+    { k80, k81, k82, k83, k84, XXX, XXX, XXX, XXX, XXX }, \
+    { k90, k91, XXX, k93, k94, k95, XXX, XXX, XXX, XXX } \
+}
 
 #define LAYOUT_tkl_iso( \
-    k00,    k01, k02, k03, k04,     k06, k07, k08,k09,     k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73,             k75, k76, k67, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,                k78, k77, k68, \
-       k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84,                         \
-     k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,      k93,                 k79,      \
-     k50,  k51,  k52,                  k53,            k54,  k55,  k56,  k57,         k58, k59, k69  \
-) LAYOUT_all( \
-    k00,    k01, k02, k03, k04,     k06, k07, k08,k09,     k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73, KC_NO,      k75, k76, k67, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,   KC_NO,       k78, k77, k68, \
-       k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84,                         \
-     k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94, KC_NO, k93,               k79,      \
-     k50,  k51,  k52,                  k53,            k54,  k55,  k56,  k57,         k58, k59, k69  \
-) 
-
+    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,   k64, k65, k66, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73,   k75, k76, k67, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,        k78, k77, k68, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,      k93,        k79, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k69 \
+) { \
+    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
+    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79 }, \
+    { k80, k81, k82, XXX, k84, XXX, XXX, XXX, XXX, XXX }, \
+    { k90, k91, k92, k93, k94, k95, XXX, XXX, XXX, XXX } \
+}
diff --git a/keyboards/freyr/info.json b/keyboards/freyr/info.json
index 22fc96fa24..9f1b54d494 100644
--- a/keyboards/freyr/info.json
+++ b/keyboards/freyr/info.json
@@ -6,284 +6,320 @@
     "height": 6.25,
     "layouts": {
         "LAYOUT_all": {
-            "key_count": 91,
             "layout": [
-                {"label":"Esc (k00)", "x":0, "y":0},
-                {"label":"F1 (k01)", "x":2, "y":0},
-                {"label":"F2 (k02)", "x":3, "y":0},
-                {"label":"F3 (k03)", "x":4, "y":0},
-                {"label":"F4 (k04)", "x":5, "y":0},
-                {"label":"F5 (k06)", "x":6.5, "y":0},
-                {"label":"F6 (k07)", "x":7.5, "y":0},
-                {"label":"F7 (k08)", "x":8.5, "y":0},
-                {"label":"F8 (k09)", "x":9.5, "y":0},
-                {"label":"F9 (k60)", "x":11, "y":0},
-                {"label":"F10 (k61)", "x":12, "y":0},
-                {"label":"F11 (k62)", "x":13, "y":0},
-                {"label":"F12 (k63)", "x":14, "y":0},
-                {"label":"PrtSc (k64)", "x":15.25, "y":0},
-                {"label":"Scroll Lock (k65)", "x":16.25, "y":0},
-                {"label":"Pause (k66)", "x":17.25, "y":0},
-                {"label":"~ (k10)", "x":0, "y":1.25},
-                {"label":"! (k11)", "x":1, "y":1.25},
-                {"label":"@ (k12)", "x":2, "y":1.25},
-                {"label":"# (k13)", "x":3, "y":1.25},
-                {"label":"$ (k14)", "x":4, "y":1.25},
-                {"label":"% (k15)", "x":5, "y":1.25},
-                {"label":"^ (k16)", "x":6, "y":1.25},
-                {"label":"& (k17)", "x":7, "y":1.25},
-                {"label":"* (k18)", "x":8, "y":1.25},
-                {"label":"( (k19)", "x":9, "y":1.25},
-                {"label":") (k70)", "x":10, "y":1.25},
-                {"label":"_ (k71)", "x":11, "y":1.25},
-                {"label":"+ (k72)", "x":12, "y":1.25},
-                {"label":"Backspace (k73)", "x":13, "y":1.25},
-                {"label":"Backspace2 (k74)", "x":14, "y":1.25},
-                {"label":"Insert (k75)", "x":15.25, "y":1.25},
-                {"label":"Home (k76)", "x":16.25, "y":1.25},
-                {"label":"PgUp (k67)", "x":17.25, "y":1.25},
-                {"label":"Tab (k20)", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q (k21)", "x":1.5, "y":2.25},
-                {"label":"W (k22)", "x":2.5, "y":2.25},
-                {"label":"E (k23)", "x":3.5, "y":2.25},
-                {"label":"R (k24)", "x":4.5, "y":2.25},
-                {"label":"T (k25)", "x":5.5, "y":2.25},
-                {"label":"Y (k26)", "x":6.5, "y":2.25},
-                {"label":"U (k27)", "x":7.5, "y":2.25},
-                {"label":"I (k28)", "x":8.5, "y":2.25},
-                {"label":"O (k29)", "x":9.5, "y":2.25},
-                {"label":"P (k80)", "x":10.5, "y":2.25},
-                {"label":"{ (k81)", "x":11.5, "y":2.25},
-                {"label":"} (k82)", "x":12.5, "y":2.25},
-                {"label":"| (k83)", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete (k78)", "x":15.25, "y":2.25},
-                {"label":"End (k77)", "x":16.25, "y":2.25},
-                {"label":"PgDn (k68)", "x":17.25, "y":2.25},
-                {"label":"Caps Lock (k30)", "x":0, "y":3.25, "w":1.75},
-                {"label":"A (k31)", "x":1.75, "y":3.25},
-                {"label":"S (k32)", "x":2.75, "y":3.25},
-                {"label":"D (k33)", "x":3.75, "y":3.25},
-                {"label":"F (k34)", "x":4.75, "y":3.25},
-                {"label":"G (k35)", "x":5.75, "y":3.25},
-                {"label":"H (k36)", "x":6.75, "y":3.25},
-                {"label":"J (k37)", "x":7.75, "y":3.25},
-                {"label":"K (k38)", "x":8.75, "y":3.25},
-                {"label":"L (k39)", "x":9.75, "y":3.25},
-                {"label":": (k90)", "x":10.75, "y":3.25},
-                {"label":"\" (k91)", "x":11.75, "y":3.25},
-                {"label":"~ (k92)", "x":12.75, "y":3.25},
-                {"label":"Enter (k84)", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"Shift (k40)", "x":0, "y":4.25, "w":1.25},
-                {"label":"| (k41)", "x":1.25, "y":4.25},
-                {"label":"Z (k42)", "x":2.25, "y":4.25},
-                {"label":"X (k43)", "x":3.25, "y":4.25},
-                {"label":"C (k44)", "x":4.25, "y":4.25},
-                {"label":"V (k45)", "x":5.25, "y":4.25},
-                {"label":"B (k46)", "x":6.25, "y":4.25},
-                {"label":"N (k47)", "x":7.25, "y":4.25},
-                {"label":"M (k48)", "x":8.25, "y":4.25},
-                {"label":"< (k49)", "x":9.25, "y":4.25},
-                {"label":"> (k95)", "x":10.25, "y":4.25},
-                {"label":"? (k94)", "x":11.25, "y":4.25},
-                {"label":"JP Ro (k85)", "x":12.25, "y":4.25},
-                {"label":"Shift (k93)", "x":13.25, "y":4.25, "w":1.75},
-                {"label":"Up (k79)", "x":16.25, "y":4.25},
-                {"label":"Ctrl (k50)", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win (k51)", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt (k52)", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space (k53)", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt (k54)", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win (k55)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu (k56)", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl (k57)", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"Left (k58)", "x":15.25, "y":5.25},
-                {"label":"Down (k59)", "x":16.25, "y":5.25},
-                {"label":"Right (k69)", "x":17.25, "y":5.25}
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25},
+                {"x": 14, "y": 1.25},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25},
+                {"x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi": {
-            "key_count": 87,
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.25},
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.25},
-                {"label":"Down", "x":16.25, "y":5.25},
-                {"label":"Right", "x":17.25, "y":5.25}
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25, "w": 2},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"x": 0, "y": 4.25, "w": 2.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso": {
-            "key_count": 88,
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"\u00ac", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"\"", "x":2, "y":1.25},
-                {"label":"\u00a3", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"@", "x":11.75, "y":3.25},
-                {"label":"~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.25},
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.25},
-                {"label":"Down", "x":16.25, "y":5.25},
-                {"label":"Right", "x":17.25, "y":5.25}
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25, "w": 2},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {