summaryrefslogtreecommitdiff
path: root/keyboards/ergodox_ez
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ergodox_ez')
-rw-r--r--keyboards/ergodox_ez/config.h2
-rw-r--r--keyboards/ergodox_ez/ergodox_ez.c2
-rw-r--r--keyboards/ergodox_ez/ergodox_ez.h152
-rw-r--r--keyboards/ergodox_ez/glow/glow.h23
-rw-r--r--keyboards/ergodox_ez/info.json433
-rwxr-xr-xkeyboards/ergodox_ez/keymaps/bepo_tm_style/config.h2
-rw-r--r--keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h2
-rw-r--r--keyboards/ergodox_ez/keymaps/danielo515/config.h1
-rw-r--r--keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h2
-rw-r--r--keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h4
-rw-r--r--keyboards/ergodox_ez/keymaps/nfriend/config.h2
-rw-r--r--keyboards/ergodox_ez/keymaps/rgb_layer/config.h1
-rw-r--r--keyboards/ergodox_ez/rules.mk1
-rw-r--r--keyboards/ergodox_ez/shine/shine.h23
14 files changed, 366 insertions, 284 deletions
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 05aec8e958..3adcd0198b 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -47,7 +47,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
@@ -69,7 +68,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LED_BRIGHTNESS_DEFAULT (LED_BRIGHTNESS_HI)
/* ws2812 RGB LED */
-#define RGB_DI_PIN D7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index 7b9d9d3bad..3683128234 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -408,7 +408,7 @@ static bool is_on = false;
static bool is_dynamic_recording = false;
static uint16_t dynamic_loop_timer;
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
is_dynamic_recording = true;
dynamic_loop_timer = timer_read();
ergodox_right_led_1_on();
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h
index 2dbfdbba73..0c23a12969 100644
--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox_ez/ergodox_ez.h
@@ -25,12 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdbool.h>
#include "i2c_master.h"
-#if defined(KEYBOARD_ergodox_ez_glow)
-# include "glow.h"
-#elif defined(KEYBOARD_ergodox_ez_shine)
-# include "shine.h"
-#endif
-
// I2C aliases and register addresses (see "mcp23018.md")
#define I2C_ADDR 0b0100000
#define I2C_ADDR_WRITE ( (I2C_ADDR<<1) | I2C_WRITE )
@@ -146,152 +140,6 @@ typedef union {
extern keyboard_config_t keyboard_config;
-/*
- * LEFT HAND: LINES 115-122
- * RIGHT HAND: LINES 124-131
- */
-#define LAYOUT_ergodox( \
- \
- k00,k01,k02,k03,k04,k05,k06, \
- k10,k11,k12,k13,k14,k15,k16, \
- k20,k21,k22,k23,k24,k25, \
- k30,k31,k32,k33,k34,k35,k36, \
- k40,k41,k42,k43,k44, \
- k55,k56, \
- k54, \
- k53,k52,k51, \
- \
- k07,k08,k09,k0A,k0B,k0C,k0D, \
- k17,k18,k19,k1A,k1B,k1C,k1D, \
- k28,k29,k2A,k2B,k2C,k2D, \
- k37,k38,k39,k3A,k3B,k3C,k3D, \
- k49,k4A,k4B,k4C,k4D, \
- k57,k58, \
- k59, \
- k5C,k5B,k5A ) \
- \
- /* matrix positions */ \
- { \
- { k00, k10, k20, k30, k40, KC_NO }, \
- { k01, k11, k21, k31, k41, k51 }, \
- { k02, k12, k22, k32, k42, k52 }, \
- { k03, k13, k23, k33, k43, k53 }, \
- { k04, k14, k24, k34, k44, k54 }, \
- { k05, k15, k25, k35, KC_NO, k55 }, \
- { k06, k16, KC_NO, k36, KC_NO, k56 }, \
- \
- { k07, k17, KC_NO, k37,KC_NO, k57 }, \
- { k08, k18, k28, k38,KC_NO, k58 }, \
- { k09, k19, k29, k39, k49, k59 }, \
- { k0A, k1A, k2A, k3A, k4A, k5A }, \
- { k0B, k1B, k2B, k3B, k4B, k5B }, \
- { k0C, k1C, k2C, k3C, k4C, k5C }, \
- { k0D, k1D, k2D, k3D, k4D, KC_NO } \
- }
-
-/*
- * LEFT HAND: LINES 158-165
- * RIGHT HAND: LINES 167-174
- */
-#define LAYOUT_ergodox_80( \
- \
- k00,k01,k02,k03,k04,k05,k06, \
- k10,k11,k12,k13,k14,k15,k16, \
- k20,k21,k22,k23,k24,k25, \
- k30,k31,k32,k33,k34,k35,k36, \
- k40,k41,k42,k43,k44, \
- k55,k56, \
- k45,k46,k54, \
- k53,k52,k51, \
- \
- k07,k08,k09,k0A,k0B,k0C,k0D, \
- k17,k18,k19,k1A,k1B,k1C,k1D, \
- k28,k29,k2A,k2B,k2C,k2D, \
- k37,k38,k39,k3A,k3B,k3C,k3D, \
- k49,k4A,k4B,k4C,k4D, \
- k57,k58, \
- k59,k47,k48, \
- k5C,k5B,k5A ) \
- \
- /* matrix positions */ \
- { \
- { k00, k10, k20, k30, k40, KC_NO }, \
- { k01, k11, k21, k31, k41, k51 }, \
- { k02, k12, k22, k32, k42, k52 }, \
- { k03, k13, k23, k33, k43, k53 }, \
- { k04, k14, k24, k34, k44, k54 }, \
- { k05, k15, k25, k35, k45, k55 }, \
- { k06, k16, KC_NO, k36, k46, k56 }, \
- \
- { k07, k17, KC_NO, k37, k47, k57 }, \
- { k08, k18, k28, k38, k48, k58 }, \
- { k09, k19, k29, k39, k49, k59 }, \
- { k0A, k1A, k2A, k3A, k4A, k5A }, \
- { k0B, k1B, k2B, k3B, k4B, k5B }, \
- { k0C, k1C, k2C, k3C, k4C, k5C }, \
- { k0D, k1D, k2D, k3D, k4D, KC_NO } \
- }
-
-/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
-#define LAYOUT_ergodox_pretty( \
- L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \
- L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \
- L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \
- L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \
- L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \
- L55,L56, R50,R51, \
- L54, R52, \
- L53,L52,L51, R55,R54,R53 ) \
- \
- /* matrix positions */ \
- { \
- { L00, L10, L20, L30, L40, KC_NO }, \
- { L01, L11, L21, L31, L41, L51 }, \
- { L02, L12, L22, L32, L42, L52 }, \
- { L03, L13, L23, L33, L43, L53 }, \
- { L04, L14, L24, L34, L44, L54 }, \
- { L05, L15, L25, L35, KC_NO, L55 }, \
- { L06, L16, KC_NO, L36, KC_NO, L56 }, \
- \
- { R00, R10, KC_NO, R30,KC_NO, R50 }, \
- { R01, R11, R21, R31,KC_NO, R51 }, \
- { R02, R12, R22, R32, R42, R52 }, \
- { R03, R13, R23, R33, R43, R53 }, \
- { R04, R14, R24, R34, R44, R54 }, \
- { R05, R15, R25, R35, R45, R55 }, \
- { R06, R16, R26, R36, R46, KC_NO } \
- }
-
-/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
-#define LAYOUT_ergodox_pretty_80( \
- L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \
- L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \
- L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \
- L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \
- L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \
- L55,L56, R50,R51, \
- L45,L46,L54, R52,R40,R41, \
- L53,L52,L51, R55,R54,R53 ) \
- \
- /* matrix positions */ \
- { \
- { L00, L10, L20, L30, L40, KC_NO }, \
- { L01, L11, L21, L31, L41, L51 }, \
- { L02, L12, L22, L32, L42, L52 }, \
- { L03, L13, L23, L33, L43, L53 }, \
- { L04, L14, L24, L34, L44, L54 }, \
- { L05, L15, L25, L35, L45, L55 }, \
- { L06, L16, KC_NO, L36, L46, L56 }, \
- \
- { R00, R10, KC_NO, R30, R40, R50 }, \
- { R01, R11, R21, R31, R41, R51 }, \
- { R02, R12, R22, R32, R42, R52 }, \
- { R03, R13, R23, R33, R43, R53 }, \
- { R04, R14, R24, R34, R44, R54 }, \
- { R05, R15, R25, R35, R45, R55 }, \
- { R06, R16, R26, R36, R46, KC_NO } \
- }
-
/* ---- LEFT HAND ---- ---- RIGHT HAND ---- */
#define LED_LAYOUT_ergodox_pretty( \
L01,L02,L03,L04,L05, R01,R02,R03,R04,R05, \
diff --git a/keyboards/ergodox_ez/glow/glow.h b/keyboards/ergodox_ez/glow/glow.h
deleted file mode 100644
index da7a6073ef..0000000000
--- a/keyboards/ergodox_ez/glow/glow.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
-Copyright 2015 ZSA Technology Labs Inc (@zsa)
-Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-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 "ergodox_ez.h"
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index cfef842617..5727d11184 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -6,6 +6,12 @@
"vid": "0x3297",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D7"
+ },
+ "rgb_matrix": {
+ "driver": "IS31FL3731"
+ },
"processor": "atmega32u4",
"bootloader": "halfkay",
"debounce": 30,
@@ -13,97 +19,386 @@
"layouts": {
"LAYOUT_ergodox": {
"layout": [
- {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
- {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
- {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
- {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
- {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+ {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+ {"matrix": [3, 0], "x": 3.5, "y": 0},
+ {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+ {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+ {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+ {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+ {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+ {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+ {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+ {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+ {"matrix": [3, 2], "x": 3.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+ {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+ {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+ {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+ {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+ {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+ {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+ {"matrix": [3, 4], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
- {"x":6, "y":5}, {"x":7, "y":5},
- {"x":7, "y":6},
- {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
+ {"matrix": [5, 5], "x": 6, "y": 5},
+ {"matrix": [6, 5], "x": 7, "y": 5},
+ {"matrix": [4, 5], "x": 7, "y": 6},
+ {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+ {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
+ {"matrix": [1, 5], "x": 7, "y": 7},
+ {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+ {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+ {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+ {"matrix": [10, 0], "x": 12.5, "y": 0},
+ {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+ {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+ {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
- {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
- {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
- {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
- {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
- {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+ {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+ {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+ {"matrix": [10, 1], "x": 12.5, "y": 1},
+ {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+ {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+ {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+ {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+ {"matrix": [10, 2], "x": 12.5, "y": 2},
+ {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+ {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+ {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+ {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
- {"x":9, "y":5}, {"x":10, "y":5},
- {"x":9, "y":6},
- {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+ {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+ {"matrix": [10, 3], "x": 12.5, "y": 3},
+ {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+ {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+ {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+ {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+ {"matrix": [10, 4], "x": 12.5, "y": 4},
+ {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+ {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+ {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+ {"matrix": [7, 5], "x": 9, "y": 5},
+ {"matrix": [8, 5], "x": 10, "y": 5},
+ {"matrix": [9, 5], "x": 9, "y": 6},
+ {"matrix": [12, 5], "x": 9, "y": 7},
+ {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+ {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
]
},
"LAYOUT_ergodox_pretty": {
"layout": [
- {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
- {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+ {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+ {"matrix": [3, 0], "x": 3.5, "y": 0},
+ {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+ {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+ {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+ {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+ {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+ {"matrix": [10, 0], "x": 12.5, "y": 0},
+ {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+ {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+ {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+ {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+ {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+ {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+ {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+ {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+ {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+ {"matrix": [10, 1], "x": 12.5, "y": 1},
+ {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+ {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+ {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+ {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+ {"matrix": [3, 2], "x": 3.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
- {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
- {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+ {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+ {"matrix": [10, 2], "x": 12.5, "y": 2},
+ {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+ {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+ {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
- {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
- {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+ {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+ {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+ {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
- {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
- {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+ {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+ {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+ {"matrix": [10, 3], "x": 12.5, "y": 3},
+ {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+ {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+ {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
- {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
- {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+ {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+ {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+ {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+ {"matrix": [3, 4], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
- {"x":6, "y":5}, {"x":7, "y":5}, {"x":9, "y":5}, {"x":10, "y":5},
- {"x":7, "y":6}, {"x":9, "y":6},
- {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7}, {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+ {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+ {"matrix": [10, 4], "x": 12.5, "y": 4},
+ {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+ {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+ {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+ {"matrix": [5, 5], "x": 6, "y": 5},
+ {"matrix": [6, 5], "x": 7, "y": 5},
+
+ {"matrix": [7, 5], "x": 9, "y": 5},
+ {"matrix": [8, 5], "x": 10, "y": 5},
+
+ {"matrix": [4, 5], "x": 7, "y": 6},
+ {"matrix": [9, 5], "x": 9, "y": 6},
+
+ {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+ {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
+ {"matrix": [1, 5], "x": 7, "y": 7},
+
+ {"matrix": [12, 5], "x": 9, "y": 7},
+ {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+ {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
]
},
"LAYOUT_ergodox_80": {
- "layout": [
- {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
- {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
- {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
- {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
- {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-
- {"x":6, "y":5}, {"x":7, "y":5},
- {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6},
- {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7},
-
-
- {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
- {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
- {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
- {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
- {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
-
-
- {"x":9, "y":5}, {"x":10, "y":5},
- {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
- {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
- ]
- },
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+ {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+ {"matrix": [3, 0], "x": 3.5, "y": 0},
+ {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+ {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+ {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+ {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+ {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+ {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+ {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+ {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+ {"matrix": [3, 2], "x": 3.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+ {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+ {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+ {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+ {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+ {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+ {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+ {"matrix": [3, 4], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+ {"matrix": [5, 5], "x": 6, "y": 5},
+ {"matrix": [6, 5], "x": 7, "y": 5},
+
+ {"matrix": [5, 4], "x": 5, "y": 6},
+ {"matrix": [6, 4], "x": 6, "y": 6},
+ {"matrix": [4, 5], "x": 7, "y": 6},
+
+ {"matrix": [3, 5], "x": 5, "y": 7},
+ {"matrix": [2, 5], "x": 6, "y": 7},
+ {"matrix": [1, 5], "x": 7, "y": 7},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+ {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+ {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+ {"matrix": [10, 0], "x": 12.5, "y": 0},
+ {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+ {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+ {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+ {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+ {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+ {"matrix": [10, 1], "x": 12.5, "y": 1},
+ {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+ {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+ {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+ {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+ {"matrix": [10, 2], "x": 12.5, "y": 2},
+ {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+ {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+ {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+ {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+
+ {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+ {"matrix": [10, 3], "x": 12.5, "y": 3},
+ {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+ {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+ {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+ {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+ {"matrix": [10, 4], "x": 12.5, "y": 4},
+ {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+ {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+ {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+ {"matrix": [7, 5], "x": 9, "y": 5},
+ {"matrix": [8, 5], "x": 10, "y": 5},
+
+ {"matrix": [9, 5], "x": 9, "y": 6},
+ {"matrix": [7, 4], "x": 10, "y": 6},
+ {"matrix": [8, 4], "x": 11, "y": 6},
+
+ {"matrix": [12, 5], "x": 9, "y": 7},
+ {"matrix": [11, 5], "x": 10, "y": 7},
+ {"matrix": [10, 5], "x": 11, "y": 7}
+ ]
+ },
"LAYOUT_ergodox_pretty_80": {
- "layout": [
- {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
- {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+ {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+ {"matrix": [3, 0], "x": 3.5, "y": 0},
+ {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+ {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+ {"matrix": [6, 0], "x": 6.5, "y": 0.25},
- {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
- {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+ {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+ {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+ {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+ {"matrix": [10, 0], "x": 12.5, "y": 0},
+ {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+ {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+ {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
- {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
- {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+ {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+ {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+ {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+ {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
- {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
- {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+ {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+ {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+ {"matrix": [10, 1], "x": 12.5, "y": 1},
+ {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+ {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+ {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
- {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
- {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+ {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+ {"matrix": [3, 2], "x": 3.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
- {"x":6, "y":5}, {"x":7, "y":5}, {"x":9, "y":5}, {"x":10, "y":5},
- {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6}, {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
- {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7}, {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
- ]
- }
+ {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+ {"matrix": [10, 2], "x": 12.5, "y": 2},
+ {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+ {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+ {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+ {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+ {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+ {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+ {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+ {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+ {"matrix": [10, 3], "x": 12.5, "y": 3},
+ {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+ {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+ {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+ {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+ {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+ {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+ {"matrix": [3, 4], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+ {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+ {"matrix": [10, 4], "x": 12.5, "y": 4},
+ {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+ {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+ {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+ {"matrix": [5, 5], "x": 6, "y": 5},
+ {"matrix": [6, 5], "x": 7, "y": 5},
+
+ {"matrix": [7, 5], "x": 9, "y": 5},
+ {"matrix": [8, 5], "x": 10, "y": 5},
+
+ {"matrix": [5, 4], "x": 5, "y": 6},
+ {"matrix": [6, 4], "x": 6, "y": 6},
+ {"matrix": [4, 5], "x": 7, "y": 6},
+
+ {"matrix": [9, 5], "x": 9, "y": 6},
+ {"matrix": [7, 4], "x": 10, "y": 6},
+ {"matrix": [8, 4], "x": 11, "y": 6},
+
+ {"matrix": [3, 5], "x": 5, "y": 7},
+ {"matrix": [2, 5], "x": 6, "y": 7},
+ {"matrix": [1, 5], "x": 7, "y": 7},
+
+ {"matrix": [12, 5], "x": 9, "y": 7},
+ {"matrix": [11, 5], "x": 10, "y": 7},
+ {"matrix": [10, 5], "x": 11, "y": 7}
+ ]
+ }
}
}
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h b/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h
index 11c81f2eba..c03ee70bd5 100755
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h
+++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h
@@ -21,8 +21,6 @@
#undef TAPPING_TOGGLE
#undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
index 11c81f2eba..c03ee70bd5 100644
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
@@ -21,8 +21,6 @@
#undef TAPPING_TOGGLE
#undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/config.h b/keyboards/ergodox_ez/keymaps/danielo515/config.h
index c69c0dfe57..7428cccc82 100644
--- a/keyboards/ergodox_ez/keymaps/danielo515/config.h
+++ b/keyboards/ergodox_ez/keymaps/danielo515/config.h
@@ -4,7 +4,6 @@
*/
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 200
#define ONESHOT_TAP_TOGGLE 3
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
index 3f8c68ceb7..e90d7184ee 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
@@ -12,8 +12,6 @@
#undef DEBOUNCE
#define DEBOUNCE 15
-#undef IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h b/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h
index 06c50e0a96..232b608be9 100644
--- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h
+++ b/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h
@@ -25,8 +25,6 @@
// #undef TAPPING_TERM
// #define TAPPING_TERM 499
-/* Turning permissive hold and ignore mod tap interrupt off in order to test the tapping term. */
+/* Turning permissive hold off in order to test the tapping term. */
#undef PERMISSIVE_HOLD
#define PERMISSIVE_HOLD
-#undef IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/config.h b/keyboards/ergodox_ez/keymaps/nfriend/config.h
index 36d23c96b7..141d7ac89a 100644
--- a/keyboards/ergodox_ez/keymaps/nfriend/config.h
+++ b/keyboards/ergodox_ez/keymaps/nfriend/config.h
@@ -26,6 +26,4 @@
#define PERMISSIVE_HOLD
-#undef IGNORE_MOD_TAP_INTERRUPT
-
#define RGBLIGHT_SLEEP
diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/config.h b/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
index 84c5adfc9e..edd1f130cc 100644
--- a/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
+++ b/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
@@ -5,7 +5,6 @@
#define RGBLIGHT_SLEEP
-#define IGNORE_MOD_TAP_INTERRUPT
#undef PERMISSIVE_HOLD
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index e421ae778d..b51e93061b 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -17,7 +17,6 @@ UNICODE_ENABLE = no # Unicode
SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard
RGB_MATRIX_ENABLE = no # enable later
-RGB_MATRIX_DRIVER = IS31FL3731
DEBOUNCE_TYPE = sym_eager_pr
# project specific files
diff --git a/keyboards/ergodox_ez/shine/shine.h b/keyboards/ergodox_ez/shine/shine.h
deleted file mode 100644
index da7a6073ef..0000000000
--- a/keyboards/ergodox_ez/shine/shine.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
-Copyright 2015 ZSA Technology Labs Inc (@zsa)
-Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-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 "ergodox_ez.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:08:32 +0000