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

5 files changed, 244 insertions, 0 deletions

diff --git a/keyboards/hub20/keymaps/default/keymap.c b/keyboards/hub20/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c467312877
--- /dev/null
+++ b/keyboards/hub20/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2020 joshajohnson
+ *
+ * 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
+
+#define MO_NLCK LT(1, KC_NLCK) // Numlock on tap, layer change on hold
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+                 KC_MUTE,  KC_MPLY,
+       KC_PMNS,  KC_PAST,  KC_PSLS,    MO_NLCK,
+       KC_PPLS,    KC_P7,    KC_P8,      KC_P9,
+       KC_PPLS,    KC_P4,    KC_P5,      KC_P6,
+       KC_PENT,    KC_P1,    KC_P2,      KC_P3,
+       KC_PENT,  KC_PDOT,    KC_P0,      KC_P0
+),
+    [1] = LAYOUT_all(
+                   RESET,  _______,
+       RGB_TOG, RGB_RMOD,  RGB_MOD,    _______,
+       _______,  RGB_VAD,  RGB_VAI,    _______,
+       _______,  RGB_HUD,  RGB_HUI,    _______,
+       _______,  RGB_SAD,  RGB_SAI,    _______,
+       _______,  _______,  _______,    _______
+)
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* Left Encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) { /* Right Encoder */
+        if (clockwise) {
+            tap_code(KC_MNXT);
+        } else {
+            tap_code(KC_MPRV);
+        }
+    }
+}
diff --git a/keyboards/hub20/keymaps/macro/keymap.c b/keyboards/hub20/keymaps/macro/keymap.c
new file mode 100644
index 0000000000..7007a2f0ba
--- /dev/null
+++ b/keyboards/hub20/keymaps/macro/keymap.c
@@ -0,0 +1,120 @@
+/* Copyright 2020 joshajohnson
+ *
+ * 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
+
+// Function key we are 'wrapping' usual key presses in
+#define KC_WRAP KC_F23
+
+// Keyboard Layers
+enum keyboard_layers{
+    _BASE = 0,
+    _CTRL
+};
+
+// Tap Dance stuff
+void td_ctrl (qk_tap_dance_state_t *state, void *user_data);
+
+enum tap_dance {
+    CTRL = 0,
+    BASE = 1
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    // Tap once for standard key, twice to toggle layers
+    [CTRL] = ACTION_TAP_DANCE_FN(td_ctrl),
+    [BASE] = ACTION_TAP_DANCE_LAYER_MOVE(_______, _BASE)
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_all(
+              KC_W,  KC_Z,
+       KC_A,  KC_B,  KC_C,  TD(CTRL),
+       KC_E,  KC_F,  KC_G,  KC_H,
+       KC_I,  KC_J,  KC_K,  KC_L,
+       KC_M,  KC_N,  KC_O,  KC_P,
+       KC_Q,  KC_R,  KC_S,  KC_T
+),
+    [_CTRL] = LAYOUT_all(
+                   RESET,  _______,
+       RGB_TOG, RGB_RMOD,  RGB_MOD,   TD(BASE),
+       _______,  RGB_VAD,  RGB_VAI,    _______,
+       _______,  RGB_HUD,  RGB_HUI,    _______,
+       _______,  RGB_SAD,  RGB_SAI,    _______,
+       _______,  _______,  _______,    _______
+)
+};
+
+// Keyboard is setup to 'wrap' the pressed key with an unused Fxx key,
+// allowing for easy differentiation from a real keyboard.
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* Left Encoder */
+        if (clockwise) {
+            register_code(KC_WRAP);
+            tap_code(KC_U);
+            unregister_code(KC_WRAP);
+        } else {
+            register_code(KC_WRAP);
+            tap_code(KC_V);
+            unregister_code(KC_WRAP);
+        }
+    } else if (index == 1) { /* Right Encoder */
+        if (clockwise) {
+            register_code(KC_WRAP);
+            tap_code(KC_X);
+            unregister_code(KC_WRAP);
+        } else {
+            register_code(KC_WRAP);
+            tap_code(KC_Y);
+            unregister_code(KC_WRAP);
+        }
+    }
+}
+
+// Below stolen from TaranVH (https://github.com/TaranVH/2nd-keyboard/blob/master/HASU_USB/F24/keymap.c)
+// Shoutout to drashna on the QMK discord for basically writing this for me.... :P
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static uint8_t f23_tracker;
+    switch (keycode) {
+        // Wrap sent keys in KC_WRAP
+        case KC_A ... KC_F22:
+        case KC_EXECUTE ... KC_EXSEL:
+            if (record->event.pressed) {
+                register_code(KC_WRAP);
+                f23_tracker++;
+                register_code(keycode);
+            } else {
+                unregister_code(keycode);
+                f23_tracker--;
+                if (!f23_tracker) {
+                    unregister_code(KC_WRAP);
+                }
+            }
+            return false;
+            break;
+    }
+    return true;
+}
+
+// Below works around TD() not running key press through process_record_user
+void td_ctrl (qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count == 1) {
+    register_code(KC_WRAP);
+    tap_code(KC_D);
+    unregister_code(KC_WRAP);
+  } else if (state->count == 2) {
+    layer_move(_CTRL);
+  }
+}
diff --git a/keyboards/hub20/keymaps/macro/rules.mk b/keyboards/hub20/keymaps/macro/rules.mk
new file mode 100644
index 0000000000..e5ddcae8d9
--- /dev/null
+++ b/keyboards/hub20/keymaps/macro/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/hub20/keymaps/via/keymap.c b/keyboards/hub20/keymaps/via/keymap.c
new file mode 100644
index 0000000000..75a0a927af
--- /dev/null
+++ b/keyboards/hub20/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2020 joshajohnson
+ *
+ * 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
+
+#define MO_NLCK LT(1, KC_NLCK)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+                 KC_MUTE,  KC_MPLY,
+       KC_PMNS,  KC_PAST,  KC_PSLS,    MO_NLCK,
+       KC_PPLS,    KC_P7,    KC_P8,      KC_P9,
+       KC_PPLS,    KC_P4,    KC_P5,      KC_P6,
+       KC_PENT,    KC_P1,    KC_P2,      KC_P3,
+       KC_PENT,  KC_PDOT,    KC_P0,      KC_P0
+),
+    [1] = LAYOUT_all(
+                   RESET,  _______,
+       RGB_TOG,  RGB_RMOD, RGB_MOD,    _______,
+       _______,  RGB_VAD,  RGB_VAI,    _______,
+       _______,  RGB_HUD,  RGB_HUI,    _______,
+       _______,  RGB_SAD,  RGB_SAI,    _______,
+       _______,  _______,  _______,    _______
+),
+    [2] = LAYOUT_all(
+                 _______,  _______,
+       _______,  _______,  _______,    _______,
+       _______,  _______,  _______,    _______,
+       _______,  _______,  _______,    _______,
+       _______,  _______,  _______,    _______,
+       _______,  _______,  _______,    _______
+),
+    [3] = LAYOUT_all(
+                 _______,  _______,
+       _______,  _______,  _______,    _______,
+       _______,  _______,  _______,    _______,
+       _______,  _______,  _______,    _______,
+       _______,  _______,  _______,    _______,
+       _______,  _______,  _______,    _______
+)
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* Left Encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) { /* Right Encoder */
+        if (clockwise) {
+            tap_code(KC_MNXT);
+        } else {
+            tap_code(KC_MPRV);
+        }
+    }
+}
diff --git a/keyboards/hub20/keymaps/via/rules.mk b/keyboards/hub20/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/hub20/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes