Merge remote-tracking branch 'origin/master' into develop

keyboards/eggsworks/egg58/config.h

@@ -0,0 +1,6 @@
+// Copyright 2022-2023 Travis Mick (@tmick0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGB_MATRIX_LED_COUNT 58

keyboards/eggsworks/egg58/info.json

@@ -0,0 +1,172 @@
+{
+ "keyboard_name": "egg58",
+ "manufacturer": "eggsworks",
+ "url": "https://github.com/eggsworks/egg58",
+ "maintainer": "tmick0",
+ "usb": {
+ "vid": "0x4557",
+ "pid": "0x3665",
+ "device_version": "2.1.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "rgb_matrix": true
+ },
+ "development_board": "promicro",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "rows": ["C6", "D7", "E6", "B4", "B5"],
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "split": {
+ "enabled": true,
+ "transport": {
+ "protocol": "i2c"
+ },
+ "usb_detect": {
+ "enabled": true
+ }
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812",
+ "split": true,
+ "split_count": [29, 29],
+ "max_brightness": 160,
+ "animations": {
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true
+ },
+ "layout": [
+ { "matrix": [0, 5], "x": 93, "y": 3, "flags": 4 },
+ { "matrix": [0, 4], "x": 74, "y": 1, "flags": 4 },
+ { "matrix": [0, 3], "x": 56, "y": 0, "flags": 4 },
+ { "matrix": [0, 2], "x": 37, "y": 2, "flags": 4 },
+ { "matrix": [0, 1], "x": 18, "y": 4, "flags": 4 },
+ { "matrix": [0, 0], "x": 0, "y": 12, "flags": 4 },
+ { "matrix": [1, 0], "x": 0, "y": 26, "flags": 4 },
+ { "matrix": [1, 1], "x": 18, "y": 17, "flags": 4 },
+ { "matrix": [1, 2], "x": 37, "y": 15, "flags": 4 },
+ { "matrix": [1, 3], "x": 56, "y": 13, "flags": 4 },
+ { "matrix": [1, 4], "x": 74, "y": 15, "flags": 4 },
+ { "matrix": [1, 5], "x": 93, "y": 17, "flags": 4 },
+ { "matrix": [2, 5], "x": 93, "y": 30, "flags": 4 },
+ { "matrix": [2, 4], "x": 74, "y": 28, "flags": 4 },
+ { "matrix": [2, 3], "x": 56, "y": 26, "flags": 4 },
+ { "matrix": [2, 2], "x": 37, "y": 29, "flags": 4 },
+ { "matrix": [2, 1], "x": 18, "y": 31, "flags": 4 },
+ { "matrix": [2, 0], "x": 0, "y": 39, "flags": 4 },
+ { "matrix": [3, 0], "x": 0, "y": 52, "flags": 4 },
+ { "matrix": [3, 1], "x": 18, "y": 44, "flags": 4 },
+ { "matrix": [3, 2], "x": 37, "y": 42, "flags": 4 },
+ { "matrix": [3, 3], "x": 56, "y": 40, "flags": 4 },
+ { "matrix": [3, 4], "x": 74, "y": 42, "flags": 4 },
+ { "matrix": [3, 5], "x": 93, "y": 44, "flags": 4 },
+ { "matrix": [4, 5], "x": 102, "y": 64, "flags": 4 },
+ { "matrix": [4, 4], "x": 84, "y": 60, "flags": 4} , 
+ { "matrix": [4, 3], "x": 56, "y": 53, "flags": 4 },
+ { "matrix": [4, 2], "x": 37, "y": 56, "flags": 4 },
+ { "matrix": [4, 1], "x": 18, "y": 58, "flags": 4 },
+ { "matrix": [5, 5], "x": 149, "y": 3, "flags": 4 },
+ { "matrix": [5, 4], "x": 168, "y": 1, "flags": 4 },
+ { "matrix": [5, 3], "x": 186, "y": 0, "flags": 4 },
+ { "matrix": [5, 2], "x": 205, "y": 2, "flags": 4 },
+ { "matrix": [5, 1], "x": 224, "y": 4, "flags": 4 },
+ { "matrix": [5, 0], "x": 242, "y": 12, "flags": 4 },
+ { "matrix": [6, 0], "x": 242, "y": 26, "flags": 4 },
+ { "matrix": [6, 1], "x": 224, "y": 17, "flags": 4 },
+ { "matrix": [6, 2], "x": 205, "y": 15, "flags": 4 },
+ { "matrix": [6, 3], "x": 186, "y": 13, "flags": 4 },
+ { "matrix": [6, 4], "x": 168, "y": 15, "flags": 4 },
+ { "matrix": [6, 5], "x": 149, "y": 17, "flags": 4 },
+ { "matrix": [7, 5], "x": 149, "y": 30, "flags": 4 },
+ { "matrix": [7, 4], "x": 168, "y": 28, "flags": 4 },
+ { "matrix": [7, 3], "x": 186, "y": 26, "flags": 4 },
+ { "matrix": [7, 2], "x": 205, "y": 29, "flags": 4 },
+ { "matrix": [7, 1], "x": 224, "y": 31, "flags": 4 },
+ { "matrix": [7, 0], "x": 242, "y": 39, "flags": 4 },
+ { "matrix": [8, 0], "x": 242, "y": 52, "flags": 4 },
+ { "matrix": [8, 1], "x": 224, "y": 44, "flags": 4 },
+ { "matrix": [8, 2], "x": 205, "y": 42, "flags": 4 },
+ { "matrix": [8, 3], "x": 186, "y": 40, "flags": 4 },
+ { "matrix": [8, 4], "x": 168, "y": 42, "flags": 4 },
+ { "matrix": [8, 5], "x": 149, "y": 44, "flags": 4 },
+ { "matrix": [9, 5], "x": 140, "y": 64, "flags": 4 },
+ { "matrix": [9, 4], "x": 158, "y": 60, "flags": 4 },
+ { "matrix": [9, 3], "x": 186, "y": 53, "flags": 4 },
+ { "matrix": [9, 2], "x": 205, "y": 56, "flags": 4 },
+ { "matrix": [9, 1], "x": 224, "y": 58, "flags": 4 }
+ ]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "matrix": [0, 0], "x": 0, "y": 0.93 },
+ { "matrix": [0, 1], "x": 1, "y": 0.32 },
+ { "matrix": [0, 2], "x": 2, "y": 0.18 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0.14 },
+ { "matrix": [0, 5], "x": 5, "y": 0.28 },
+ { "matrix": [5, 5], "x": 8, "y": 0.28 },
+ { "matrix": [5, 4], "x": 9, "y": 0.14 },
+ { "matrix": [5, 3], "x": 10, "y": 0 },
+ { "matrix": [5, 2], "x": 11, "y": 0.18 },
+ { "matrix": [5, 1], "x": 12, "y": 0.32 },
+ { "matrix": [5, 0], "x": 13, "y": 0.93 },
+ { "matrix": [1, 0], "x": 0, "y": 1.93 },
+ { "matrix": [1, 1], "x": 1, "y": 1.32 },
+ { "matrix": [1, 2], "x": 2, "y": 1.18 },
+ { "matrix": [1, 3], "x": 3, "y": 1 },
+ { "matrix": [1, 4], "x": 4, "y": 1.14 },
+ { "matrix": [1, 5], "x": 5, "y": 1.28 },
+ { "matrix": [6, 5], "x": 8, "y": 1.28 },
+ { "matrix": [6, 4], "x": 9, "y": 1.14 },
+ { "matrix": [6, 3], "x": 10, "y": 1 },
+ { "matrix": [6, 2], "x": 11, "y": 1.18 },
+ { "matrix": [6, 1], "x": 12, "y": 1.32 },
+ { "matrix": [6, 0], "x": 13, "y": 1.93 },
+ { "matrix": [2, 0], "x": 0, "y": 2.93 },
+ { "matrix": [2, 1], "x": 1, "y": 2.32 },
+ { "matrix": [2, 2], "x": 2, "y": 2.18 },
+ { "matrix": [2, 3], "x": 3, "y": 2 },
+ { "matrix": [2, 4], "x": 4, "y": 2.14 },
+ { "matrix": [2, 5], "x": 5, "y": 2.28 },
+ { "matrix": [7, 5], "x": 8, "y": 2.28 },
+ { "matrix": [7, 4], "x": 9, "y": 2.14 },
+ { "matrix": [7, 3], "x": 10, "y": 2 },
+ { "matrix": [7, 2], "x": 11, "y": 2.18 },
+ { "matrix": [7, 1], "x": 12, "y": 2.32 },
+ { "matrix": [7, 0], "x": 13, "y": 2.93 },
+ { "matrix": [3, 0], "x": 0, "y": 3.93 },
+ { "matrix": [3, 1], "x": 1, "y": 3.32 },
+ { "matrix": [3, 2], "x": 2, "y": 3.18 },
+ { "matrix": [3, 3], "x": 3, "y": 3 },
+ { "matrix": [3, 4], "x": 4, "y": 3.14 },
+ { "matrix": [3, 5], "x": 5, "y": 3.28 },
+ { "matrix": [8, 5], "x": 8, "y": 3.28 },
+ { "matrix": [8, 4], "x": 9, "y": 3.14 },
+ { "matrix": [8, 3], "x": 10, "y": 3 },
+ { "matrix": [8, 2], "x": 11, "y": 3.18 },
+ { "matrix": [8, 1], "x": 12, "y": 3.32 },
+ { "matrix": [8, 0], "x": 13, "y": 3.93 },
+ { "matrix": [4, 1], "x": 1, "y": 4.32 },
+ { "matrix": [4, 2], "x": 2, "y": 4.18 },
+ { "matrix": [4, 3], "x": 3, "y": 4 },
+ { "matrix": [4, 4], "x": 4.5, "y": 4.5, "h": 1.5 },
+ { "matrix": [4, 5], "x": 5.5, "y": 4.75, "h": 1.5 },
+ { "matrix": [9, 5], "x": 7.5, "y": 4.75, "h": 1.5 },
+ { "matrix": [9, 4], "x": 8.5, "y": 4.5, "h": 1.5 },
+ { "matrix": [9, 3], "x": 10, "y": 4 },
+ { "matrix": [9, 2], "x": 11, "y": 4.18 },
+ { "matrix": [9, 1], "x": 12, "y": 4.32 }
+ ]
+ }
+ }
+}

keyboards/eggsworks/egg58/keymaps/default/keymap.c

@@ -0,0 +1,27 @@
+// Copyright 2022-2023 Travis Mick (@tmick0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+ _BASE,
+ _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL,
+ KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSPC,
+ KC_LGUI, KC_LALT, OSL(1), MO(1), KC_SPC, KC_ENT, MO(1), KC_LBRC, KC_RBRC, KC_BSLS
+),
+
+[_FN] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_F12,
+ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_HOME, KC_TRNS, KC_END, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_DEL,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_MOD, RGB_TOG
+)
+};

keyboards/eggsworks/egg58/keymaps/via/keymap.c

@@ -0,0 +1,27 @@
+// Copyright 2022-2023 Travis Mick (@tmick0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+ _BASE,
+ _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL,
+ KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSPC,
+ KC_LGUI, KC_LALT, OSL(1), MO(1), KC_SPC, KC_ENT, MO(1), KC_LBRC, KC_RBRC, KC_BSLS
+),
+
+[_FN] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_F12,
+ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_HOME, KC_TRNS, KC_END, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_DEL,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_MOD, RGB_TOG
+)
+};

keyboards/eggsworks/egg58/keymaps/via/rules.mk

@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes

keyboards/eggsworks/egg58/readme.md

@@ -0,0 +1,23 @@
+# egg58
+
+* Keyboard Maintainer: [Travis Mick](https://github.com/tmick0)
+* Hardware Supported: egg58 (v1-v2.x) PCB, with Pro Micro or compatible MCU
+* Hardware Availability: https://eggs.works/ or https://github.com/eggsworks/egg58
+
+Make example for this keyboard (after setting up your build environment):
+
+ make eggsworks/egg58:default
+
+Flashing example for this keyboard:
+
+ make eggsworks/egg58:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/eggsworks/egg58/rules.mk

@@ -0,0 +1 @@
+# This file intentionally left blank