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

keyboards/afternoonlabs/breeze/breeze.h

@@ -19,3 +19,6 @@
 #ifdef KEYBOARD_afternoonlabs_breeze_rev0
 #    include "rev0.h"
 #endif
+#ifdef KEYBOARD_afternoonlabs_breeze_rev1
+#    include "rev1.h"
+#endif

keyboards/afternoonlabs/breeze/keymaps/default/keymap.c

@@ -43,11 +43,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+     RESET,   _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,  KC_MUTE, KC_VOLD, KC_VOLU,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,  _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,           _______,
+     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,           _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______,  _______, _______,
   //└────────┴────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┴────────┴────────┴────────┘└────────┴────────┴────────┘
@@ -68,4 +68,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                 _______, _______, _______, _______,          _______, _______, KC_P0,   KC_PDOT
   //                           └────────┴────────┴────────┴────────┘        └────────┴────────┴────────┴────────┘
   )
-};
+};

keyboards/afternoonlabs/breeze/rev1/config.h

@@ -0,0 +1,49 @@
+/* Copyright 2021 eithanshavit
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x616C
+#define PRODUCT_ID 0x0001
+#define DEVICE_VER 0x0001
+#define MANUFACTURER AfternoonLabs
+#define PRODUCT Breeze
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 9
+
+// wiring of each half
+#define MATRIX_ROW_PINS \
+    { F4, F5, F6, F7, B1 }
+#define MATRIX_COL_PINS \
+    { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
+
+#define SPLIT_HAND_PIN B3
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define SOFT_SERIAL_PIN D2
+
+#define DIODE_DIRECTION COL2ROW
+
+#define BOOTMAGIC_LITE_ROW_RIGHT 0
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
+#define BOOTMAGIC_LITE_ROW_LEFT 0
+#define BOOTMAGIC_LITE_COLUMN_LEFT 5

keyboards/afternoonlabs/breeze/rev1/info.json

@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "Breeze",
+    "url": "afternoonlabs.com/breeze",
+    "productId": "0x0001",
+    "maintainer": "eithanshavit",
+    "width": 19,
+    "height": 6,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0.375},
+                {"x":1, "y":0.375},
+                {"x":2, "y":0.125},
+                {"x":3, "y":0},
+                {"x":4, "y":0.125},
+                {"x":5, "y":0.25},
+                {"x":9.75, "y":0.25},
+                {"x":10.75, "y":0.125},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0.125},
+                {"x":13.75, "y":0.375},
+                {"x":14.75, "y":0.375},
+                {"x":16, "y":0.375},
+                {"x":17, "y":0.375},
+                {"x":18, "y":0.375},
+
+                {"x":0, "y":1.375},
+                {"x":1, "y":1.375},
+                {"x":2, "y":1.125},
+                {"x":3, "y":1},
+                {"x":4, "y":1.125},
+                {"x":5, "y":1.25},
+                {"x":9.75, "y":1.25},
+                {"x":10.75, "y":1.125},
+                {"x":11.75, "y":1},
+                {"x":12.75, "y":1.125},
+                {"x":13.75, "y":1.375},
+                {"x":14.75, "y":1.375},
+                {"x":16, "y":1.375},
+                {"x":17, "y":1.375},
+                {"x":18, "y":1.375},
+
+                {"x":0, "y":2.375},
+                {"x":1, "y":2.375},
+                {"x":2, "y":2.125},
+                {"x":3, "y":2},
+                {"x":4, "y":2.125},
+                {"x":5, "y":2.25},
+                {"x":9.75, "y":2.25},
+                {"x":10.75, "y":2.125},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2.125},
+                {"x":13.75, "y":2.375},
+                {"x":14.75, "y":2.375},
+                {"x":17, "y":2.375},
+
+                {"x":0, "y":3.375},
+                {"x":1, "y":3.375},
+                {"x":2, "y":3.125},
+                {"x":3, "y":3},
+                {"x":4, "y":3.125},
+                {"x":5, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.125},
+                {"x":11.75, "y":3},
+                {"x":12.75, "y":3.125},
+                {"x":13.75, "y":3.375},
+                {"x":14.75, "y":3.375},
+                {"x":16, "y":3.375},
+                {"x":17, "y":3.375},
+                {"x":18, "y":3.375},
+
+                {"x":2.5, "y":4.25},
+                {"x":3.5, "y":4.25},
+                {"x":4.5, "y":4.5},
+                {"x":6.25, "y":3.75, "h":2, "r":30},
+                {"x":8.5, "y":3.75, "h":2, "r":-30},
+                {"x":10.25, "y":4.5},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25}
+            ]
+        }
+    }
+}

keyboards/afternoonlabs/breeze/rev1/readme.md

@@ -0,0 +1,15 @@
+# Breeze
+
+![Breeze](https://i.imgur.com/O8FJWD6.jpeg)
+
+Split ergonomics meets productivity. Breeze Rev1 is a split keyboard with 6×4 keys, 4 key thumb cluster, arrow keys, and a 6 key macro cluster, with ortholinear column-staggered.
+
+* Keyboard Maintainer: [Eithan Shavit](https://github.com/eithanshavit)
+* Hardware Supported: Breeze Rev1 PCB
+* Hardware Availability: Coming soon
+
+Make example for this keyboard (after setting up your build environment):
+
+    make afternoonlabs/breeze/rev1:default
+
+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).

keyboards/afternoonlabs/breeze/rev1/rev1.c

@@ -0,0 +1,17 @@
+/* Copyright 2021 eithanshavit
+ *
+ * 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 "breeze.h"

keyboards/afternoonlabs/breeze/rev1/rev1.h

@@ -0,0 +1,41 @@
+/* Copyright 2021 eithanshavit
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include "breeze.h"
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \
+    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \
+    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25,      AUP,      \
+    L30, L31, L32, L33, L34, L35,           R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \
+                   LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3  \
+) \
+{ \
+    { L05, L04, L03, L02, L01, L00, KC_NO, KC_NO, KC_NO }, \
+    { L15, L14, L13, L12, L11, L10, KC_NO, KC_NO, KC_NO }, \
+    { L25, L24, L23, L22, L21, L20, KC_NO, KC_NO, KC_NO }, \
+    { L35, L34, L33, L32, L31, L30, KC_NO, KC_NO, KC_NO }, \
+    { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \
+    { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \
+    { R20, R21, R22, R23, R24, R25, KC_NO, AUP, KC_NO }, \
+    { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \
+    { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+}

keyboards/afternoonlabs/breeze/rev1/rules.mk

@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+SPLIT_KEYBOARD = yes
+BOOTMAGIC_ENABLE = lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = yes        # 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
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+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

keyboards/afternoonlabs/gust/config.h

@@ -0,0 +1,22 @@
+/* Copyright 2021 eithanshavit
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION

keyboards/afternoonlabs/gust/gust.c

@@ -0,0 +1,17 @@
+/* Copyright 2021 eithanshavit
+ *
+ * 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 "gust.h"

keyboards/afternoonlabs/gust/gust.h

@@ -0,0 +1,21 @@
+/* Copyright 2021 eithanshavit
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#ifdef KEYBOARD_afternoonlabs_gust_rev1
+#    include "rev1.h"
+#endif

keyboards/afternoonlabs/gust/keymaps/default/keymap.c

@@ -0,0 +1,34 @@
+/* Copyright 2021 eithanshavit
+ *
+ * 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
+
+enum layer_names {
+    _MAIN,
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_MAIN] = LAYOUT(
+  //┌─────────┬─────────┬─────────┐
+     KC_1,     KC_2,     KC_3,
+  //├─────────┼─────────┼─────────┤
+     KC_4,     KC_5,     KC_6
+  //└─────────┴─────────┴─────────┘
+  )
+
+};

keyboards/afternoonlabs/gust/keymaps/default/readme.md

@@ -0,0 +1,5 @@
+# Default Gust Layout
+
+![Gust Layout Image](https://i.imgur.com/S94jViT.jpeg)
+
+This is the default layout for Gust Macro Board.

keyboards/afternoonlabs/gust/rev1/config.h

@@ -0,0 +1,41 @@
+/* Copyright 2021 eithanshavit
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x616C
+#define PRODUCT_ID 0x0002
+#define DEVICE_VER 0x0001
+#define MANUFACTURER AfternoonLabs
+#define PRODUCT Gust
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 3
+
+// wiring of each half
+#define MATRIX_ROW_PINS { F5, F4 }
+#define MATRIX_COL_PINS { D1, D2, D3 }
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define DIODE_DIRECTION COL2ROW
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COL 0

keyboards/afternoonlabs/gust/rev1/info.json

@@ -0,0 +1,38 @@
+{
+    "keyboard_name": "Gust",
+    "url": "afternoonlabs.com/breeze",
+    "productId": "0x0002",
+    "maintainer": "eithanshavit",
+    "width": 3,
+    "height": 2,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "x": 2,
+                    "y": 1
+                }
+            ]
+        }
+    }
+}

keyboards/afternoonlabs/gust/rev1/readme.md

@@ -0,0 +1,15 @@
+# Gust
+
+![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).
+
+* Keyboard Maintainer: [Eithan Shavit](https://github.com/eithanshavit)
+* Hardware Supported: Gust Rev1 PCB
+* Hardware Availability: Coming soon
+
+Make example for this keyboard (after setting up your build environment):
+
+    make afternoonlabs/gust/rev1:default
+
+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).

keyboards/afternoonlabs/gust/rev1/rev1.c

@@ -0,0 +1,17 @@
+/* Copyright 2021 eithanshavit
+ *
+ * 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 "gust.h"

keyboards/afternoonlabs/gust/rev1/rev1.h

@@ -0,0 +1,30 @@
+/* Copyright 2021 eithanshavit
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include "gust.h"
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    M00, M01, M02, \
+    M10, M11, M12  \
+) \
+{ \
+    { M00, M01, M02 }, \
+    { M10, M11, M12 }  \
+}

keyboards/afternoonlabs/gust/rev1/rules.mk

@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   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
+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
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+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