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

19 files changed, 878 insertions, 0 deletions

diff --git a/keyboards/aleth42/info.json b/keyboards/aleth42/info.json
new file mode 100644
index 0000000000..852c94bb0f
--- /dev/null
+++ b/keyboards/aleth42/info.json
@@ -0,0 +1,54 @@
+{
+    "keyboard_name": "aleth42", 
+    "url": "http://www.sho-k.co.uk/tech/aleth42", 
+    "maintainer": "monksoffunk", 
+    "width": 12, 
+    "height": 4, 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":0, "y":1, "w":1.25},
+                {"x":1.25, "y":1},
+                {"x":2.25, "y":1},
+                {"x":3.25, "y":1},
+                {"x":4.25, "y":1},
+                {"x":5.25, "y":1},
+                {"x":6.25, "y":1},
+                {"x":7.25, "y":1},
+                {"x":8.25, "y":1},
+                {"x":9.25, "y":1},
+                {"x":10.25, "y":1, "w":1.75},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2, "w":1.25},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3, "w":1.25},
+                {"x":3.5, "y":3, "w":2.75},
+                {"x":6.25, "y":3, "w":2.25},
+                {"x":8.5, "y":3, "w":1.25},
+                {"x":9.75, "y":3},
+                {"x":10.75, "y":3, "w":1.25}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/aleth42/keymaps/default/keymap.c b/keyboards/aleth42/keymaps/default/keymap.c
new file mode 100644
index 0000000000..48214d1e22
--- /dev/null
+++ b/keyboards/aleth42/keymaps/default/keymap.c
@@ -0,0 +1,149 @@
+/* Copyright 2020 monksoffunk
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    QWERTY = SAFE_RANGE,
+    LOWER,
+    RAISE,
+    ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Default Layer
+     * ,-----------------------------------------------------------.
+     * | Esc|  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P | BS |
+     * |-----------------------------------------------------------|
+     * | Tab |  A |  S |  D |  F |  G |  H |  J |  K |  L | Ent    |
+     * |-----------------------------------------------------------|
+     * | LSft   |  Z |  X |  C |  V |  B |  N |  M |  , |  . |fn(/)|
+     * |-----------------------------------------------------------|
+     * | LCtl | LAlt| LGui|  spc fn0  |  spc fn1    |RGui|RAlt|RCtl|
+     * `-----------------------------------------------------------'
+ */
+    [_QWERTY] = LAYOUT(
+        KC_ESC,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   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_H,   KC_J,   KC_K,    KC_L,    KC_ENT,
+        KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  LT(_ADJUST, KC_SLSH),
+        KC_LCTL, KC_LALT   , KC_LGUI, LT(_LOWER, KC_SPC),   LT(_RAISE, KC_SPC), KC_RGUI, KC_RALT, KC_RCTL
+        ),
+
+ /* Lower Layer
+     * ,-----------------------------------------------------------.
+     * |  ~ |  ! |  @ |  # |  $ |  % |  ^ |  & |  * |  ( |  ) | Del|
+     * |-----------------------------------------------------------|
+     * |        |    |    |    |    |     | _ | + | { | } |  Pipe  |
+     * |-----------------------------------------------------------|
+     * |          |    |    |    |    |    |   | ;  | '  | Up |    |
+     * |-----------------------------------------------------------|
+     * |     |    |     |           |             |Left|Down|Right |
+     * `-----------------------------------------------------------'
+     */
+    [_LOWER] = LAYOUT(
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+		_______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+		_______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_UP,   _______,
+		_______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT
+		),
+
+	/* Raise Layer
+     * ,-----------------------------------------------------------.
+     * |  ` |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 | Del|
+     * |-----------------------------------------------------------|
+     * |  F1   | F2  | F3 | F4 | F5 |  F6 | - | = | [ | ] |  Pipe  |
+     * |-----------------------------------------------------------|
+     * |    F7    | F8 | F9 | F10| F11| F12|  \ |  \ |   |    |    |
+     * |-----------------------------------------------------------|
+     * |     |    |     |           |             |     |    |     |
+     * `-----------------------------------------------------------'
+     */
+    [_RAISE] = LAYOUT(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+		KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______
+		),
+
+	/* Adjust Layer
+     * ,-----------------------------------------------------------.
+     * |Mute| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10|F11 |
+     * |-----------------------------------------------------------|
+     * |       |BTOG |BSTP|BINC| MAC|RGBTOG|HUI|WIN|SAI|VAI|  F12  |
+     * |-----------------------------------------------------------|
+     * |   Caps   |Reset|BBRE|BDEC|    |RMOD|HUD |   |SAD|VAD |    |
+     * |-----------------------------------------------------------|
+     * |SLEEP|    |     |           |             |     |    |     |
+     * `-----------------------------------------------------------'
+      */
+    [_ADJUST] = LAYOUT(
+        KC_MUTE, KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+		_______, BL_TOGG, BL_STEP, BL_INC,  AG_NORM,  RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI,  KC_F12,
+		KC_CAPS, RESET,   BL_BRTG, BL_DEC,  _______,  RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD,  _______,
+		KC_SLEP, _______, _______, _______, _______, _______, _______, _______
+		),
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* Left encoder */
+        switch (get_highest_layer(layer_state)) {
+            case _QWERTY:
+                if (clockwise) {
+                    tap_code(KC_TAB);
+                } else {
+                    tap_code16(S(KC_TAB));
+                }
+                break;
+            case _RAISE:
+                if (clockwise) {
+                //    tap_code(KC_VOLU);
+                    if(keymap_config.swap_lalt_lgui==false){
+                        tap_code(KC_LANG2);
+                    }else {
+                        tap_code16(A(KC_GRV));
+                    }
+                } else {
+                    if(keymap_config.swap_lalt_lgui==false){
+                    tap_code(KC_LANG1);
+                    } else {
+                        tap_code16(A(KC_GRV));
+                    }
+                }
+                break;
+            case _ADJUST:
+                if (clockwise) {
+                    tap_code(KC_VOLU);
+                } else {
+                    tap_code(KC_VOLD);
+            }
+        }
+
+    } else if (index == 1) { /* Right encoder */
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+}
diff --git a/keyboards/aleth42/keymaps/default/readme.md b/keyboards/aleth42/keymaps/default/readme.md
new file mode 100644
index 0000000000..85da46e69f
--- /dev/null
+++ b/keyboards/aleth42/keymaps/default/readme.md
@@ -0,0 +1,50 @@
+# The default keymap for aleth42
+
+Default Layer
+
+    ,-----------------------------------------------------------.
+    | Esc|  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P | BS |
+    |-----------------------------------------------------------|
+    | Tab |  A |  S |  D |  F |  G |  H |  J |  K |  L | Ent    |
+    |-----------------------------------------------------------|
+    | LSft   |  Z |  X |  C |  V |  B |  N |  M |  , |  . |fn(/)|
+    |-----------------------------------------------------------|
+    | Lctl | LAlt| LGui|  spc fn0  |  spc fn1    |RGui|RAlt|RCtl|
+    `-----------------------------------------------------------'
+
+Lower Layer = fn0
+
+    ,-----------------------------------------------------------.
+    |  ~ |  ! |  @ |  # |  $ |  % |  ^ |  & |  * |  ( |  ) | Del|
+    |-----------------------------------------------------------|
+    |        |    |    |    |    |     | _ | + | { | } |  Pipe  |
+    |-----------------------------------------------------------|
+    |          |    |    |    |    |    |   | ;  | '  | Up |    |
+    |-----------------------------------------------------------|
+    |     |    |     |           |             |Left|Down|Right |
+    `-----------------------------------------------------------'
+
+Raise Layer = fn1
+
+    ,-----------------------------------------------------------.
+    |  ` |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 | Del|
+    |-----------------------------------------------------------|
+    |  F1   | F2  | F3 | F4 | F5 |  F6 | - | = | [ | ] |  Pipe  |
+    |-----------------------------------------------------------|
+    |    F7    | F8 | F9 | F10| F11| F12|  \ |  \ |   |    |    |
+    |-----------------------------------------------------------|
+    |     |    |     |           |             |     |    |     |
+    `-----------------------------------------------------------'
+
+Adjust Layer = fn
+
+    ,-----------------------------------------------------------.
+    |Mute| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10|F11 |
+    |-----------------------------------------------------------|
+    |       |BTOG |BSTP|BINC| MAC|RGBTOG|HUI|WIN|SAI|VAI|  F12  |
+    |-----------------------------------------------------------|
+    |   Caps   |Reset|BBRE|BDEC|    |RMOD|HUD |   |SAD|VAD |    |
+    |-----------------------------------------------------------|
+    |SLEEP|    |     |           |             |     |    |     |
+    `-----------------------------------------------------------'
+ 
diff --git a/keyboards/aleth42/keymaps/via/config.h b/keyboards/aleth42/keymaps/via/config.h
new file mode 100644
index 0000000000..f664d664f6
--- /dev/null
+++ b/keyboards/aleth42/keymaps/via/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 monksoffunk
+ *
+ * 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 TAPPING_TERM 200
+#define PERMISSIVE_HOLD
+#define ENCODER_RESOLUTION 2
\ No newline at end of file
diff --git a/keyboards/aleth42/keymaps/via/keymap.c b/keyboards/aleth42/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e747b0d64f
--- /dev/null
+++ b/keyboards/aleth42/keymaps/via/keymap.c
@@ -0,0 +1,149 @@
+/* Copyright 2020 monksoffunk
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    QWERTY = SAFE_RANGE,
+    LOWER,
+    RAISE,
+    ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Default Layer
+     * ,-----------------------------------------------------------.
+     * | Esc|  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P | BS |
+     * |-----------------------------------------------------------|
+     * | Tab |  A |  S |  D |  F |  G |  H |  J |  K |  L | Ent    |
+     * |-----------------------------------------------------------|
+     * | LSft   |  Z |  X |  C |  V |  B |  N |  M |  , |  . |fn(/)|
+     * |-----------------------------------------------------------|
+     * | Esc  | LAlt| LGui|  spc fn0  |  spc fn1    |RGui|RAlt|RCtl|
+     * `-----------------------------------------------------------'
+ */
+    [_QWERTY] = LAYOUT(
+        KC_ESC,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,   KC_BSPC,
+        MT(MOD_LCTL, KC_TAB),  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_ENT,
+        KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  LT(_ADJUST, KC_SLSH),
+        MT(MOD_LCTL, KC_ESC), KC_LALT   , KC_LGUI, LT(_LOWER, KC_SPC),   LT(_RAISE, KC_SPC), KC_RGUI, KC_RALT, KC_RCTL
+        ),
+
+ /* Lower Layer
+     * ,-----------------------------------------------------------.
+     * |  ~ |  ! |  @ |  # |  $ |  % |  ^ |  & |  * |  ( |  ) | Del|
+     * |-----------------------------------------------------------|
+     * |        |    |    |    |    |     | _ | + | { | } |  Pipe  |
+     * |-----------------------------------------------------------|
+     * |          |    |    |    |    |    |   | ;  | '  | Up |    |
+     * |-----------------------------------------------------------|
+     * |     |    |     |           |             |Left|Down|Right |
+     * `-----------------------------------------------------------'
+     */
+    [_LOWER] = LAYOUT(
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+		_______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+		_______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_UP,   _______,
+		_______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT
+		),
+
+	/* Raise Layer
+     * ,-----------------------------------------------------------.
+     * |  ` |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 | Del|
+     * |-----------------------------------------------------------|
+     * |  F1   | F2  | F3 | F4 | F5 |  F6 | - | = | [ | ] |  Pipe  |
+     * |-----------------------------------------------------------|
+     * |    F7    | F8 | F9 | F10| F11| F12|  \ |  \ |   |    |    |
+     * |-----------------------------------------------------------|
+     * |     |    |     |           |             |     |    |     |
+     * `-----------------------------------------------------------'
+     */
+    [_RAISE] = LAYOUT(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+		KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______
+		),
+
+	/* Adjust Layer
+     * ,-----------------------------------------------------------.
+     * |Mute| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10|F11 |
+     * |-----------------------------------------------------------|
+     * |       |BTOG |BSTP|BINC| MAC|RGBTOG|HUI|WIN|SAI|VAI|  F12  |
+     * |-----------------------------------------------------------|
+     * |   Caps   |Reset|BBRE|BDEC|    |RMOD|HUD |   |SAD|VAD |    |
+     * |-----------------------------------------------------------|
+     * |SLEEP|    |     |           |             |     |    |     |
+     * `-----------------------------------------------------------'
+      */
+    [_ADJUST] = LAYOUT(
+        KC_MUTE, KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+		_______, BL_TOGG, BL_STEP, BL_INC,  AG_NORM,  RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI,  KC_F12,
+		KC_CAPS, RESET,   BL_BRTG, BL_DEC,  _______,  RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD,  _______,
+		KC_SLEP, _______, _______, _______, _______, _______, _______, _______
+		),
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* Left encoder */
+        switch (get_highest_layer(layer_state)) {
+            case _QWERTY:
+                if (clockwise) {
+                    tap_code(KC_TAB);
+                } else {
+                    tap_code16(S(KC_TAB));
+                }
+                break;
+            case _RAISE:
+                if (clockwise) {
+                //    tap_code(KC_VOLU);
+                    if(keymap_config.swap_lalt_lgui==false){
+                        tap_code(KC_LANG2);
+                    }else {
+                        tap_code16(A(KC_GRV));
+                    }
+                } else {
+                    if(keymap_config.swap_lalt_lgui==false){
+                    tap_code(KC_LANG1);
+                    } else {
+                        tap_code16(A(KC_GRV));
+                    }
+                }
+                    break;
+            case _ADJUST:
+                if (clockwise) {
+                    tap_code(KC_VOLU);
+                } else {
+                    tap_code(KC_VOLD);
+            }
+        }
+
+    } else if (index == 1) { /* Right encoder */
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/aleth42/keymaps/via/readme.md b/keyboards/aleth42/keymaps/via/readme.md
new file mode 100644
index 0000000000..01f2cfee34
--- /dev/null
+++ b/keyboards/aleth42/keymaps/via/readme.md
@@ -0,0 +1,56 @@
+# The VIA keymap for aleth42
+
+Default Layer
+
+    ,-----------------------------------------------------------.
+    | Esc|  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P | BS |
+    |-----------------------------------------------------------|
+    | Tab*|  A |  S |  D |  F |  G |  H |  J |  K |  L | Ent    |
+    |-----------------------------------------------------------|
+    | LSft   |  Z |  X |  C |  V |  B |  N |  M |  , |  . |fn(/)|
+    |-----------------------------------------------------------|
+    | Esc* | LAlt| LGui|  spc fn0  |  spc fn1    |RGui|RAlt|RCtl|
+    `-----------------------------------------------------------'
+
+Tab* would activate Left Control when held, and send Tab when tapped.
+
+Esc* would activate Left Control when held, and send Escape when tapped.
+
+Esc* is useful with a rotary encoder @ upper-left Esc location.
+
+Lower Layer = fn0
+
+    ,-----------------------------------------------------------.
+    |  ~ |  ! |  @ |  # |  $ |  % |  ^ |  & |  * |  ( |  ) | Del|
+    |-----------------------------------------------------------|
+    |        |    |    |    |    |     | _ | + | { | } |  Pipe  |
+    |-----------------------------------------------------------|
+    |          |    |    |    |    |    |   | ;  | '  | Up |    |
+    |-----------------------------------------------------------|
+    |     |    |     |           |             |Left|Down|Right |
+    `-----------------------------------------------------------'
+
+Raise Layer = fn1
+
+    ,-----------------------------------------------------------.
+    |  ` |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 | Del|
+    |-----------------------------------------------------------|
+    |  F1   | F2  | F3 | F4 | F5 |  F6 | - | = | [ | ] |  Pipe  |
+    |-----------------------------------------------------------|
+    |    F7    | F8 | F9 | F10| F11| F12|  \ |  \ |   |    |    |
+    |-----------------------------------------------------------|
+    |     |    |     |           |             |     |    |     |
+    `-----------------------------------------------------------'
+
+Adjust Layer = fn
+
+    ,-----------------------------------------------------------.
+    |Mute| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10|F11 |
+    |-----------------------------------------------------------|
+    |       |BTOG |BSTP|BINC| MAC|RGBTOG|HUI|WIN|SAI|VAI|  F12  |
+    |-----------------------------------------------------------|
+    |   Caps   |Reset|BBRE|BDEC|    |RMOD|HUD |   |SAD|VAD |    |
+    |-----------------------------------------------------------|
+    |SLEEP|    |     |           |             |     |    |     |
+    `-----------------------------------------------------------'
+ 
diff --git a/keyboards/aleth42/keymaps/via/rules.mk b/keyboards/aleth42/keymaps/via/rules.mk
new file mode 100644
index 0000000000..35a31dea8e
--- /dev/null
+++ b/keyboards/aleth42/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+CONSOLE_ENABLE = no
diff --git a/keyboards/aleth42/readme.md b/keyboards/aleth42/readme.md
new file mode 100644
index 0000000000..3da1231d60
--- /dev/null
+++ b/keyboards/aleth42/readme.md
@@ -0,0 +1,15 @@
+# ALETH42
+
+![ALETH42](https://i.imgur.com/6hJVBQl.png)
+
+40% keyboard with rotary encoder (optional)
+
+* Keyboard Maintainer: [monksoffunk](https://github.com/monksoffunk/) [@monksoffunkJP](https://twitter.com/monksoffunkJP)
+* Hardware Supported: ALETH42 PCB
+* Hardware Availability: [twitter](https://twitter.com/monksoffunkJP), [Booth](https://25keys.booth.pm/items/2420095)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aleth42:default
+
+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/aleth42/rev0/config.h b/keyboards/aleth42/rev0/config.h
new file mode 100644
index 0000000000..da10e30a4f
--- /dev/null
+++ b/keyboards/aleth42/rev0/config.h
@@ -0,0 +1,82 @@
+/*
+Copyright 2020 monksoffunk
+
+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
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x04D8
+#define PRODUCT_ID 0xEAC8
+#define DEVICE_VER 0x0000
+#define MANUFACTURER 25KEYS
+#define PRODUCT ALETH42
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 11
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, C2, C4, C5, C6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define ENCODERS_PAD_A { B6, B5 }  // located @ upper left
+#define ENCODERS_PAD_B { B7, B4 }  // located @ bottom left
+
+#define RGB_DI_PIN C7
+#ifdef RGB_DI_PIN
+   #define RGBLED_NUM 6
+   #define RGBLIGHT_HUE_STEP 8
+   #define RGBLIGHT_SAT_STEP 8
+   #define RGBLIGHT_VAL_STEP 8
+   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+ /*== all animations enable ==*/
+   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
\ No newline at end of file
diff --git a/keyboards/aleth42/rev0/readme.md b/keyboards/aleth42/rev0/readme.md
new file mode 100644
index 0000000000..2457a7a10a
--- /dev/null
+++ b/keyboards/aleth42/rev0/readme.md
@@ -0,0 +1,15 @@
+# ALETH42
+
+![ALETH42](https://i.imgur.com/6hJVBQl.png)
+
+40% keyboard with rotary encoder (optional)
+
+* Keyboard Maintainer: [monksoffunk](https://github.com/monksoffunk/) [@monksoffunkJP](https://twitter.com/monksoffunkJP)
+* Hardware Supported: ALETH42 PCB
+* Hardware Availability: [twitter](https://twitter.com/monksoffunkJP)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aleth42:default
+
+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/aleth42/rev0/rev0.c b/keyboards/aleth42/rev0/rev0.c
new file mode 100644
index 0000000000..ce91e83804
--- /dev/null
+++ b/keyboards/aleth42/rev0/rev0.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 monksoffunk
+ *
+ * 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 "rev0.h"
\ No newline at end of file
diff --git a/keyboards/aleth42/rev0/rev0.h b/keyboards/aleth42/rev0/rev0.h
new file mode 100644
index 0000000000..a5dd74037f
--- /dev/null
+++ b/keyboards/aleth42/rev0/rev0.h
@@ -0,0 +1,54 @@
+/* Copyright 2020 monksoffunk
+ *
+ * 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
+
+#include "quantum.h"
+
+// for readability
+#define XXX KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+/* ALETH42 layout
+ * ,-----------------------------------------------------------.
+ * | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 38 |
+ * |-----------------------------------------------------------|
+ * | 10   | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A    |
+ * |-----------------------------------------------------------|
+ * | 20     | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A  |
+ * |-----------------------------------------------------------|
+ * | 30 | 31  | 32  |    33     |      34     | 35  | 36 | 37  |
+ * `-----------------------------------------------------------'
+ */
+#define LAYOUT( \
+  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k38,\
+  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,\
+  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,\
+  k30, k31, k32, k33, k34, k35, k36, k37\
+) \
+{ \
+  { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A },\
+  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A },\
+  { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A },\
+  { k30, k31, k32, k33, k34, k35, k36, k37, XXX, XXX, k38 }\
+}
diff --git a/keyboards/aleth42/rev0/rules.mk b/keyboards/aleth42/rev0/rules.mk
new file mode 100644
index 0000000000..a54fa022f5
--- /dev/null
+++ b/keyboards/aleth42/rev0/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+ENCODER_ENABLE = yes
+TAP_DANCE_ENABLE = no
diff --git a/keyboards/aleth42/rev1/config.h b/keyboards/aleth42/rev1/config.h
new file mode 100644
index 0000000000..38c74c6bf1
--- /dev/null
+++ b/keyboards/aleth42/rev1/config.h
@@ -0,0 +1,82 @@
+/*
+Copyright 2020 monksoffunk
+
+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
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x04D8
+#define PRODUCT_ID 0xEAC8
+#define DEVICE_VER 0x0001
+#define MANUFACTURER 25KEYS
+#define PRODUCT ALETH42
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 11
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B4, B0, B2, B1 }
+#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D6, D4, F7, F0, F1, F4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define ENCODERS_PAD_A { B5, F5 }
+#define ENCODERS_PAD_B { B6, F6 }
+
+#define BACKLIGHT_PIN C6
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 8
+
+#define RGB_DI_PIN B3
+#ifdef RGB_DI_PIN
+   #define RGBLED_NUM 8
+   #define RGBLIGHT_HUE_STEP 8
+   #define RGBLIGHT_SAT_STEP 8
+   #define RGBLIGHT_VAL_STEP 8
+   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+ /*== all animations enable ==*/
+   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
\ No newline at end of file
diff --git a/keyboards/aleth42/rev1/readme.md b/keyboards/aleth42/rev1/readme.md
new file mode 100644
index 0000000000..3da1231d60
--- /dev/null
+++ b/keyboards/aleth42/rev1/readme.md
@@ -0,0 +1,15 @@
+# ALETH42
+
+![ALETH42](https://i.imgur.com/6hJVBQl.png)
+
+40% keyboard with rotary encoder (optional)
+
+* Keyboard Maintainer: [monksoffunk](https://github.com/monksoffunk/) [@monksoffunkJP](https://twitter.com/monksoffunkJP)
+* Hardware Supported: ALETH42 PCB
+* Hardware Availability: [twitter](https://twitter.com/monksoffunkJP), [Booth](https://25keys.booth.pm/items/2420095)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aleth42:default
+
+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/aleth42/rev1/rev1.c b/keyboards/aleth42/rev1/rev1.c
new file mode 100644
index 0000000000..360cf8e7f1
--- /dev/null
+++ b/keyboards/aleth42/rev1/rev1.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 monksoffunk
+ *
+ * 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 "rev1.h"
\ No newline at end of file
diff --git a/keyboards/aleth42/rev1/rev1.h b/keyboards/aleth42/rev1/rev1.h
new file mode 100644
index 0000000000..a5dd74037f
--- /dev/null
+++ b/keyboards/aleth42/rev1/rev1.h
@@ -0,0 +1,54 @@
+/* Copyright 2020 monksoffunk
+ *
+ * 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
+
+#include "quantum.h"
+
+// for readability
+#define XXX KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+/* ALETH42 layout
+ * ,-----------------------------------------------------------.
+ * | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 38 |
+ * |-----------------------------------------------------------|
+ * | 10   | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A    |
+ * |-----------------------------------------------------------|
+ * | 20     | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A  |
+ * |-----------------------------------------------------------|
+ * | 30 | 31  | 32  |    33     |      34     | 35  | 36 | 37  |
+ * `-----------------------------------------------------------'
+ */
+#define LAYOUT( \
+  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k38,\
+  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,\
+  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,\
+  k30, k31, k32, k33, k34, k35, k36, k37\
+) \
+{ \
+  { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A },\
+  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A },\
+  { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A },\
+  { k30, k31, k32, k33, k34, k35, k36, k37, XXX, XXX, k38 }\
+}
diff --git a/keyboards/aleth42/rev1/rules.mk b/keyboards/aleth42/rev1/rules.mk
new file mode 100644
index 0000000000..9441d4051c
--- /dev/null
+++ b/keyboards/aleth42/rev1/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+ENCODER_ENABLE = yes
+TAP_DANCE_ENABLE = no
diff --git a/keyboards/aleth42/rules.mk b/keyboards/aleth42/rules.mk
new file mode 100644
index 0000000000..8d130979b8
--- /dev/null
+++ b/keyboards/aleth42/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = aleth42/rev1