Download relevant toolchain.

Fix 'qmk new-keyboard' processing of development_board (#23996 )
Fix ploopy Adept/Madromys link (#24018 )
2024-07-01 23:04:04 +10:00 · 2024-06-30 03:39:49 +01:00 · 2024-06-30 02:57:35 +01:00 · 2024-06-29 20:56:29 +10:00 · 2024-06-29 10:20:11 +01:00 · 2024-06-29 10:19:51 +01:00
85 changed files with 1477 additions and 465 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,6 +25,7 @@
 *.la
 *.stackdump
 *.sym
+qmk_toolchains*

 # QMK-specific
 api_data/v1
--- a/data/templates/keyboard/keyboard.json
+++ b/data/templates/keyboard/keyboard.json
@ -2,8 +2,6 @@
    "keyboard_name": "%KEYBOARD%",
    "maintainer": "%USER_NAME%",
    "manufacturer": "%REAL_NAME%",
-    "processor": "%MCU%",
-    "bootloader": "%BOOTLOADER%",
    "diode_direction": "COL2ROW",
    "matrix_pins": {
        "cols": ["C2"],
--- a/keyboards/clueboard/card/keyboard.json
+++ b/keyboards/clueboard/card/keyboard.json
@ -43,10 +43,10 @@
    "levels": 6
  },
  "layout_aliases": {
-    "LAYOUT": "LAYOUT_all"
+    "LAYOUT_all": "LAYOUT"
  },
  "layouts": {
-    "LAYOUT_all": {
+    "LAYOUT": {
      "layout": [
        {"label": "ON/OFF", "matrix": [0, 0], "x": 0, "y": 0},
        {"label": "SAT+", "matrix": [0, 1], "x": 4, "y": 0},
--- a/keyboards/custommk/elysian/config.h
+++ b/keyboards/custommk/elysian/config.h
@ -0,0 +1,14 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// FRAM configuration
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN B7
+#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 4
+
+// SPI configuration
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
--- a/keyboards/custommk/elysian/halconf.h
+++ b/keyboards/custommk/elysian/halconf.h
@ -0,0 +1,14 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#define SERIAL_BUFFERS_SIZE 256
+
+#define SPI_USE_WAIT TRUE
+
+#include_next <halconf.h>
--- a/keyboards/custommk/elysian/keyboard.json
+++ b/keyboards/custommk/elysian/keyboard.json
@ -0,0 +1,65 @@
+{
+    "manufacturer": "customMK",
+    "keyboard_name": "Elysian",
+    "maintainer": "customMK",
+    "bootloader": "stm32-dfu",
+    "debounce": 10,
+    "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 32
+    },
+    "eeprom": {
+        "driver": "spi"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4"],
+        "rows": ["B0", "B1", "B6", "B8"]
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "url": "https://shop.custommk.com/collections/elysian/products/elysian",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xFABB",
+        "vid": "0xF35B",
+        "force_nkro": true
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "A5", "pin_b": "A6", "resolution": 2},
+            { "pin_a": "A7", "pin_b": "A8", "resolution": 2}
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3}
+            ]
+        }
+    }
+}
--- a/keyboards/custommk/elysian/keymaps/default/keymap.c
+++ b/keyboards/custommk/elysian/keymaps/default/keymap.c
@ -0,0 +1,19 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC, KC_ENT,
+        KC_Y,   KC_U,   KC_I,     KC_O,   KC_P,
+        KC_H,   KC_J,   KC_K,     KC_L,   KC_SCLN,  
+        KC_N,   KC_M,   KC_COMMA, KC_DOT, KC_SLASH
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_WH_D, KC_WH_U) }
+};
+#endif
--- a/keyboards/custommk/elysian/keymaps/default/rules.mk
+++ b/keyboards/custommk/elysian/keymaps/default/rules.mk
@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/custommk/elysian/keymaps/via/config.h
+++ b/keyboards/custommk/elysian/keymaps/via/config.h
@ -0,0 +1,6 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_MACRO_COUNT 128
--- a/keyboards/custommk/elysian/keymaps/via/keymap.c
+++ b/keyboards/custommk/elysian/keymaps/via/keymap.c
@ -0,0 +1,19 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC, MO(1),
+        KC_Y,   KC_U, KC_I,     KC_O,   KC_P,
+        KC_H,   KC_J, KC_K,     KC_L,   KC_SCLN,  
+        KC_N,   KC_M, KC_COMMA, KC_DOT, KC_SLASH
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_WH_D, KC_WH_U) }
+};
+#endif
--- a/keyboards/custommk/elysian/keymaps/via/rules.mk
+++ b/keyboards/custommk/elysian/keymaps/via/rules.mk
@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/custommk/elysian/mcuconf.h
+++ b/keyboards/custommk/elysian/mcuconf.h
@ -0,0 +1,10 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+// FRAM
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
--- a/keyboards/custommk/elysian/readme.md
+++ b/keyboards/custommk/elysian/readme.md
@ -0,0 +1,27 @@
+# Elysian
+
+![Elysian](https://i.imgur.com/W8yx11qh.jpeg)
+
+Elysian is a 3x5 macropad including two rotary encoders.
+
+* Keyboard Maintainer: [customMK](https://github.com/customMK)
+* Hardware Supported: Elysian
+* Hardware Availability: [customMK](https://shop.custommk.com/collections/keyboards/products/elysian)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make custommk/elysian:default
+
+Flashing example for this keyboard:
+
+    make custommk/elysian: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**: Press and hold down the rotary encoder at (0,0) in the matrix (the rotary encoder in the top left corner) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
--- a/keyboards/ez_maker/directpins/promicro/keyboard.json
+++ b/keyboards/ez_maker/directpins/promicro/keyboard.json
@ -27,8 +27,11 @@
        "pid": "0x2320",
        "vid": "0xFEED"
    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
    "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
            "layout": [
                {"label": "D3", "matrix": [0, 0], "x": 0, "y": 0},
                {"label": "D2", "matrix": [1, 0], "x": 0, "y": 1},
--- a/keyboards/ez_maker/directpins/promicro/keymaps/default/keymap.json
+++ b/keyboards/ez_maker/directpins/promicro/keymaps/default/keymap.json
@ -1,7 +1,7 @@
 {
    "keyboard": "ez_maker/directpins/promicro",
    "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
    "layers": [
        [
            "KC_0",
--- a/keyboards/ez_maker/directpins/proton_c/keyboard.json
+++ b/keyboards/ez_maker/directpins/proton_c/keyboard.json
@ -33,8 +33,11 @@
        "pid": "0x2321",
        "vid": "0xFEED"
    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
    "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
            "layout": [
                {"label": "A9", "matrix": [0, 0], "x": 0, "y": 0},
                {"label": "A10", "matrix": [1, 0], "x": 0, "y": 1},
--- a/keyboards/ez_maker/directpins/proton_c/keymaps/default/keymap.json
+++ b/keyboards/ez_maker/directpins/proton_c/keymaps/default/keymap.json
@ -1,7 +1,7 @@
 {
    "keyboard": "ez_maker/directpins/proton_c",
    "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
    "layers": [
        [
            "KC_0",
--- a/keyboards/ez_maker/directpins/rp2040/keyboard.json
+++ b/keyboards/ez_maker/directpins/rp2040/keyboard.json
@ -38,8 +38,11 @@
        "pid": "0x2326",
        "vid": "0xFEED"
    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
    "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
            "layout": [
                {"label": "GP0", "matrix": [0, 0], "x": 0, "y": 0},
                {"label": "GP1", "matrix": [1, 0], "x": 0, "y": 1},
--- a/keyboards/ez_maker/directpins/rp2040/keymaps/default/keymap.json
+++ b/keyboards/ez_maker/directpins/rp2040/keymaps/default/keymap.json
@ -1,7 +1,7 @@
 {
    "keyboard": "ez_maker/directpins/rp2040",
    "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
    "layers": [
        [
            "KC_0",
--- a/keyboards/ez_maker/directpins/teensy_2/keyboard.json
+++ b/keyboards/ez_maker/directpins/teensy_2/keyboard.json
@ -30,8 +30,11 @@
        "pid": "0x2322",
        "vid": "0xFEED"
    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
    "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
            "layout": [
                {"label": "B0", "matrix": [0, 0], "x": 0, "y": 0},                                                                                                       {"label": "F0", "matrix": [0, 1], "x": 4, "y": 0},
                {"label": "B1", "matrix": [1, 0], "x": 0, "y": 1},                                                                                                       {"label": "F1", "matrix": [1, 1], "x": 4, "y": 1},
--- a/keyboards/ez_maker/directpins/teensy_2/keymaps/default/keymap.json
+++ b/keyboards/ez_maker/directpins/teensy_2/keymaps/default/keymap.json
@ -1,7 +1,7 @@
 {
    "keyboard": "ez_maker/directpins/teensy_2",
    "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
    "layers": [
        [
            "KC_0",                 "KC_1",
--- a/keyboards/ez_maker/directpins/teensy_2pp/keyboard.json
+++ b/keyboards/ez_maker/directpins/teensy_2pp/keyboard.json
@ -37,8 +37,11 @@
        "pid": "0x2323",
        "vid": "0xFEED"
    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
    "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
            "layout": [
                {"label": "B7", "matrix": [0, 0], "x": 0, "y": 0},                                                                                                       {"label": "B6", "matrix": [0, 3], "x": 5, "y": 0},
                {"label": "D0", "matrix": [1, 0], "x": 0, "y": 1},                                                                                                       {"label": "B5", "matrix": [1, 3], "x": 5, "y": 1},
--- a/keyboards/ez_maker/directpins/teensy_2pp/keymaps/default/keymap.json
+++ b/keyboards/ez_maker/directpins/teensy_2pp/keymaps/default/keymap.json
@ -1,7 +1,7 @@
 {
    "keyboard": "ez_maker/directpins/teensy_2pp",
    "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
    "layers": [
        [
            "KC_0",                    "KC_1",
--- a/keyboards/ez_maker/directpins/teensy_32/keyboard.json
+++ b/keyboards/ez_maker/directpins/teensy_32/keyboard.json
@ -31,8 +31,11 @@
        "pid": "0x2324",
        "vid": "0xFEED"
    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
    "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
            "layout": [
                {"label": "0", "matrix": [0, 0], "x": 0, "y": 0},
                {"label": "1", "matrix": [1, 0], "x": 0, "y": 1},
--- a/keyboards/ez_maker/directpins/teensy_32/keymaps/default/keymap.json
+++ b/keyboards/ez_maker/directpins/teensy_32/keymaps/default/keymap.json
@ -1,7 +1,7 @@
 {
    "keyboard": "ez_maker/directpins/teensy_32",
    "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
    "layers": [
        [
            "KC_0",
--- a/keyboards/ez_maker/directpins/teensy_lc/keyboard.json
+++ b/keyboards/ez_maker/directpins/teensy_lc/keyboard.json
@ -31,8 +31,11 @@
        "pid": "0x2325",
        "vid": "0xFEED"
    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
    "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
            "layout": [
                {"label": "0", "matrix": [0, 0], "x": 0, "y": 0},
                {"label": "1", "matrix": [1, 0], "x": 0, "y": 1},
--- a/keyboards/ez_maker/directpins/teensy_lc/keymaps/default/keymap.json
+++ b/keyboards/ez_maker/directpins/teensy_lc/keymaps/default/keymap.json
@ -1,7 +1,7 @@
 {
    "keyboard": "ez_maker/directpins/teensy_lc",
    "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
    "layers": [
        [
            "KC_0",
--- a/keyboards/h0oni/deskpad/keyboard.json
+++ b/keyboards/h0oni/deskpad/keyboard.json
@ -39,8 +39,11 @@
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "debounce": 3,
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
    "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
            "layout": [
                {"matrix": [0, 0], "x": 0, "y": 0},
                {"matrix": [0, 1], "x": 1, "y": 0},
--- a/keyboards/h0oni/deskpad/keymaps/default/keymap.c
+++ b/keyboards/h0oni/deskpad/keymaps/default/keymap.c
@ -171,19 +171,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-  [0] = LAYOUT_all(
+  [0] = LAYOUT(
      TD(TD_CUT_REDO), TD(TD_MPRV_LEFT), TD(TD_PLAY_PAUSE_MUTE), TD(TD_MNXT_RIGHT), TD(QUAD_CVXA), TD(QUAD_LAYER_SWITCH)
      ),

-  [1] = LAYOUT_all(
+  [1] = LAYOUT(
      YOUTUBE, KC_WBAK, TD(TD_SEARCH_REFRESH), KC_WFWD, FACEBOOK, TD(QUAD_LAYER_SWITCH)
      ),

-  [2] = LAYOUT_all(
+  [2] = LAYOUT(
      A(KC_F4), SGUI(KC_S), KC_MYCM, LCA(KC_DEL), KC_CALC, TD(QUAD_LAYER_SWITCH)
      ),
  
-  [3] = LAYOUT_all(
+  [3] = LAYOUT(
      C(KC_SLSH), VALORANT, VSCODE, DISCORD, LSA(KC_A), TD(QUAD_LAYER_SWITCH)
      ),
 };
--- a/keyboards/h0oni/deskpad/keymaps/via/keymap.c
+++ b/keyboards/h0oni/deskpad/keymaps/via/keymap.c
@ -171,19 +171,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-  [0] = LAYOUT_all(
+  [0] = LAYOUT(
      TD(TD_CUT_REDO), TD(TD_MPRV_LEFT), TD(TD_PLAY_PAUSE_MUTE), TD(TD_MNXT_RIGHT), TD(QUAD_CVXA), TD(QUAD_LAYER_SWITCH)
      ),

-  [1] = LAYOUT_all(
+  [1] = LAYOUT(
      YOUTUBE, KC_WBAK, TD(TD_SEARCH_REFRESH), KC_WFWD, FACEBOOK, TD(QUAD_LAYER_SWITCH)
      ),

-  [2] = LAYOUT_all(
+  [2] = LAYOUT(
      A(KC_F4), SGUI(KC_S), KC_MYCM, LCA(KC_DEL), KC_CALC, TD(QUAD_LAYER_SWITCH)
      ),
  
-  [3] = LAYOUT_all(
+  [3] = LAYOUT(
      C(KC_SLSH), VALORANT, VSCODE, DISCORD, LSA(KC_A), TD(QUAD_LAYER_SWITCH)
      ),
 };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nick Brassel	33f5e67408	Download relevant toolchain.	2024-07-01 23:04:04 +10:00
Joel Challis	3ffe8d917a	Fix 'qmk new-keyboard' processing of development_board (#23996 )	2024-06-30 03:39:49 +01:00
Danylo Kondratiev	12379dc1eb	Fix ploopy Adept/Madromys link (#24018 )	2024-06-30 02:57:35 +01:00
Ryan	d6bfbdb6b1	`horrortroll/handwired_k552`: fix RGB Matrix LED config (#24014 )	2024-06-29 20:56:29 +10:00
Ryan	cc0b2f9814	`jels/boaty`: adjust layout name (#24013 )	2024-06-29 10:20:11 +01:00
Ryan	5624804c68	`h0oni/deskpad` and `hotduck`: adjust layout names (#24004 )	2024-06-29 10:19:51 +01:00
Ryan	2bde8ce206	`ez_maker`: adjust layout names (#24015 )	2024-06-29 07:54:52 +01:00
Ryan	086e8e938e	`tzarc/djinn`: adjust layout name (#24012 )	2024-06-29 16:00:05 +10:00
Ryan	cd374b1500	`clueboard/card`: Swap layout and alias (#24007 )	2024-06-29 04:07:42 +01:00
Danny	9d02ac37f7	Add Nyquist Rev. 5 (#23971 ) * Add Nyquist Rev. 5 * Remove unused keymap	2024-06-27 13:37:41 -04:00
David Hoelscher	603586800c	[Keyboard] Add Elysian (#23949 ) * adding Elysian * corrections from zvecr	2024-06-26 21:56:16 -06:00
TyraelWasTaken	90b043e01c	Add support for Equanimity (#23965 ) * Add Equanimity files * Update keyboard.json format * Update readme.md * CRLF to LF * Force LF and correct rules.mk * Remove config.h * Remove rules.mk * Update keymap.c * Update keyboard.json * Update name in readme.md	2024-06-26 21:55:47 -06:00
Ryan	5f794217b4	`xelus/snap96`: add matrix diagram and some additional layouts (#23992 )	2024-06-26 14:35:45 +10:00
Ryan	b71b81d539	`hs60/v2/hhkb`: Adjust layout name (#23998 )	2024-06-26 05:28:45 +01:00
Ryan	17ae6f9b53	`helix/pico` and `rev2`: add `keyboard.json`s (#23964 )	2024-06-26 13:47:36 +10:00
Joel Challis	cebe521b11	Fix docker_cmd.sh when userspace is not configured (#23997 )	2024-06-26 11:34:24 +10:00
Joel Challis	0b572a1be6	Remove some redundant 'blank' files (#23995 )	2024-06-25 07:38:56 +01:00