Merge branch 'qmk:master' into PR-branch

qmk · Feb 17, 2022 · 42928a5 · 42928a5
2 parents 7810552 + 2d12eac
commit 42928a5
Show file tree

Hide file tree

Showing 35 changed files with 550 additions and 2,000 deletions.
diff --git a/keyboards/frooastboard/config.h → keyboards/frooastboard/nano/config.h b/keyboards/frooastboard/config.h → keyboards/frooastboard/nano/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* 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
@@ -20,7 +20,7 @@
 
 /* USB Device descriptor parameter */
 #define MANUFACTURER    frooastside
-#define PRODUCT         Frooastboard
+#define PRODUCT         Frooastboard Nano
 
 /* key matrix size */
 #define MATRIX_ROWS 2

diff --git a/keyboards/frooastboard/info.json → keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/info.json → keyboards/frooastboard/nano/info.json
@@ -1,6 +1,6 @@
 {
-    "keyboard_name": "Frooastboard",
-    "url": "https://github.com/frooastside/qmk_firmware/tree/master/keyboards/frooastboard",
+    "keyboard_name": "Frooastboard Nano",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/nano",
     "maintainer": "frooastside",
     "debounce": 5,
     "diode_direction": "COL2ROW",

diff --git a/...rds/frooastboard/keymaps/default/keymap.c → ...rooastboard/nano/keymaps/default/keymap.c b/...rds/frooastboard/keymaps/default/keymap.c → ...rooastboard/nano/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* 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

diff --git a/...s/frooastboard/keymaps/safe_mode/keymap.c → ...oastboard/nano/keymaps/safe_mode/keymap.c b/...s/frooastboard/keymaps/safe_mode/keymap.c → ...oastboard/nano/keymaps/safe_mode/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* 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

diff --git a/keyboards/frooastboard/keymaps/via/config.h → ...ds/frooastboard/nano/keymaps/via/config.h b/keyboards/frooastboard/keymaps/via/config.h → ...ds/frooastboard/nano/keymaps/via/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* 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

diff --git a/keyboards/frooastboard/keymaps/via/keymap.c → ...ds/frooastboard/nano/keymaps/via/keymap.c b/keyboards/frooastboard/keymaps/via/keymap.c → ...ds/frooastboard/nano/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* 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

diff --git a/keyboards/frooastboard/keymaps/via/rules.mk → ...ds/frooastboard/nano/keymaps/via/rules.mk b/keyboards/frooastboard/keymaps/via/rules.mk → ...ds/frooastboard/nano/keymaps/via/rules.mk
diff --git a/keyboards/frooastboard/frooastboard.c → keyboards/frooastboard/nano/nano.c b/keyboards/frooastboard/frooastboard.c → keyboards/frooastboard/nano/nano.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* 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
@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "frooastboard.h"
+#include "nano.h"
diff --git a/keyboards/frooastboard/frooastboard.h → keyboards/frooastboard/nano/nano.h b/keyboards/frooastboard/frooastboard.h → keyboards/frooastboard/nano/nano.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* 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

diff --git a/keyboards/frooastboard/readme.md → keyboards/frooastboard/nano/readme.md b/keyboards/frooastboard/readme.md → keyboards/frooastboard/nano/readme.md
@@ -1,19 +1,19 @@
-# Frooastboard
+# Frooastboard Nano
 
-![Frooastboard](https://i.imgur.com/f26O8JLh.jpg)
+![Frooastboard Nano](https://i.imgur.com/f26O8JLh.jpg)
 
 * Keyboard Maintainer: [Frooastside](https://github.com/frooastside)
-* Hardware Supported: Frooastboard
+* 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:default
+    make frooastboard/nano:default
 
 Flashing example for this keyboard:
 
-    make frooastboard:default:flash
+    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/rules.mk → keyboards/frooastboard/nano/rules.mk b/keyboards/frooastboard/rules.mk → keyboards/frooastboard/nano/rules.mk
diff --git a/keyboards/helix/rev1/.noci b/keyboards/helix/rev1/.noci
diff --git a/keyboards/helix/rev1/config.h b/keyboards/helix/rev1/config.h
diff --git a/keyboards/helix/rev1/info.json b/keyboards/helix/rev1/info.json
diff --git a/keyboards/helix/rev1/keymaps/OLED_sample/config.h b/keyboards/helix/rev1/keymaps/OLED_sample/config.h