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

qmk · May 26, 2024 · 26c68d2 · 26c68d2
2 parents 5f02fb9 + 249f170
commit 26c68d2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
@@ -306,13 +306,13 @@
         "target": "jacky_studio/piggy60/rev1"
     },
     "jj40": {
-        "target": "kprepublic/jj40"
+        "target": "kprepublic/jj40/rev1"
     },
     "jj4x4": {
         "target": "kprepublic/jj4x4"
     },
     "jj50": {
-        "target": "kprepublic/jj50"
+        "target": "kprepublic/jj50/rev1"
     },
     "jm60": {
         "target": "kbdfans/jm60"

diff --git a/docs/ChangeLog/20240526/PR23309.md b/docs/ChangeLog/20240526/PR23309.md
@@ -1,4 +1,4 @@
-# MechKeys ACR60 Layout Updates
+# MechKeys ACR60 Layout Updates ([#23309](https://github.com/qmk/qmk_firmware/pull/23309))
 
 This PR removed and changed some of the layouts that were configured for
 the ACR60. If you use one of the following layouts, you will need to

diff --git a/docs/ChangeLog/20240526/PR23329.md b/docs/ChangeLog/20240526/PR23329.md
@@ -0,0 +1,13 @@
+# P3D Spacey Layout Updates ([#23329](https://github.com/qmk/qmk_firmware/pull/23329))
+
+This PR removed the `LAYOUT` macro that was configured for the Spacey.
+If you have a keymap for this keyboard, you will need to update your
+keymap using the following steps:
+
+1. Change your layout macro to `LAYOUT_all`.
+2. Remove the two `KC_NO` keycodes following the Space and Delete keys
+   on the bottom row.
+3. Move the keycode for the encoder pushbutton (customarily Mute) to the
+   end of the top row, after the customary Backspace key.
+4. Move the keycode for the Right Arrow to the end of the Shift row,
+   after the Down Arrow key.
diff --git a/keyboards/kprepublic/jj40/rev1/readme.md b/keyboards/kprepublic/jj40/rev1/readme.md
@@ -5,7 +5,7 @@
 A compact 40% (12x4) ortholinear keyboard kit made and KPRepublic on AliExpress.
 
 * Keyboard Maintainer: [QMK Community](https://github.com/qmk)
-* Hardware Supported: JJ40 rev1 (Atmega32A)
+* Hardware Supported: JJ40 rev1 (ATmega32A)
 * Hardware Availability: [AliExpress](https://www.aliexpress.com/store/product/jj40-Custom-Mechanical-Keyboard-40-PCB-programmed-40-planck-layouts-bface-firmware-gh40/3034003_32828781103.html)
 
 Make example for this keyboard (after setting up your build environment):