Merge branch 'qmk:master' into tri-mode

.editorconfig

@@ -11,7 +11,8 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[{*.yaml,*.yml}] # To match GitHub Actions formatting
+ # To match GitHub Actions formatting
+[*.{yaml,yml}]
 indent_size = 2
 
 [*.md]

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,5 @@
 <!--- Provide a general summary of your changes in the title above. -->
 
-<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
 <!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
 
 ## Description
@@ -15,7 +14,7 @@
 - [ ] New feature
 - [ ] Enhancement/optimization
 - [ ] Keyboard (addition or update)
-- [ ] Keymap/layout/userspace (addition or update)
+- [ ] Keymap/layout (addition or update)
 - [ ] Documentation
 
 ## Issues Fixed or Closed by This PR

builddefs/docsgen/package.json

@@ -1,7 +1,7 @@
 {
  "license": "GPL-2.0-or-later",
  "devDependencies": {
- "vite": "^5.2.10",
+ "vite": "^5.2.14",
  "vitepress": "^1.1.0",
  "vitepress-plugin-tabs": "^0.5.0",
  "vue": "^3.4.24"

builddefs/docsgen/yarn.lock

@@ -743,10 +743,10 @@ tabbable@^6.2.0:
  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
  integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
 
-vite@^5.2.10, vite@^5.2.9:
- version "5.2.10"
- resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.10.tgz#2ac927c91e99d51b376a5c73c0e4b059705f5bd7"
- integrity sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==
+vite@^5.2.14, vite@^5.2.9:
+ version "5.2.14"
+ resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.14.tgz#fd5f60facf6b5f90ec7da6323c467a365d380c3d"
+ integrity sha512-TFQLuwWLPms+NBNlh0D9LZQ+HXW471COABxw/9TEUBrjuHMo9BrYBPrN/SYAwIuVL+rLerycxiLT41t4f5MZpA==
  dependencies:
  esbuild "^0.20.1"
  postcss "^8.4.38"

drivers/sensors/adns9800.c

@@ -67,14 +67,15 @@
 #define REG_SROM_Load_Burst 0x62
 #define REG_Pixel_Burst 0x64
 
-#define MIN_CPI 200
-#define MAX_CPI 8200
-#define CPI_STEP 200
-#define CLAMP_CPI(value) value<MIN_CPI ? MIN_CPI : value> MAX_CPI ? MAX_CPI : value
-#define US_BETWEEN_WRITES 120
-#define US_BETWEEN_READS 20
-#define US_BEFORE_MOTION 100
-#define MSB1 0x80
+#define MIN_CPI 200
+#define MAX_CPI 8200
+#define CPI_STEP 200
+#define CLAMP_CPI(value) value<MIN_CPI ? MIN_CPI : value> MAX_CPI ? MAX_CPI : value
+#define US_BETWEEN_WRITES 120
+#define US_BETWEEN_READS 20
+#define US_DELAY_AFTER_ADDR 100
+#define US_BEFORE_MOTION 100
+#define MSB1 0x80
 // clang-format on
 
 void adns9800_spi_start(void) {
@@ -92,6 +93,7 @@ void adns9800_write(uint8_t reg_addr, uint8_t data) {
 uint8_t adns9800_read(uint8_t reg_addr) {
  adns9800_spi_start();
  spi_write(reg_addr & 0x7f);
+ wait_us(US_DELAY_AFTER_ADDR);
  uint8_t data = spi_read();
  spi_stop();
  wait_us(US_BETWEEN_READS);

keyboards/4pplet/waffling80/rev_b_ansi/info.json → keyboards/4pplet/waffling80/rev_b_ansi/keyboard.json

@@ -15,7 +15,7 @@
  "mousekey": true,
  "nkro": true,
  "rgblight": true
- }
+ },
  "ws2812": {
  "pin": "A8"
  },

keyboards/a_jazz/akc084/keyboard.json

@@ -81,7 +81,7 @@
  {"matrix": [2, 9], "x": 9.5, "y": 2},
  {"matrix": [2, 10], "x": 10.5, "y": 2},
  {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
  {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
  {"matrix": [5, 11], "x": 15, "y": 2},
  {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
@@ -95,33 +95,33 @@
  {"matrix": [3, 8], "x": 8.75, "y": 3},
  {"matrix": [3, 9], "x": 9.75, "y": 3},
  {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 2.25},
- {"matrix": [3, 12], "x": 14, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
  {"matrix": [5, 12], "x": 15, "y": 3},
- {"matrix": [4, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [4, 1], "x": 2.25, "y": 3},
- {"matrix": [4, 2], "x": 3.25, "y": 3},
- {"matrix": [4, 3], "x": 4.25, "y": 3},
- {"matrix": [4, 4], "x": 5.25, "y": 3},
- {"matrix": [4, 5], "x": 6.25, "y": 3},
- {"matrix": [4, 6], "x": 7.25, "y": 3},
- {"matrix": [4, 7], "x": 8.25, "y": 3},
- {"matrix": [4, 8], "x": 9.25, "y": 3},
- {"matrix": [4, 9], "x": 10.25, "y": 3},
- {"matrix": [4, 10], "x": 11.25, "y": 3},
- {"matrix": [4, 11], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [5, 7], "x": 14, "y": 3},
- {"matrix": [5, 13], "x": 15, "y": 3},
- {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [5, 3], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [5, 4], "x": 10, "y": 4},
- {"matrix": [5, 5], "x": 11, "y": 4},
- {"matrix": [5, 6], "x": 12, "y": 4},
- {"matrix": [5, 8], "x": 13, "y": 4},
- {"matrix": [5, 9], "x": 14, "y": 4},
- {"matrix": [5, 10], "x": 15, "y": 4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4},
+ {"matrix": [4, 2], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 4], "x": 5.25, "y": 4},
+ {"matrix": [4, 5], "x": 6.25, "y": 4},
+ {"matrix": [4, 6], "x": 7.25, "y": 4},
+ {"matrix": [4, 7], "x": 8.25, "y": 4},
+ {"matrix": [4, 8], "x": 9.25, "y": 4},
+ {"matrix": [4, 9], "x": 10.25, "y": 4},
+ {"matrix": [4, 10], "x": 11.25, "y": 4},
+ {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [5, 7], "x": 14, "y": 4},
+ {"matrix": [5, 13], "x": 15, "y": 4},
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 4], "x": 10, "y": 5},
+ {"matrix": [5, 5], "x": 11, "y": 5},
+ {"matrix": [5, 6], "x": 12, "y": 5},
+ {"matrix": [5, 8], "x": 13, "y": 5},
+ {"matrix": [5, 9], "x": 14, "y": 5},
+ {"matrix": [5, 10], "x": 15, "y": 5}
  ]
  }
  }

keyboards/nopunin10did/styrkatmel/keyboard.json

@@ -0,0 +1,127 @@
+{
+ "keyboard_name": "Styrka Atmel",
+ "manufacturer": "NoPunIn10Did",
+ "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/styrkatmel",
+ "maintainer": "NoPunIn10Did",
+ "usb": {
+ "vid": "0x4E50",
+ "pid": "0x5341",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "backlight": false,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4", "F1", "D7", "B4", "B5", "B6"],
+ "rows": ["B3", "B0", "B1", "B2", "E6", "B7", "C6", "C7", "D6", "D4"]
+ },
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 3
+ },
+ "indicators": {
+ "caps_lock": "F0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+ {"matrix": [1, 2], "x": 5.25, "y": 0},
+ {"matrix": [0, 3], "x": 6.25, "y": 0},
+ {"matrix": [1, 3], "x": 7.25, "y": 0},
+ {"matrix": [0, 4], "x": 8.25, "y": 0},
+ {"matrix": [1, 4], "x": 9.25, "y": 0},
+ {"matrix": [0, 5], "x": 10.25, "y": 0},
+ {"matrix": [1, 5], "x": 11.25, "y": 0},
+ {"matrix": [0, 6], "x": 12.25, "y": 0},
+ {"matrix": [1, 6], "x": 13.25, "y": 0},
+ {"matrix": [0, 7], "x": 14.25, "y": 0},
+ {"matrix": [0, 8], "x": 15.25, "y": 0, "w": 2},
+ {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2.25, "y": 1, "w":1.5},
+ {"matrix": [3, 1], "x": 3.75, "y": 1},
+ {"matrix": [2, 2], "x": 4.75, "y": 1},
+ {"matrix": [3, 2], "x": 5.75, "y": 1},
+ {"matrix": [2, 3], "x": 6.75, "y": 1},
+ {"matrix": [3, 3], "x": 7.75, "y": 1},
+ {"matrix": [2, 4], "x": 8.75, "y": 1},
+ {"matrix": [3, 4], "x": 9.75, "y": 1},
+ {"matrix": [2, 5], "x": 10.75, "y": 1},
+ {"matrix": [3, 5], "x": 11.75, "y": 1},
+ {"matrix": [2, 6], "x": 12.75, "y": 1},
+ {"matrix": [3, 6], "x": 13.75, "y": 1},
+ {"matrix": [2, 7], "x": 14.75, "y": 1},
+ {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2.25, "y": 2, "w":1.25},
+ {"matrix": [5, 1], "x": 4, "y": 2},
+ {"matrix": [4, 2], "x": 5, "y": 2},
+ {"matrix": [5, 2], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [5, 3], "x": 8, "y": 2},
+ {"matrix": [4, 4], "x": 9, "y": 2},
+ {"matrix": [5, 4], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+ {"matrix": [5, 5], "x": 12, "y": 2},
+ {"matrix": [4, 6], "x": 13, "y": 2},
+ {"matrix": [5, 6], "x": 14, "y": 2},
+ {"matrix": [4, 7], "x": 15, "y": 2},
+ {"matrix": [4, 8], "x": 16, "y": 1, "w":1.25, "h":2},
+ {"matrix": [5, 8], "x": 17.25, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2.25, "y": 3, "w":1.25},
+ {"matrix": [7, 1], "x": 3.5, "y": 3},
+ {"matrix": [6, 2], "x": 4.5, "y": 3},
+ {"matrix": [7, 2], "x": 5.5, "y": 3},
+ {"matrix": [6, 3], "x": 6.5, "y": 3},
+ {"matrix": [7, 3], "x": 7.5, "y": 3},
+ {"matrix": [6, 4], "x": 8.5, "y": 3},
+ {"matrix": [7, 4], "x": 9.5, "y": 3},
+ {"matrix": [6, 5], "x": 10.5, "y": 3},
+ {"matrix": [7, 5], "x": 11.5, "y": 3},
+ {"matrix": [6, 6], "x": 12.5, "y": 3},
+ {"matrix": [7, 6], "x": 13.5, "y": 3},
+ {"matrix": [6, 7], "x": 14.5, "y": 3, "w":1.75},
+ {"matrix": [6, 8], "x": 16.25, "y": 3},
+ {"matrix": [7, 8], "x": 17.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [9, 0], "x": 1, "y": 4},
+ {"matrix": [8, 1], "x": 2.25, "y": 4, "w":1.25},
+ {"matrix": [9, 1], "x": 3.5, "y": 4, "w":1.25},
+ {"matrix": [8, 2], "x": 4.75, "y": 4, "w":1.25},
+ {"matrix": [8, 4], "x": 6, "y": 4, "w":7},
+ {"matrix": [8, 6], "x": 12.25, "y": 4, "w":1.25},
+ {"matrix": [9, 6], "x": 13.5, "y": 4, "w":1.25},
+ {"matrix": [8, 7], "x": 15.25, "y": 4},
+ {"matrix": [8, 8], "x": 16.25, "y": 4},
+ {"matrix": [9, 8], "x": 17.25, "y": 4}
+ ]
+ }
+ }
+}

keyboards/nopunin10did/styrkatmel/keymaps/default/keymap.c

@@ -0,0 +1,48 @@
+/* Copyright 2024 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Keymap BASE: (Base Layer) Default Layer
+ * .-------.,---------------------------------------------------------------.
+ * | F1| F2||Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| BkSpc |Ins|
+ * |---|---||---------------------------------------------------------------|
+ * | F3| F4||Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| |Del|
+ * |---|---||---------------------------------------------------------------|
+ * | F5| F6||CAPS | A| S| D| F| G| H| J| K| L| ;| '| \| Ent|PgU|
+ * |---|---||---------------------------------------------------------------|
+ * | F7| F8||Shft| <>| Z| X| C| V| B| N| M| ,| .| /| Shift| Up|PgD|
+ * |---|---||---------------------------------------------------------------|
+ * | F9|F10||LCtl|LGUI|LAlt| Space | Alt| FN||| Lt| Dn| Rt|
+ * `-------'`---------------------------------------------------------------'
+ */
+[0] = LAYOUT( 
+ KC_F1, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+ KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL,
+ KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP,
+ KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
+ KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+[1] = LAYOUT( 
+ QK_BOOT, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_INS,
+ KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL,
+ KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP,
+ KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
+ KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+};

keyboards/nopunin10did/styrkatmel/readme.md

@@ -0,0 +1,25 @@
+# Viktus Styrka Atmel Edition
+
+The Viktus Styrka is a 65% + left macro block created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner).
+
+This is a custom Atmel ISO Hotswap PCB for the Viktus Styrka designed and maintained by NoPunIn10Did.
+
+* Firmware Maintainer: [nopunin10did](https://github.com/nopunin10did)
+* Hardware Supported: Styrka
+* Hardware Availability: <https://www.Viktus.Design>
+
+Make example for this keyboard (after setting up your build environment):
+
+ make nopunin10did/styrkatmel:default
+
+Flashing example for this keyboard:
+
+ make nopunin10did/styrkatmel: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).
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at the top left in the macro columns (default: F1) 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`. For the default layout, hold down the rightmost 1.25u key on the bottom row, then tap the top-left key in the macro columns.