Merge branch 'master' into taamas

4 files changed, 284 insertions, 0 deletions

diff --git a/keyboards/kagizaraya/scythe/keymaps/default/keymap.c b/keyboards/kagizaraya/scythe/keymaps/default/keymap.c
new file mode 100644
index 0000000000..56b6b32c8c
--- /dev/null
+++ b/keyboards/kagizaraya/scythe/keymaps/default/keymap.c
@@ -0,0 +1,75 @@
+/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
+ *
+ * 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
+
+// Defines the keycodes used by our macros in process_record_user
+enum layer_names {
+    _QWERTY,
+    _HAPPY,
+};
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  HAPPY,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Qwerty
+ *
+ *           ,------------------------------------------------.       ,------------------------------------------------.
+ *           |  Esc |   1  |   2  |   3  |   4  |   5  |   -  |       |   =  |   6  |   7  |   8  |   9  |   0  |   \  |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           |  Tab |   Q  |   W  |   E  |   R  |   T  |   [  |       |   ]  |   Y  |   U  |   I  |   O  |   P  | BkSp |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           | Ctrl |   A  |   S  |   D  |   F  |   G  |   `  |       |   '  |   H  |   J  |   K  |   L  |   ;  |Enter |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
+ *           |Shift |   Z  |   X  |   C  |   V  |   B  | Caps |       |  Del |   N  |   M  |   ,  |   .  |   /  |Shift | Fn   |
+ *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
+ *                                | LAlt | LGUI |  Fn  | Space|        |Space |  Fn | LGUI | LAlt |
+ *                                `---------------------------'       `---------------------------'
+ */
+[_QWERTY] = LAYOUT(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,      KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,      KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_GRV,       KC_QUOT, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_CAPS,      KC_DEL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  MO(_HAPPY),
+                             KC_LALT, KC_LGUI, MO(_HAPPY), KC_SPC,    KC_SPC,  MO(_HAPPY), KC_RGUI, KC_RALT
+),
+
+/* Happy
+ *
+ *           ,------------------------------------------------.       ,------------------------------------------------.
+ *           |  Pwr |  F1  |  F2  |  F3  |  F4  |  F5  |      |       |      |  F6  |  F7  |  F8  |  F9  |  F0  |  Del |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           | Caps |  F11 |  F12 |BLTOGG|      |BL INC|BL DEC|       |      |      | Psc  | Slk  | Pus  | Up   |  Ins |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           |      | Vol- | Vol+ | Mute |RGBHUI|RGBSAI|RGBVAI|       |   *  |   /  | Home | PgUp | Left | Right|      |
+ *           |------+------+------+------+------+------+------|       +------+------+------+------+------+------+------+------.
+ *           |      |RGBTOG|RGBMOD|RGBRMD|RGBHUD|RGBSAD|RGBVAD|       |   +  |   -  | End  | PgDn | Down |      |      |      |
+ *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
+ *                                |      |      |      |      |       |      |      |      |      |
+ *                                `---------------------------'       `---------------------------'
+ */
+[_HAPPY] = LAYOUT(
+  KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,      _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
+  KC_CAPS, KC_F10,  KC_F12,  BL_TOGG, _______, BL_INC , BL_DEC ,      _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_INS,
+  _______, KC_VOLD, KC_VOLU, KC_MUTE, RGB_HUI, RGB_SAI, RGB_VAI,      KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
+  _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD,      KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,  _______, _______, _______,
+                             _______, _______, _______, _______,      _______, _______, _______, _______
+)
+
+};
+
diff --git a/keyboards/kagizaraya/scythe/keymaps/default/readme.md b/keyboards/kagizaraya/scythe/keymaps/default/readme.md
new file mode 100644
index 0000000000..c4d73c4e33
--- /dev/null
+++ b/keyboards/kagizaraya/scythe/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The default keymap for scythe
+
diff --git a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
new file mode 100644
index 0000000000..4d2fc88243
--- /dev/null
+++ b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
@@ -0,0 +1,205 @@
+/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
+ *
+ * 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
+
+// Defines the keycodes used by our macros in process_record_user
+enum layer_names {
+    _QWERTY,
+    _HAPPY,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  HAPPY,
+  LOWER,
+  RAISE,
+  ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Qwerty
+ *
+ *           ,------------------------------------------------.       ,------------------------------------------------.
+ *           |  Esc |   1  |   2  |   3  |   4  |   5  |   -  |       |   =  |   6  |   7  |   8  |   9  |   0  |   \  |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           |  Tab |   Q  |   W  |   E  |   R  |   T  |   [  |       |   ]  |   Y  |   U  |   I  |   O  |   P  | BkSp |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           | Ctrl |   A  |   S  |   D  |   F  |   G  |   `  |       |   '  |   H  |   J  |   K  |   L  |   ;  |Enter |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
+ *           |Shift |   Z  |   X  |   C  |   V  |   B  | Caps |       |  Del |   N  |   M  |   ,  |   .  |   /  |Shift | Fn   |
+ *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
+ *                                | LAlt | LGUI | LOWER|Ctr/Esc|      |Spc/Sft | RAISE| LGUI | LAlt |
+ *                                `---------------------------'       `---------------------------'
+ */
+[_QWERTY] = LAYOUT(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,      KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,      KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_GRV,       KC_QUOT, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_CAPS,      KC_DEL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  HAPPY,
+                             KC_LALT, KC_LGUI, LOWER,   MT(MOD_LCTL, KC_ESC),      MT(MOD_LSFT, KC_SPC),  RAISE,   KC_RGUI, KC_RALT
+),
+
+/* Happy
+ *
+ *           ,------------------------------------------------.       ,------------------------------------------------.
+ *           |  Pwr |  F1  |  F2  |  F3  |  F4  |  F5  |      |       |      |  F6  |  F7  |  F8  |  F9  |  F0  |  Del |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           | Caps |  F11 |  F12 |BLTOGG|      |BL INC|BL DEC|       |      |      | Psc  | Slk  | Pus  | Up   |  Ins |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           |      | Vol- | Vol+ | Mute |RGBHUI|RGBSAI|RGBVAI|       |   *  |   /  | Home | PgUp | Left | Right|      |
+ *           |------+------+------+------+------+------+------|       +------+------+------+------+------+------+------+------.
+ *           |      |RGBTOG|RGBMOD|RGBRMD|RGBHUD|RGBSAD|RGBVAD|       |   +  |   -  | End  | PgDn | Down |      |      |      |
+ *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
+ *                                |      |      |      |      |       |      |      |      |      |
+ *                                `---------------------------'       `---------------------------'
+ */
+[_HAPPY] = LAYOUT(
+  KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,      _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
+  KC_CAPS, KC_F10,  KC_F12,  BL_TOGG, _______, BL_INC , BL_DEC ,      _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_INS,
+  _______, KC_VOLD, KC_VOLU, KC_MUTE, RGB_HUI, RGB_SAI, RGB_VAI,      KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
+  _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD,      KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,  _______, _______, _______,
+                             _______, _______, _______, _______,      _______, _______, _______, _______
+),
+
+
+/* Raise
+ *
+ *           ,------------------------------------------------.       ,------------------------------------------------.
+ *           |      |      |      |      |      |      |      |       |      |      |      |      |      |      |      |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           |      |   !  |   @  |   #  |   $  |   %  |      |       |      |   ^  |   &  |   *  |   (  |   )  |      |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           |      |      |   _  |   +  |  |   |  ~   |      |       |      |   :  |   "  |   >  |   {  |   }  |      |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
+ *           |      |      |   -  |   =  |  \   |  `   |      |       |      |   ;  |   '  |   <  |   [  |   ]  |      |      |
+ *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
+ *                                |      |      |      |      |       |      |      |      |      |
+ *                                `---------------------------'       `---------------------------'
+ */
+[_RAISE] = LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,      _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+  _______, _______, KC_UNDS, KC_PLUS, KC_PIPE, KC_TILD, _______,      _______, KC_COLN, KC_DQUO, KC_GT,   KC_LCBR, KC_RCBR, _______,
+  _______, _______, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  _______,      _______, KC_SCLN, KC_QUOT, KC_LT,   KC_LBRC, KC_RBRC, _______, _______,
+                             _______, _______, _______, _______,      _______, _______, _______, _______
+),
+
+
+/* Lower
+ *
+ *           ,------------------------------------------------.       ,------------------------------------------------.
+ *           |      |      |      |      |      |      |      |       |      |      |      |      |      |      |      |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           |      |   1  |   2  |   3  |   4  |   5  |      |       |      |   6  |   7  |   8  |   9  |   0  |      |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           |      |      |      |      |      |      | Enter|       |      | Left | Down |  Up  | Right|      |      |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
+ *           |      |      |      |      |      |      | Del  |       | BkSp |      | PgUp | PgDn |      |      |      |      |
+ *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
+ *                                |      |      |      |      |       |      |      |      |      |
+ *                                `---------------------------'       `---------------------------'
+ */
+[_LOWER] = LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,      _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+  _______, _______, _______, _______, _______, _______, KC_ENT,       _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
+  _______, _______, _______, _______, _______, _______, KC_DEL,       KC_BSPC, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______,
+                             _______, _______, _______, _______,      _______, _______, _______, _______
+),
+
+
+/* Adjust
+ *
+ *           ,------------------------------------------------.       ,------------------------------------------------.
+ *           |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |       |      |  F6  |  F7  |  F8  |  F9  |  F0  |  Del |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           |      | F11  | F12  |BLTOGG|      |BL INC|BL DEC|       |      |      |      |      |      |      |      |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
+ *           |      |      |      |RGBMOD|RGBHUI|RGBSAI|RGBVAI|       |      |      |      |      |      |      |      |
+ *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
+ *           |      | Reset|      |RGBTOG|RGBHUD|RGBSAD|RGBVAD|       |      | Prev | Next | Vol- | Vol+ | Play |      |      |
+ *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
+ *                                |      |      |      |      |       |      |      |      |      |
+ *                                `---------------------------'       `---------------------------'
+ */
+[_ADJUST] = LAYOUT(
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,      _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+  _______, KC_F10,  KC_F12,  BL_TOGG, _______, BL_INC , BL_DEC ,      _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,      _______, _______, _______, _______, _______, _______, _______,
+  _______, RESET,   _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD,      _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______,
+                             _______, _______, _______, _______,      _______, _______, _______, _______
+)
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        // persistant_default_layer_set(1UL<<_QWERTY);
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+    case HAPPY:
+      if (record->event.pressed) {
+        layer_on(_HAPPY);
+      } else {
+        layer_off(_HAPPY);
+      }
+      return false;
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+    case ADJUST:
+      if (record->event.pressed) {
+        layer_on(_ADJUST);
+      } else {
+        layer_off(_ADJUST);
+      }
+      return false;
+  }
+  return true;
+}
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}
diff --git a/keyboards/kagizaraya/scythe/keymaps/forties/readme.md b/keyboards/kagizaraya/scythe/keymaps/forties/readme.md
new file mode 100644
index 0000000000..162792dc37
--- /dev/null
+++ b/keyboards/kagizaraya/scythe/keymaps/forties/readme.md
@@ -0,0 +1,2 @@
+# The forty percent compatible keymap for scythe
+