diff options
Diffstat (limited to 'keyboards/omkbd/ergodash/rev1')
-rw-r--r-- | keyboards/omkbd/ergodash/rev1/config.h | 9 | ||||
-rw-r--r-- | keyboards/omkbd/ergodash/rev1/info.json | 754 | ||||
-rw-r--r-- | keyboards/omkbd/ergodash/rev1/rev1.c | 2 | ||||
-rw-r--r-- | keyboards/omkbd/ergodash/rev1/rev1.h | 10 |
4 files changed, 413 insertions, 362 deletions
diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h index 21bd3d4f7b..03eea39fd6 100644 --- a/keyboards/omkbd/ergodash/rev1/config.h +++ b/keyboards/omkbd/ergodash/rev1/config.h @@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } -// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 @@ -37,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json index d11b84b733..8e357b326b 100644 --- a/keyboards/omkbd/ergodash/rev1/info.json +++ b/keyboards/omkbd/ergodash/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 7 @@ -15,363 +20,428 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT_4key": { "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 4, "x": 6.5, "label": "L36"}, - {"y": 4, "x": 12, "label": "R30"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"y": 5, "x": 6.5, "label": "L45"}, - {"h": 2, "y": 4, "x": 7.5, "label": "L46"}, - {"h": 2, "y": 4, "x": 11, "label": "R40"}, - {"y": 5, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] + {"x": 0, "y": 0.375}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.125}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.125}, + {"x": 5, "y": 0.25}, + {"x": 6, "y": 0.75}, + + {"x": 11.5, "y": 0.75}, + {"x": 12.5, "y": 0.25}, + {"x": 13.5, "y": 0.125}, + {"x": 14.5, "y": 0}, + {"x": 15.5, "y": 0.125}, + {"x": 16.5, "y": 0.375}, + {"x": 17.5, "y": 0.375}, + + {"x": 0, "y": 1.375}, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.125}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.125}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.75}, + + {"x": 11.5, "y": 1.75}, + {"x": 12.5, "y": 1.25}, + {"x": 13.5, "y": 1.125}, + {"x": 14.5, "y": 1}, + {"x": 15.5, "y": 1.125}, + {"x": 16.5, "y": 1.375}, + {"x": 17.5, "y": 1.375}, + + {"x": 0, "y": 2.375}, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.125}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.125}, + {"x": 5, "y": 2.25}, + {"x": 6, "y": 2.75}, + + {"x": 11.5, "y": 2.75}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.125}, + {"x": 14.5, "y": 2}, + {"x": 15.5, "y": 2.125}, + {"x": 16.5, "y": 2.375}, + {"x": 17.5, "y": 2.375}, + + {"x": 0, "y": 3.375}, + {"x": 1, "y": 3.375}, + {"x": 2, "y": 3.125}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.125}, + {"x": 5, "y": 3.25}, + {"x": 6, "y": 4}, + + {"x": 11.5, "y": 4}, + {"x": 12.5, "y": 3.25}, + {"x": 13.5, "y": 3.125}, + {"x": 14.5, "y": 3}, + {"x": 15.5, "y": 3.125}, + {"x": 16.5, "y": 3.375}, + {"x": 17.5, "y": 3.375}, + + {"x": 0, "y": 4.375}, + {"x": 1, "y": 4.375}, + {"x": 2, "y": 4.125}, + {"x": 3, "y": 4}, + + {"x": 5, "y": 5}, + {"x": 6, "y": 5}, + {"x": 7, "y": 4, "h": 2}, + + {"x": 10.5, "y": 4, "h": 2}, + {"x": 11.5, "y": 5}, + {"x": 12.5, "y": 5}, + + {"x": 14.5, "y": 4}, + {"x": 15.5, "y": 4.125}, + {"x": 16.5, "y": 4.375}, + {"x": 17.5, "y": 4.375} + ] }, "LAYOUT_4key_2u_inner": { "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 4, "x": 7.5, "label": "L36"}, - {"y": 4, "x": 11, "label": "R30"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, - {"y": 5, "x": 7.5, "label": "L46"}, - {"y": 5, "x": 11, "label": "R40"}, - {"h": 2, "y": 4, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] + {"x": 0, "y": 0.375}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.125}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.125}, + {"x": 5, "y": 0.25}, + {"x": 6, "y": 0.75}, + + {"x": 11.5, "y": 0.75}, + {"x": 12.5, "y": 0.25}, + {"x": 13.5, "y": 0.125}, + {"x": 14.5, "y": 0}, + {"x": 15.5, "y": 0.125}, + {"x": 16.5, "y": 0.375}, + {"x": 17.5, "y": 0.375}, + + {"x": 0, "y": 1.375}, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.125}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.125}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.75}, + + {"x": 11.5, "y": 1.75}, + {"x": 12.5, "y": 1.25}, + {"x": 13.5, "y": 1.125}, + {"x": 14.5, "y": 1}, + {"x": 15.5, "y": 1.125}, + {"x": 16.5, "y": 1.375}, + {"x": 17.5, "y": 1.375}, + + {"x": 0, "y": 2.375}, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.125}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.125}, + {"x": 5, "y": 2.25}, + {"x": 6, "y": 2.75}, + + {"x": 11.5, "y": 2.75}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.125}, + {"x": 14.5, "y": 2}, + {"x": 15.5, "y": 2.125}, + {"x": 16.5, "y": 2.375}, + {"x": 17.5, "y": 2.375}, + + {"x": 0, "y": 3.375}, + {"x": 1, "y": 3.375}, + {"x": 2, "y": 3.125}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.125}, + {"x": 5, "y": 3.25}, + + {"x": 7, "y": 4}, + + {"x": 10.5, "y": 4}, + + {"x": 12.5, "y": 3.25}, + {"x": 13.5, "y": 3.125}, + {"x": 14.5, "y": 3}, + {"x": 15.5, "y": 3.125}, + {"x": 16.5, "y": 3.375}, + {"x": 17.5, "y": 3.375}, + + {"x": 0, "y": 4.375}, + {"x": 1, "y": 4.375}, + {"x": 2, "y": 4.125}, + {"x": 3, "y": 4}, + + {"x": 5, "y": 5}, + {"x": 6, "y": 4, "h": 2}, + {"x": 7, "y": 5}, + + {"x": 10.5, "y": 5}, + {"x": 11.5, "y": 4, "h": 2}, + {"x": 12.5, "y": 5}, + + {"x": 14.5, "y": 4}, + {"x": 15.5, "y": 4.125}, + {"x": 16.5, "y": 4.375}, + {"x": 17.5, "y": 4.375} + ] }, "LAYOUT_3key_2us": { "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, - {"h": 2, "y": 4, "x": 7.5, "label": "L46"}, - {"h": 2, "y": 4, "x": 11, "label": "R40"}, - {"h": 2, "y": 4, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] + {"x": 0, "y": 0.375}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.125}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.125}, + {"x": 5, "y": 0.25}, + {"x": 6, "y": 0.75}, + + {"x": 11.5, "y": 0.75}, + {"x": 12.5, "y": 0.25}, + {"x": 13.5, "y": 0.125}, + {"x": 14.5, "y": 0}, + {"x": 15.5, "y": 0.125}, + {"x": 16.5, "y": 0.375}, + {"x": 17.5, "y": 0.375}, + + {"x": 0, "y": 1.375}, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.125}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.125}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.75}, + + {"x": 11.5, "y": 1.75}, + {"x": 12.5, "y": 1.25}, + {"x": 13.5, "y": 1.125}, + {"x": 14.5, "y": 1}, + {"x": 15.5, "y": 1.125}, + {"x": 16.5, "y": 1.375}, + {"x": 17.5, "y": 1.375}, + + {"x": 0, "y": 2.375}, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.125}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.125}, + {"x": 5, "y": 2.25}, + {"x": 6, "y": 2.75}, + + {"x": 11.5, "y": 2.75}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.125}, + {"x": 14.5, "y": 2}, + {"x": 15.5, "y": 2.125}, + {"x": 16.5, "y": 2.375}, + {"x": 17.5, "y": 2.375}, + + {"x": 0, "y": 3.375}, + {"x": 1, "y": 3.375}, + {"x": 2, "y": 3.125}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.125}, + {"x": 5, "y": 3.25}, + + {"x": 12.5, "y": 3.25}, + {"x": 13.5, "y": 3.125}, + {"x": 14.5, "y": 3}, + {"x": 15.5, "y": 3.125}, + {"x": 16.5, "y": 3.375}, + {"x": 17.5, "y": 3.375}, + + {"x": 0, "y": 4.375}, + {"x": 1, "y": 4.375}, + {"x": 2, "y": 4.125}, + {"x": 3, "y": 4}, + + {"x": 5, "y": 5}, + {"x": 6, "y": 4, "h": 2}, + {"x": 7, "y": 4, "h": 2}, + + {"x": 10.5, "y": 4, "h": 2}, + {"x": 11.5, "y": 4, "h": 2}, + {"x": 12.5, "y": 5}, + + {"x": 14.5, "y": 4}, + {"x": 15.5, "y": 4.125}, + {"x": 16.5, "y": 4.375}, + {"x": 17.5, "y": 4.375} + ] }, "LAYOUT_3key_1us": { "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 4, "x": 6.5, "label": "L36"}, - {"y": 4, "x": 12, "label": "R30"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"y": 5, "x": 6.5, "label": "L45"}, - {"y": 5, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] + {"x": 0, "y": 0.375}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.125}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.125}, + {"x": 5, "y": 0.25}, + {"x": 6, "y": 0.75}, + + {"x": 11.5, "y": 0.75}, + {"x": 12.5, "y": 0.25}, + {"x": 13.5, "y": 0.125}, + {"x": 14.5, "y": 0}, + {"x": 15.5, "y": 0.125}, + {"x": 16.5, "y": 0.375}, + {"x": 17.5, "y": 0.375}, + + {"x": 0, "y": 1.375}, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.125}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.125}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.75}, + + {"x": 11.5, "y": 1.75}, + {"x": 12.5, "y": 1.25}, + {"x": 13.5, "y": 1.125}, + {"x": 14.5, "y": 1}, + {"x": 15.5, "y": 1.125}, + {"x": 16.5, "y": 1.375}, + {"x": 17.5, "y": 1.375}, + + {"x": 0, "y": 2.375}, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.125}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.125}, + {"x": 5, "y": 2.25}, + {"x": 6, "y": 2.75}, + + {"x": 11.5, "y": 2.75}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.125}, + {"x": 14.5, "y": 2}, + {"x": 15.5, "y": 2.125}, + {"x": 16.5, "y": 2.375}, + {"x": 17.5, "y": 2.375}, + + {"x": 0, "y": 3.375}, + {"x": 1, "y": 3.375}, + {"x": 2, "y": 3.125}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.125}, + {"x": 5, "y": 3.25}, + {"x": 6, "y": 4}, + + {"x": 11.5, "y": 4}, + {"x": 12.5, "y": 3.25}, + {"x": 13.5, "y": 3.125}, + {"x": 14.5, "y": 3}, + {"x": 15.5, "y": 3.125}, + {"x": 16.5, "y": 3.375}, + {"x": 17.5, "y": 3.375}, + + {"x": 0, "y": 4.375}, + {"x": 1, "y": 4.375}, + {"x": 2, "y": 4.125}, + {"x": 3, "y": 4}, + + {"x": 5, "y": 5}, + {"x": 6, "y": 5}, + + {"x": 11.5, "y": 5}, + {"x": 12.5, "y": 5}, + + {"x": 14.5, "y": 4}, + {"x": 15.5, "y": 4.125}, + {"x": 16.5, "y": 4.375}, + {"x": 17.5, "y": 4.375} + ] }, "LAYOUT_2key": { "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, - {"h": 2, "y": 4, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] + {"x": 0, "y": 0.375}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.125}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.125}, + {"x": 5, "y": 0.25}, + {"x": 6, "y": 0.75}, + + {"x": 11.5, "y": 0.75}, + {"x": 12.5, "y": 0.25}, + {"x": 13.5, "y": 0.125}, + {"x": 14.5, "y": 0}, + {"x": 15.5, "y": 0.125}, + {"x": 16.5, "y": 0.375}, + {"x": 17.5, "y": 0.375}, + + {"x": 0, "y": 1.375}, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.125}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.125}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.75}, + + {"x": 11.5, "y": 1.75}, + {"x": 12.5, "y": 1.25}, + {"x": 13.5, "y": 1.125}, + {"x": 14.5, "y": 1}, + {"x": 15.5, "y": 1.125}, + {"x": 16.5, "y": 1.375}, + {"x": 17.5, "y": 1.375}, + + {"x": 0, "y": 2.375}, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.125}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.125}, + {"x": 5, "y": 2.25}, + {"x": 6, "y": 2.75}, + + {"x": 11.5, "y": 2.75}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.125}, + {"x": 14.5, "y": 2}, + {"x": 15.5, "y": 2.125}, + {"x": 16.5, "y": 2.375}, + {"x": 17.5, "y": 2.375}, + + {"x": 0, "y": 3.375}, + {"x": 1, "y": 3.375}, + {"x": 2, "y": 3.125}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.125}, + {"x": 5, "y": 3.25}, + + {"x": 12.5, "y": 3.25}, + {"x": 13.5, "y": 3.125}, + {"x": 14.5, "y": 3}, + {"x": 15.5, "y": 3.125}, + {"x": 16.5, "y": 3.375}, + {"x": 17.5, "y": 3.375}, + + {"x": 0, "y": 4.375}, + {"x": 1, "y": 4.375}, + {"x": 2, "y": 4.125}, + {"x": 3, "y": 4}, + + {"x": 5, "y": 5}, + {"x": 6, "y": 4, "h": 2}, + + {"x": 11.5, "y": 4, "h": 2}, + {"x": 12.5, "y": 5}, + + {"x": 14.5, "y": 4}, + {"x": 15.5, "y": 4.125}, + {"x": 16.5, "y": 4.375}, + {"x": 17.5, "y": 4.375} + ] } } } diff --git a/keyboards/omkbd/ergodash/rev1/rev1.c b/keyboards/omkbd/ergodash/rev1/rev1.c index 00f81cae11..eb794f9ac7 100644 --- a/keyboards/omkbd/ergodash/rev1/rev1.c +++ b/keyboards/omkbd/ergodash/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "ergodash.h" +#include "rev1.h" #ifdef AUDIO_ENABLE float tone_startup[][2] = SONG(STARTUP_SOUND); diff --git a/keyboards/omkbd/ergodash/rev1/rev1.h b/keyboards/omkbd/ergodash/rev1/rev1.h index 7f094534cc..4a1ee020e7 100644 --- a/keyboards/omkbd/ergodash/rev1/rev1.h +++ b/keyboards/omkbd/ergodash/rev1/rev1.h @@ -1,17 +1,7 @@ #pragma once -#include "ergodash.h" - #include "quantum.h" -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ - #include <avr/io.h> - #include <avr/interrupt.h> -#endif -#endif - #define XXX KC_NO #ifndef FLIP_HALF |