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

11 files changed, 324 insertions, 0 deletions

diff --git a/keyboards/frooastboard/nano/config.h b/keyboards/frooastboard/nano/config.h
new file mode 100644
index 0000000000..48af8e7e9c
--- /dev/null
+++ b/keyboards/frooastboard/nano/config.h
@@ -0,0 +1,52 @@
+/* Copyright 2021-2022 frooastside
+ *
+ * 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 3 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"
+
+/* USB Device descriptor parameter */
+#define MANUFACTURER    frooastside
+#define PRODUCT         Frooastboard Nano
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 2
+
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 1
+
+#define RGB_DI_PIN B4
+#define RGBLED_NUM 8
+
+#define RGBLIGHT_SLEEP
+
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+
+#define RGBLIGHT_DEFAULT_HUE 234
+
+#define RGBLIGHT_LIMIT_VAL 255
+#define RGBLIGHT_DEFAULT_VAL 190
+
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_SNAKE
+
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD + 2
diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json
new file mode 100644
index 0000000000..ae94705195
--- /dev/null
+++ b/keyboards/frooastboard/nano/info.json
@@ -0,0 +1,42 @@
+{
+    "keyboard_name": "Frooastboard Nano",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/nano",
+    "maintainer": "frooastside",
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT": {
+          "layout": [
+            {
+              "label": "Z",
+              "x": 0,
+              "y": 0
+            },
+            {
+              "label": "X",
+              "x": 1,
+              "y": 0
+            },
+            {
+              "label": "Esc",
+              "x": 0,
+              "y": 1
+            },
+            {
+              "label": "~",
+              "x": 1,
+              "y": 1
+            }
+          ]
+        }
+    },
+    "matrix_pins": {
+        "rows": ["B0", "B1"],
+        "cols": ["B2", "B3"]
+    },
+    "usb": {
+        "vid": "0x4642",
+        "pid": "0x6F21",
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/frooastboard/nano/keymaps/default/keymap.c b/keyboards/frooastboard/nano/keymaps/default/keymap.c
new file mode 100644
index 0000000000..aa3ed88da2
--- /dev/null
+++ b/keyboards/frooastboard/nano/keymaps/default/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2021-2022 frooastside
+ *
+ * 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 3 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] = {
+	[0] = LAYOUT(
+		KC_Z, KC_X,
+		LT(1, KC_ESC), KC_TILD),
+
+	[1] = LAYOUT(
+		KC_F23, KC_F24,
+		KC_TRNS, TO(2)),
+
+	[2] = LAYOUT(
+		RGB_TOG, RGB_MOD,
+		TO(3), TO(0)),
+
+	[3] = LAYOUT(
+		RGB_HUD, RGB_HUI,
+		TO(4), TO(2)),
+
+	[4] = LAYOUT(
+		RGB_SAD, RGB_SAI,
+		TO(5), TO(3)),
+
+	[5] = LAYOUT(
+		RGB_VAD, RGB_VAI,
+		TO(6), TO(4)),
+
+	[6] = LAYOUT(
+		KC_TRNS, KC_TRNS,
+		RESET, TO(5))
+};
diff --git a/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c b/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
new file mode 100644
index 0000000000..d237438da3
--- /dev/null
+++ b/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2021-2022 frooastside
+ *
+ * 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 3 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] = {
+	[0] = LAYOUT(
+		KC_Z, KC_X,
+		TO(1), KC_TILD),
+
+	[1] = LAYOUT(
+		RGB_TOG, RGB_MOD,
+		TO(2), TO(0)),
+
+	[2] = LAYOUT(
+		RGB_HUD, RGB_HUI,
+		TO(3), TO(1)),
+
+	[3] = LAYOUT(
+		RGB_SAD, RGB_SAI,
+		TO(4), TO(2)),
+
+	[4] = LAYOUT(
+		RGB_VAD, RGB_VAI,
+		TO(5), TO(3)),
+
+	[5] = LAYOUT(
+		KC_TRNS, KC_TRNS,
+		RESET, TO(4))
+};
diff --git a/keyboards/frooastboard/nano/keymaps/via/config.h b/keyboards/frooastboard/nano/keymaps/via/config.h
new file mode 100644
index 0000000000..8c39695693
--- /dev/null
+++ b/keyboards/frooastboard/nano/keymaps/via/config.h
@@ -0,0 +1,30 @@
+/* Copyright 2021-2022 frooastside
+ *
+ * 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 3 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
+
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/frooastboard/nano/keymaps/via/keymap.c b/keyboards/frooastboard/nano/keymaps/via/keymap.c
new file mode 100644
index 0000000000..bddd16bae5
--- /dev/null
+++ b/keyboards/frooastboard/nano/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2021-2022 frooastside
+ *
+ * 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 3 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] = {
+	[0] = LAYOUT(
+		KC_Z, KC_X,
+		LT(1, KC_ESC), KC_TILD),
+
+	[1] = LAYOUT(
+		KC_F23, KC_F24,
+		KC_TRNS, RGB_TOG)
+};
diff --git a/keyboards/frooastboard/nano/keymaps/via/rules.mk b/keyboards/frooastboard/nano/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/frooastboard/nano/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/frooastboard/nano/nano.c b/keyboards/frooastboard/nano/nano.c
new file mode 100644
index 0000000000..584176a4e9
--- /dev/null
+++ b/keyboards/frooastboard/nano/nano.c
@@ -0,0 +1,17 @@
+/* Copyright 2021-2022 frooastside
+ *
+ * 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 3 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 "nano.h"
diff --git a/keyboards/frooastboard/nano/nano.h b/keyboards/frooastboard/nano/nano.h
new file mode 100644
index 0000000000..76d1a42eac
--- /dev/null
+++ b/keyboards/frooastboard/nano/nano.h
@@ -0,0 +1,27 @@
+/* Copyright 2021-2022 frooastside
+ *
+ * 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 3 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 "quantum.h"
+
+#define LAYOUT( \
+	K00, K01, \
+	K10, K11  \
+) { \
+	{ K00,   K01 }, \
+	{ K10,   K11 }  \
+}
diff --git a/keyboards/frooastboard/nano/readme.md b/keyboards/frooastboard/nano/readme.md
new file mode 100644
index 0000000000..d67f17483f
--- /dev/null
+++ b/keyboards/frooastboard/nano/readme.md
@@ -0,0 +1,19 @@
+# Frooastboard Nano
+
+![Frooastboard Nano](https://i.imgur.com/f26O8JLh.jpg)
+
+* Keyboard Maintainer: [Frooastside](https://github.com/frooastside)
+* Hardware Supported: Frooastboard Nano
+* Hardware Availability: https://github.com/Frooastside/Frooastboard
+
+**Reset Key:** Hold down the key located at `K00`, commonly programmed as ESCAPE while plugging in the keyboard. (If via is used it is the key located at `K10`.)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make frooastboard/nano:default
+
+Flashing example for this keyboard:
+
+    make frooastboard/nano: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).
diff --git a/keyboards/frooastboard/nano/rules.mk b/keyboards/frooastboard/nano/rules.mk
new file mode 100644
index 0000000000..bef90c50ac
--- /dev/null
+++ b/keyboards/frooastboard/nano/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output