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

4 files changed, 151 insertions, 0 deletions

diff --git a/keyboards/idobo/keymaps/ifohancroft/config.h b/keyboards/idobo/keymaps/ifohancroft/config.h
new file mode 100644
index 0000000000..09467b4362
--- /dev/null
+++ b/keyboards/idobo/keymaps/ifohancroft/config.h
@@ -0,0 +1,27 @@
+/* Copyright 2021 IFo Hancroft
+ *
+ * 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
+
+// place overrides here
+#define USB_POLLING_INTERVAL_MS 1
+#undef RGBLIGHT_HUE_STEP
+#define RGBLIGHT_HUE_STEP 1
+#undef RGBLIGHT_SAT_STEP
+#define RGBLIGHT_SAT_STEP 1
+#undef RGBLIGHT_VAL_STEP
+#define RGBLIGHT_VAL_STEP 1
+#define FORCE_NKRO
diff --git a/keyboards/idobo/keymaps/ifohancroft/keymap.c b/keyboards/idobo/keymaps/ifohancroft/keymap.c
new file mode 100644
index 0000000000..d71dcee6a9
--- /dev/null
+++ b/keyboards/idobo/keymaps/ifohancroft/keymap.c
@@ -0,0 +1,104 @@
+/* Copyright 2021 IFo Hancroft
+  *
+  * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Default Layer
+    * ---------------------------------------------------------------------------------------------------------------------------------------
+    * | `     || 1     || 2     || 3     || 4     || 5     || 6     || 7     || 8     || 9     || 0     || -     || =     || Bkspc || Del   |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * | Tab   || Q     || W     || E     || R     || T     || Y     || U     || I     || O     || P     || [     || ]     || \     || Home  |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * | ESC   || A     || S     || D     || F     || G     || H     || J     || K     || L     || ;     || "     || Enter || Enter || PgUp  |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * | Shift || Z     || X     || C     || V     || B     || N     || M     || ,     || .     || /     || Shift || Shift || Up    || PgDn  |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * | Ctrl  || Super || Alt   || MO(1) || Bkspc || Space || Space || Bkspc || MO(1) || Alt   || Super || Ctrl  || Left  || Down  || Right |
+    * ---------------------------------------------------------------------------------------------------------------------------------------
+    */
+    LAYOUT_ortho_5x15(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_BSPC, KC_SPC,  KC_SPC,  KC_BSPC, MO(1),   KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /* Function Layer
+    * ---------------------------------------------------------------------------------------------------------------------------------------
+    * |       || F1    || F2    || F3    || F4    || F5    || F6    || F7    || F8    || F9    || F10   || F11   || F12   ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||RGB MOD||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |RGB TOG||RGB HUI||RGB SAI||RGB VAI||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * ---------------------------------------------------------------------------------------------------------------------------------------
+    */
+    LAYOUT_ortho_5x15(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_INS,
+        _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    /* Empty Layer
+    * ---------------------------------------------------------------------------------------------------------------------------------------
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * ---------------------------------------------------------------------------------------------------------------------------------------
+    */
+    LAYOUT_ortho_5x15(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    /* Empty Layer
+    * ---------------------------------------------------------------------------------------------------------------------------------------
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |-------------------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * ---------------------------------------------------------------------------------------------------------------------------------------
+    */
+    LAYOUT_ortho_5x15(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/idobo/keymaps/ifohancroft/readme.md b/keyboards/idobo/keymaps/ifohancroft/readme.md
new file mode 100644
index 0000000000..6a6c2cd34b
--- /dev/null
+++ b/keyboards/idobo/keymaps/ifohancroft/readme.md
@@ -0,0 +1,14 @@
+![IFo Hancroft Idobo Layout Image](https://i.imgur.com/ml1olw4.png)
+
+# IFo Hancroft's Idobo Layout
+
+ - Layer 1: A standard ANSI QWERTY layer.
+ - Layer 2: A fuction layer. It contains the F1-F12 keys, RGB control keys and the Insert and End keys.
+ - Layer 3: An empty layer in-case I need something on-the-fly so I can remap with VIA.
+ - Layer 4: An empty layer in-case I need something on-the-fly so I can remap with VIA.
+
+This keymap also sets the polling rate of the keyboard to 1ms, the HUE, VALUE and SATURATION of the RGB to steps of 1, disables the MOUSEKEY, EXTRAKEY and CONSOLE features, and enables the following features:
+
+ - COMMAND
+ - NKRO (forced on)
+ - VIA
diff --git a/keyboards/idobo/keymaps/ifohancroft/rules.mk b/keyboards/idobo/keymaps/ifohancroft/rules.mk
new file mode 100644
index 0000000000..6609b4097b
--- /dev/null
+++ b/keyboards/idobo/keymaps/ifohancroft/rules.mk
@@ -0,0 +1,6 @@
+MOUSEKEY_ENABLE = no
+EXTRAKEY_ENABLE = no
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = yes
+NKRO_ENABLE = yes
+VIA_ENABLE = yes
\ No newline at end of file