Merge remote-tracking branch 'qmk/master' into merge-2024-06-23

2024-06-23 22:54:29 -06:00 · 2024-06-23 22:54:29 -06:00 · e9d70b410a
commit e9d70b410a
parent b02ff548ca 03e688e91f
15675 changed files with 653160 additions and 679575 deletions
--- a/keyboards/argo_works/ishi/80/mk0_avr/keyboard.json
+++ b/keyboards/argo_works/ishi/80/mk0_avr/keyboard.json
@ -19,8 +19,7 @@
        "console": false,
        "extrakey": true,
        "mousekey": true,
-        "nkro": true,
-        "encoder": false
+        "nkro": true
    },
    "matrix_pins": {
        "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"],
--- a/keyboards/argo_works/ishi/80/mk0_avr/rules.mk
+++ b/keyboards/argo_works/ishi/80/mk0_avr/rules.mk
@ -1 +0,0 @@
-# This file intentionally left blank
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json
@ -21,7 +21,9 @@
        "extrakey": true,
        "mousekey": true,
        "nkro": true,
-        "encoder": true
+        "encoder": true,
+        "oled": true,
+        "wpm": true
    },
    "matrix_pins": {
        "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"],
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
@ -1,2 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes