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

5 files changed, 24 insertions, 10 deletions

diff --git a/keyboards/afternoonlabs/gust/rev1/config.h b/keyboards/afternoonlabs/gust/rev1/config.h
index 646f21dcc5..650b98c1b8 100644
--- a/keyboards/afternoonlabs/gust/rev1/config.h
+++ b/keyboards/afternoonlabs/gust/rev1/config.h
@@ -25,11 +25,11 @@
 
 /* key matrix size */
 // Rows are doubled-up
-#define MATRIX_ROWS 2
+#define MATRIX_ROWS 3
 #define MATRIX_COLS 3
 
 // wiring of each half
-#define MATRIX_ROW_PINS { F5, F4 }
+#define MATRIX_ROW_PINS { F5, F4, D0 }
 #define MATRIX_COL_PINS { D1, D2, D3 }
 
 /* Set 0 if debouncing isn't needed */
diff --git a/keyboards/afternoonlabs/gust/rev1/info.json b/keyboards/afternoonlabs/gust/rev1/info.json
index 376cb265b6..ae742687ce 100644
--- a/keyboards/afternoonlabs/gust/rev1/info.json
+++ b/keyboards/afternoonlabs/gust/rev1/info.json
@@ -31,6 +31,18 @@
                 {
                     "x": 2,
                     "y": 1
+                },
+                {
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "x": 1,
+                    "y": 3
+                },
+                {
+                    "x": 2,
+                    "y": 3
                 }
             ]
         }
diff --git a/keyboards/afternoonlabs/gust/rev1/readme.md b/keyboards/afternoonlabs/gust/rev1/readme.md
index f72e5cc6b9..9192d1a35b 100644
--- a/keyboards/afternoonlabs/gust/rev1/readme.md
+++ b/keyboards/afternoonlabs/gust/rev1/readme.md
@@ -2,11 +2,11 @@
 
 ![Gust](https://i.imgur.com/S94jViT.jpeg)
 
-Gust Macro Board is a simple 6 key cluster that comes as a free bonus with the [Breeze Split Keyboard](https://afternoonlabs.com/breeze).
+Gust Macro Board is a simple 3x3 key macro board. The bottom row can be snapped off to get a 2x3 board. Gust comes as a free bonus with the [Breeze Split Keyboard](https://afternoonlabs.com/breeze).
 
-* Keyboard Maintainer: [Eithan Shavit](https://github.com/eithanshavit)
+* Keyboard Maintainer: [Afternoon Labs](https://github.com/afternoonlabs)
 * Hardware Supported: Gust Rev1 PCB
-* Hardware Availability: Coming soon
+* Hardware Availability: [store.afternoonlab.com](https://store.afternoonlabs.com)
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.h b/keyboards/afternoonlabs/gust/rev1/rev1.h
index 97f75cef80..22c1910a1f 100644
--- a/keyboards/afternoonlabs/gust/rev1/rev1.h
+++ b/keyboards/afternoonlabs/gust/rev1/rev1.h
@@ -22,9 +22,11 @@
 
 #define LAYOUT( \
     M00, M01, M02, \
-    M10, M11, M12  \
+    M10, M11, M12,  \
+    M20, M21, M22  \
 ) \
 { \
     { M00, M01, M02 }, \
-    { M10, M11, M12 }  \
+    { M10, M11, M12 }, \
+    { M20, M21, M22 }  \
 }
diff --git a/keyboards/afternoonlabs/gust/rev1/rules.mk b/keyboards/afternoonlabs/gust/rev1/rules.mk
index eb0a77dced..b00cf4eff9 100644
--- a/keyboards/afternoonlabs/gust/rev1/rules.mk
+++ b/keyboards/afternoonlabs/gust/rev1/rules.mk
@@ -8,8 +8,8 @@ BOOTLOADER = caterina
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
@@ -19,4 +19,4 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
-AUDIO_ENABLE = no           # Audio output
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file