Merge upstream master

2 files changed, 240 insertions, 0 deletions

diff --git a/keyboards/sofle/keymaps/keyhive_via/keymap.c b/keyboards/sofle/keymaps/keyhive_via/keymap.c
new file mode 100644
index 0000000000..032c834f44
--- /dev/null
+++ b/keyboards/sofle/keymaps/keyhive_via/keymap.c
@@ -0,0 +1,191 @@
+ /* Copyright 2020 Josef Adamcik
+  * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
+  *
+  * 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
+
+#include "oled.c"
+#include "encoder.c"
+
+// Base layer is the number of layers CYCLE selects from.
+#define BASE_LAYERS 2
+
+enum custom_keycodes {
+    PLACEHOLDER = SAFE_RANGE,  // can always be here (4 bytes)
+    CYCLE                      // cycle through first BASE_LAYERS (62 bytes)
+};
+
+enum custom_layers {
+    _QWERTY,
+    _COLEMAK,
+    _LOWER,
+    _RAISE
+};
+
+// Extra keys are added for rotary encoder support in VIA
+#define LAYOUT_via( \
+    LA1, LA2, LA3, LA4, LA5, LA6,           RA6, RA5, RA4, RA3, RA2, RA1, \
+    LB1, LB2, LB3, LB4, LB5, LB6, LB7, RB7, RB6, RB5, RB4, RB3, RB2, RB1, \
+    LC1, LC2, LC3, LC4, LC5, LC6, LE1, RE6, RC6, RC5, RC4, RC3, RC2, RC1, \
+    LD1, LD2, LD3, LD4, LD5, LD6, LD7, RD7, RD6, RD5, RD4, RD3, RD2, RD1, \
+              LE2, LE3, LE4, LE5, LE6, RE5, RE4, RE3, RE2, RE1 \
+    ) \
+    { \
+        { LA1, LA2, LA3, LA4, LA5, LA6, KC_NO }, \
+        { LB1, LB2, LB3, LB4, LB5, LB6, LB7   }, \
+        { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO }, \
+        { LD1, LD2, LD3, LD4, LD5, LD6, LD7   }, \
+        { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO }, \
+        { RA1, RA2, RA3, RA4, RA5, RA6, KC_NO }, \
+        { RB1, RB2, RB3, RB4, RB5, RB6, RB7   }, \
+        { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO }, \
+        { RD1, RD2, RD3, RD4, RD5, RD6, RD7   }, \
+        { RE1, RE2, RE3, RE4, RE5, RE6, KC_NO } \
+    }
+
+//Default keymap. This can be changed in Via. Use oled.c to change beavior that Via cannot change.
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+ * QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |  `   |   1  |   2  |   3  |   4  |   5  |-------.  E  ,-------|   6  |   7  |   8  |   9  |   0  |  `   |
+ * |------+------+------+------+------+------| VolUp |< N >| Pg Up |------+------+------+------+------+------|
+ * | ESC  |   Q  |   W  |   E  |   R  |   T  |-------.  C  ,-------|   Y  |   U  |   I  |   O  |   P  | Bspc |
+ * |------+------+------+------+------+------| Mute  |< O >|       |------+------+------+------+------+------|
+ * | Tab  |   A  |   S  |   D  |   F  |   G  |-------.  D  ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------| VolDn |< E >| Pg Dn |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|  R  |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /      \      \-----------------------------------------'
+ *            | LGUI | LAlt | LCTR |LOWER | /Enter  /        \Space \  |RAISE | RCTR | RAlt | RGUI |
+ *            |      |      |      |      |/       /          \      \ |      |      |      |      |
+ *            `-----------------------------------'            '------''---------------------------'
+ */
+
+[_QWERTY] = LAYOUT_via(
+   KC_GRV, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                         KC_6    , KC_7   , KC_8   , KC_9   , KC_0   , KC_GRV ,
+   KC_ESC, KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_VOLU,       KC_PGUP, KC_Y    , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC,
+   KC_TAB, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_MUTE,       KC_NO  , KC_H    , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+  KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_VOLD,       KC_PGDN, KC_N    , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+                  KC_LGUI,KC_LALT ,KC_LCTL,MO(_LOWER), KC_ENT ,           KC_SPC  ,MO(_RAISE),KC_RCTL, KC_RALT, KC_RGUI
+),
+/*
+ * COLEMAK - Vanilla
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |  `   |   1  |   2  |   3  |   4  |   5  |-------.  E  ,-------|   6  |   7  |   8  |   9  |   0  |  `   |
+ * |------+------+------+------+------+------| VolUp |< N >| Pg Up |------+------+------+------+------+------|
+ * | ESC  |   Q  |   W  |   F  |   P  |   G  |-------.  C  ,-------|   J  |   L  |   U  |   Y  |   ;  | Bspc |
+ * |------+------+------+------+------+------| Mute  |< O >|       |------+------+------+------+------+------|
+ * | TAB  |   A  |   R  |   S  |   T  |   D  |-------.  D  ,-------|   H  |   N  |   E  |   I  |   O  |  '   |
+ * |------+------+------+------+------+------| VolDn |< E >| Pg Dn |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|  R  |-------|   K  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /      \      \-----------------------------------------'
+ *            | LGUI | LAlt | LCTR |LOWER | /Enter  /        \Space \  |RAISE | RCTR | RAlt | RGUI |
+ *            |      |      |      |      |/       /          \      \ |      |      |      |      |
+ *            `-----------------------------------'            '------''---------------------------'
+ */
+/*
+[_COLEMAK] = LAYOUT_via(
+  KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                          KC_6    , KC_7   , KC_8   , KC_9   , KC_0   , KC_GRV ,
+  KC_ESC , KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_VOLU,       KC_PGUP,  KC_J    , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSPC,
+  KC_TAB , KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_MUTE,       KC_NO  ,  KC_H    , KC_N   , KC_E   , KC_I   , KC_O   , KC_QUOT,
+  KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_VOLD,       KC_PGDN,  KC_N    , KC_M   , KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+                  KC_LGUI, KC_LALT,KC_LCTL,MO(_LOWER), KC_ENT ,           KC_SPC ,MO(_RAISE),KC_RCTL, KC_RALT, KC_RGUI
+),
+*/
+
+/*
+ * COLEMAK-DH
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |  `   |   1  |   2  |   3  |   4  |   5  |-------.  E  ,-------|   6  |   7  |   8  |   9  |   0  |  `   |
+ * |------+------+------+------+------+------| VolUp |< N >| Pg Up |------+------+------+------+------+------|
+ * | ESC  |   Q  |   W  |   F  |   P  |   B  |-------.  C  ,-------|   J  |   L  |   U  |   Y  |   ;  | Bspc |
+ * |------+------+------+------+------+------| Mute  |< O >|       |------+------+------+------+------+------|
+ * | TAB  |   A  |   R  |   S  |   T  |   G  |-------.  D  ,-------|   M  |   N  |   E  |   I  |   O  |  '   |
+ * |------+------+------+------+------+------| VolDn |< E >| Pg Dn |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   D  |   V  |-------|  R  |-------|   K  |   H  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /      \      \-----------------------------------------'
+ *            | LGUI | LAlt | LCTR |LOWER | /Enter  /        \Space \  |RAISE | RCTR | RAlt | RGUI |
+ *            |      |      |      |      |/       /          \      \ |      |      |      |      |
+ *            `-----------------------------------'            '------''---------------------------'
+ */
+[_COLEMAK] = LAYOUT_via(
+  KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                          KC_6    , KC_7   , KC_8   , KC_9   , KC_0   , KC_GRV ,
+  KC_ESC , KC_Q   , KC_W   , KC_F   , KC_P   , KC_B   , KC_VOLU,       KC_PGUP,  KC_J    , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSPC,
+  KC_TAB , KC_A   , KC_R   , KC_S   , KC_T   , KC_G   , KC_MUTE,       KC_NO  ,  KC_M    , KC_N   , KC_E   , KC_I   , KC_O   , KC_QUOT,
+  KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_D   , KC_V   , KC_VOLD,       KC_PGDN,  KC_K    , KC_H   , KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+                  KC_LGUI, KC_LALT,KC_LCTL,MO(_LOWER), KC_ENT ,           KC_SPC ,MO(_RAISE),KC_RCTL, KC_RALT, KC_RGUI
+),
+
+/* LOWER
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |  F1  |  F2  |  F3  |  F4  |  F5  |-------.  E  ,-------|  F6  |  F7  |  F8  |  F9  | F10  | F11  |
+ * |------+------+------+------+------+------|       |< N >|       |------+------+------+------+------+------|
+ * |  `   |   1  |   2  |   3  |   4  |   5  |-------.  C  ,-------|   6  |   7  |   8  |   9  |   0  | F12  |
+ * |------+------+------+------+------+------|       |< O >|       |------+------+------+------+------+------|
+ * | Tab  |   !  |   @  |   #  |   $  |   %  |-------.  D  ,-------|   ^  |   &  |   *  |   (  |   )  |   |  |
+ * |------+------+------+------+------+------|       |< E >|       |------+------+------+------+------+------|
+ * | Shift|  =   |  -   |  +   |   {  |   }  |-------|  R  |-------|   [  |   ]  |   ;  |   :  |   \  |      |
+ * `-----------------------------------------/       /      \      \-----------------------------------------'
+ *            | LGUI | LAlt | LCTR |LOWER | /Enter  /        \Space \  |RAISE | RCTR | RAlt | RGUI |
+ *            |      |      |      |      |/       /          \      \ |      |      |      |      |
+ *            `-----------------------------------'            '------''---------------------------'
+ */
+[_LOWER] = LAYOUT_via(
+  _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                         KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
+  KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , _______,       _______, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_F12 ,
+  _______, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC, _______,       _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
+  _______, KC_EQL , KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______,       _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
+                  _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______
+),
+/* RAISE
+ * ,----------------------------------------.                      ,-----------------------------------------.
+ * |Cycle |      |      |      |      |      |-------.  E  ,-------|      |      |      |      |      |      |
+ * |------+------+------+------+------+------|       |< N >|       |------+------+------+------+------+------|
+ * | Esc  | Ins  | Pscr | Menu |      |      |-------.  C  ,-------|      |      |  Up  |      | DLine| Bspc |
+ * |------+------+------+------+------+------|       |< O >|       |------+------+------+------+------+------|
+ * | Tab  | LAt  | LCtl |LShift|      | Caps |-------.  D  ,-------|      | Left | Down | Rigth|  Del | Bspc |
+ * |------+------+------+------+------+------|       |< E >|       |------+------+------+------+------+------|
+ * |Shift | Undo |  Cut | Copy | Paste|      |-------|  R  |-------|      | LStr |      | LEnd |      | Shift|
+ * `-----------------------------------------/      /       \      \-----------------------------------------'
+ *            | LGUI | LAlt | LCTR |LOWER | /Enter /         \Space \  |RAISE | RCTR | RAlt | RGUI |
+ *            |      |      |      |      |/      /           \      \ |      |      |      |      |
+ *            `----------------------------------'             '------''---------------------------'
+ */
+[_RAISE] = LAYOUT_via(
+    CYCLE, _______, _______, _______, _______ , _______,                       _______, _______, _______, _______, _______, _______,
+  _______, KC_INS , KC_PSCR, KC_APP , XXXXXXX , XXXXXXX, _______,    _______,  KC_PGUP, _______, KC_UP  , _______, _______, KC_BSPC,
+  _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX , KC_CAPS, _______,    _______,  KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , KC_BSPC,
+  _______, KC_UNDO, KC_CUT , KC_COPY, KC_PASTE, XXXXXXX, _______,    _______,  XXXXXXX, _______, XXXXXXX, _______, XXXXXXX, _______,
+                   _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______
+)
+};
+
+// Custom keycode handling.
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    // handling this once instead of in each keycode uses less program memory.
+    if ((keycode >= SAFE_RANGE) && !(record->event.pressed)) {
+        return false;
+    }
+
+    switch (keycode) {
+        case CYCLE:
+            set_single_persistent_default_layer((1+get_highest_layer(default_layer_state)) % BASE_LAYERS);
+            break;
+    }
+
+    // this uses less memory than returning in each case.
+    return keycode < SAFE_RANGE;
+};
diff --git a/keyboards/sofle/keymaps/keyhive_via/readme.md b/keyboards/sofle/keymaps/keyhive_via/readme.md
new file mode 100644
index 0000000000..f50b12fdd9
--- /dev/null
+++ b/keyboards/sofle/keymaps/keyhive_via/readme.md
@@ -0,0 +1,49 @@
+# Only compatible with sofle/keyhive firmware which adds an extra column of keys for encoder mapping.
+
+![SofleKeyboard version 2.1 RGB Keyhive](https://i.imgur.com/Oa6spvZ.png)
+
+# Configuring VIA
+
+This firmware will not auto-recognize until [PR #1060](https://github.com/the-via/keyboards/pull/1060) is accepted to the VIA keyboard database. For now you must install the new layout:
+
+1. Download [keyhive_sofle_rgb.json](https://raw.githubusercontent.com/the-via/keyboards/48372baae5ab451d752988121fa4f1dd47b2c1ce/src/sofle/keyhive_sofle_rgb.json).
+2. In the VIA app, select `File > Import Keymap` from the menu.
+3. Open the file you just downloaded.
+
+**You'll have to do this every time you use VIA until the PR is accepted.**
+
+# Using with VIA
+* The default layouts should be loaded automatically.
+* Layouts can be backed up in VIA in the SAVE+LOAD section.
+* It is a good idea to Save Current Layout after you decide on your mapping.
+
+# Custom Features:
+
+### Rotary Encoder and VIA Features:
+* Fully remappable. Left encoder controls volume up/down/mute. Right encoder PGUP/PGDOWN.
+* Allows for live remapping of per-layer rotary encoder functions in VIA.
+* VIA support with **keyhive_via** keymap.
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sofle/keyhive:keyhive_via
+
+## Flashing
+
+Flash using the correct command below (or use QMK Toolbox). These commands can be mixed if, for example, you have an Elite C on the left and a pro micro on the right.
+
+Press reset button on the keyboard when asked.
+
+Disconnect the first half, connect the second one and repeat the process.
+
+    # for Pro Micro-based builds
+    make sofle/keyhive:keyhive_via:avrdude-split-left
+    make sofle/keyhive:keyhive_via:avrdude-split-right
+
+    # for Elite C or DFU bootloader builds
+    make sofle/keyhive:keyhive_via:dfu-split-left
+    make sofle/keyhive:keyhive_via:dfu-split-right
+
+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).