From 51e99b562d410e8be7075cac6e5bee6a4b9d99bf Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Mon, 31 Jan 2022 03:17:04 +0800
Subject: [Keyboard] move @monksoffunk 's boards into 25keys/ (#15789)
---
keyboards/25keys/aleth42/info.json | 52 +++
keyboards/25keys/aleth42/keymaps/default/keymap.c | 150 +++++++++
keyboards/25keys/aleth42/keymaps/default/readme.md | 50 +++
keyboards/25keys/aleth42/keymaps/via/config.h | 22 ++
keyboards/25keys/aleth42/keymaps/via/keymap.c | 150 +++++++++
keyboards/25keys/aleth42/keymaps/via/readme.md | 56 ++++
keyboards/25keys/aleth42/keymaps/via/rules.mk | 2 +
keyboards/25keys/aleth42/readme.md | 15 +
keyboards/25keys/aleth42/rev0/config.h | 82 +++++
keyboards/25keys/aleth42/rev0/readme.md | 15 +
keyboards/25keys/aleth42/rev0/rev0.c | 17 +
keyboards/25keys/aleth42/rev0/rev0.h | 54 +++
keyboards/25keys/aleth42/rev0/rules.mk | 18 +
keyboards/25keys/aleth42/rev1/config.h | 82 +++++
keyboards/25keys/aleth42/rev1/readme.md | 15 +
keyboards/25keys/aleth42/rev1/rev1.c | 17 +
keyboards/25keys/aleth42/rev1/rev1.h | 54 +++
keyboards/25keys/aleth42/rev1/rules.mk | 18 +
keyboards/25keys/aleth42/rules.mk | 1 +
keyboards/25keys/cassette42/cassette42.c | 16 +
keyboards/25keys/cassette42/cassette42.h | 34 ++
keyboards/25keys/cassette42/common/glcdfont.c | 233 +++++++++++++
keyboards/25keys/cassette42/common/oled_helper.c | 25 ++
keyboards/25keys/cassette42/common/oled_helper.h | 22 ++
keyboards/25keys/cassette42/config.h | 52 +++
keyboards/25keys/cassette42/info.json | 10 +
.../25keys/cassette42/keymaps/default/keymap.c | 174 ++++++++++
.../25keys/cassette42/keymaps/default/readme.md | 1 +
keyboards/25keys/cassette42/readme.md | 15 +
keyboards/25keys/cassette42/rules.mk | 23 ++
keyboards/25keys/zinc/.noci | 0
keyboards/25keys/zinc/config.h | 21 ++
keyboards/25keys/zinc/info.json | 10 +
keyboards/25keys/zinc/keymaps/default/config.h | 36 ++
keyboards/25keys/zinc/keymaps/default/keymap.c | 315 ++++++++++++++++++
keyboards/25keys/zinc/keymaps/default/readme_en.md | 131 ++++++++
keyboards/25keys/zinc/keymaps/default/readme_jp.md | 161 +++++++++
keyboards/25keys/zinc/keymaps/default/rules.mk | 121 +++++++
keyboards/25keys/zinc/keymaps/ginjake/config.h | 36 ++
keyboards/25keys/zinc/keymaps/ginjake/keymap.c | 368 +++++++++++++++++++++
keyboards/25keys/zinc/keymaps/ginjake/readme_jp.md | 123 +++++++
keyboards/25keys/zinc/keymaps/ginjake/rules.mk | 114 +++++++
keyboards/25keys/zinc/keymaps/monks/config.h | 36 ++
keyboards/25keys/zinc/keymaps/monks/keymap.c | 256 ++++++++++++++
keyboards/25keys/zinc/keymaps/monks/readme_jp.md | 103 ++++++
keyboards/25keys/zinc/keymaps/monks/rules.mk | 113 +++++++
keyboards/25keys/zinc/keymaps/toshi0383/config.h | 37 +++
keyboards/25keys/zinc/keymaps/toshi0383/keymap.c | 44 +++
keyboards/25keys/zinc/keymaps/toshi0383/rules.mk | 132 ++++++++
keyboards/25keys/zinc/keymaps/via/config.h | 41 +++
keyboards/25keys/zinc/keymaps/via/keymap.c | 203 ++++++++++++
keyboards/25keys/zinc/keymaps/via/readme_en.md | 115 +++++++
keyboards/25keys/zinc/keymaps/via/readme_jp.md | 149 +++++++++
keyboards/25keys/zinc/keymaps/via/rules.mk | 113 +++++++
keyboards/25keys/zinc/readme.md | 17 +
keyboards/25keys/zinc/rev1/.noci | 0
keyboards/25keys/zinc/rev1/config.h | 77 +++++
keyboards/25keys/zinc/rev1/info.json | 10 +
keyboards/25keys/zinc/rev1/post_config.h | 86 +++++
keyboards/25keys/zinc/rev1/rev1.c | 1 +
keyboards/25keys/zinc/rev1/rev1.h | 24 ++
keyboards/25keys/zinc/rev1/rules.mk | 1 +
keyboards/25keys/zinc/reva/.noci | 0
keyboards/25keys/zinc/reva/config.h | 77 +++++
keyboards/25keys/zinc/reva/info.json | 10 +
keyboards/25keys/zinc/reva/post_config.h | 86 +++++
keyboards/25keys/zinc/reva/reva.c | 1 +
keyboards/25keys/zinc/reva/reva.h | 24 ++
keyboards/25keys/zinc/reva/rules.mk | 1 +
keyboards/25keys/zinc/rules.mk | 25 ++
keyboards/25keys/zinc/zinc.c | 1 +
keyboards/25keys/zinc/zinc.h | 10 +
72 files changed, 4704 insertions(+)
create mode 100644 keyboards/25keys/aleth42/info.json
create mode 100644 keyboards/25keys/aleth42/keymaps/default/keymap.c
create mode 100644 keyboards/25keys/aleth42/keymaps/default/readme.md
create mode 100644 keyboards/25keys/aleth42/keymaps/via/config.h
create mode 100644 keyboards/25keys/aleth42/keymaps/via/keymap.c
create mode 100644 keyboards/25keys/aleth42/keymaps/via/readme.md
create mode 100644 keyboards/25keys/aleth42/keymaps/via/rules.mk
create mode 100644 keyboards/25keys/aleth42/readme.md
create mode 100644 keyboards/25keys/aleth42/rev0/config.h
create mode 100644 keyboards/25keys/aleth42/rev0/readme.md
create mode 100644 keyboards/25keys/aleth42/rev0/rev0.c
create mode 100644 keyboards/25keys/aleth42/rev0/rev0.h
create mode 100644 keyboards/25keys/aleth42/rev0/rules.mk
create mode 100644 keyboards/25keys/aleth42/rev1/config.h
create mode 100644 keyboards/25keys/aleth42/rev1/readme.md
create mode 100644 keyboards/25keys/aleth42/rev1/rev1.c
create mode 100644 keyboards/25keys/aleth42/rev1/rev1.h
create mode 100644 keyboards/25keys/aleth42/rev1/rules.mk
create mode 100644 keyboards/25keys/aleth42/rules.mk
create mode 100644 keyboards/25keys/cassette42/cassette42.c
create mode 100644 keyboards/25keys/cassette42/cassette42.h
create mode 100644 keyboards/25keys/cassette42/common/glcdfont.c
create mode 100644 keyboards/25keys/cassette42/common/oled_helper.c
create mode 100644 keyboards/25keys/cassette42/common/oled_helper.h
create mode 100644 keyboards/25keys/cassette42/config.h
create mode 100644 keyboards/25keys/cassette42/info.json
create mode 100644 keyboards/25keys/cassette42/keymaps/default/keymap.c
create mode 100644 keyboards/25keys/cassette42/keymaps/default/readme.md
create mode 100644 keyboards/25keys/cassette42/readme.md
create mode 100644 keyboards/25keys/cassette42/rules.mk
create mode 100644 keyboards/25keys/zinc/.noci
create mode 100644 keyboards/25keys/zinc/config.h
create mode 100644 keyboards/25keys/zinc/info.json
create mode 100644 keyboards/25keys/zinc/keymaps/default/config.h
create mode 100644 keyboards/25keys/zinc/keymaps/default/keymap.c
create mode 100644 keyboards/25keys/zinc/keymaps/default/readme_en.md
create mode 100644 keyboards/25keys/zinc/keymaps/default/readme_jp.md
create mode 100644 keyboards/25keys/zinc/keymaps/default/rules.mk
create mode 100644 keyboards/25keys/zinc/keymaps/ginjake/config.h
create mode 100644 keyboards/25keys/zinc/keymaps/ginjake/keymap.c
create mode 100644 keyboards/25keys/zinc/keymaps/ginjake/readme_jp.md
create mode 100644 keyboards/25keys/zinc/keymaps/ginjake/rules.mk
create mode 100644 keyboards/25keys/zinc/keymaps/monks/config.h
create mode 100644 keyboards/25keys/zinc/keymaps/monks/keymap.c
create mode 100644 keyboards/25keys/zinc/keymaps/monks/readme_jp.md
create mode 100644 keyboards/25keys/zinc/keymaps/monks/rules.mk
create mode 100644 keyboards/25keys/zinc/keymaps/toshi0383/config.h
create mode 100644 keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
create mode 100644 keyboards/25keys/zinc/keymaps/toshi0383/rules.mk
create mode 100644 keyboards/25keys/zinc/keymaps/via/config.h
create mode 100644 keyboards/25keys/zinc/keymaps/via/keymap.c
create mode 100644 keyboards/25keys/zinc/keymaps/via/readme_en.md
create mode 100644 keyboards/25keys/zinc/keymaps/via/readme_jp.md
create mode 100644 keyboards/25keys/zinc/keymaps/via/rules.mk
create mode 100644 keyboards/25keys/zinc/readme.md
create mode 100644 keyboards/25keys/zinc/rev1/.noci
create mode 100644 keyboards/25keys/zinc/rev1/config.h
create mode 100644 keyboards/25keys/zinc/rev1/info.json
create mode 100644 keyboards/25keys/zinc/rev1/post_config.h
create mode 100644 keyboards/25keys/zinc/rev1/rev1.c
create mode 100644 keyboards/25keys/zinc/rev1/rev1.h
create mode 100644 keyboards/25keys/zinc/rev1/rules.mk
create mode 100644 keyboards/25keys/zinc/reva/.noci
create mode 100644 keyboards/25keys/zinc/reva/config.h
create mode 100644 keyboards/25keys/zinc/reva/info.json
create mode 100644 keyboards/25keys/zinc/reva/post_config.h
create mode 100644 keyboards/25keys/zinc/reva/reva.c
create mode 100644 keyboards/25keys/zinc/reva/reva.h
create mode 100644 keyboards/25keys/zinc/reva/rules.mk
create mode 100644 keyboards/25keys/zinc/rules.mk
create mode 100644 keyboards/25keys/zinc/zinc.c
create mode 100644 keyboards/25keys/zinc/zinc.h
(limited to 'keyboards/25keys')
diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json
new file mode 100644
index 0000000000..5a8b564685
--- /dev/null
+++ b/keyboards/25keys/aleth42/info.json
@@ -0,0 +1,52 @@
+{
+ "keyboard_name": "aleth42",
+ "url": "http://www.sho-k.co.uk/tech/aleth42",
+ "maintainer": "monksoffunk",
+ "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}]
+ }
+ }
+}
diff --git a/keyboards/25keys/aleth42/keymaps/default/keymap.c b/keyboards/25keys/aleth42/keymaps/default/keymap.c
new file mode 100644
index 0000000000..707af7116a
--- /dev/null
+++ b/keyboards/25keys/aleth42/keymaps/default/keymap.c
@@ -0,0 +1,150 @@
+/* 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 .
+ */
+#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, _______, _______, _______, _______, _______, _______, _______
+ ),
+};
+
+bool 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);
+ }
+ }
+ return true;
+}
diff --git a/keyboards/25keys/aleth42/keymaps/default/readme.md b/keyboards/25keys/aleth42/keymaps/default/readme.md
new file mode 100644
index 0000000000..85da46e69f
--- /dev/null
+++ b/keyboards/25keys/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/25keys/aleth42/keymaps/via/config.h b/keyboards/25keys/aleth42/keymaps/via/config.h
new file mode 100644
index 0000000000..f664d664f6
--- /dev/null
+++ b/keyboards/25keys/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 .
+ */
+
+#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/25keys/aleth42/keymaps/via/keymap.c b/keyboards/25keys/aleth42/keymaps/via/keymap.c
new file mode 100644
index 0000000000..2801e65ec4
--- /dev/null
+++ b/keyboards/25keys/aleth42/keymaps/via/keymap.c
@@ -0,0 +1,150 @@
+/* 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 .
+ */
+#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, _______, _______, _______, _______, _______, _______, _______
+ ),
+};
+
+bool 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);
+ }
+ }
+ return true;
+}
diff --git a/keyboards/25keys/aleth42/keymaps/via/readme.md b/keyboards/25keys/aleth42/keymaps/via/readme.md
new file mode 100644
index 0000000000..01f2cfee34
--- /dev/null
+++ b/keyboards/25keys/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/25keys/aleth42/keymaps/via/rules.mk b/keyboards/25keys/aleth42/keymaps/via/rules.mk
new file mode 100644
index 0000000000..35a31dea8e
--- /dev/null
+++ b/keyboards/25keys/aleth42/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+CONSOLE_ENABLE = no
diff --git a/keyboards/25keys/aleth42/readme.md b/keyboards/25keys/aleth42/readme.md
new file mode 100644
index 0000000000..acf9c38e2e
--- /dev/null
+++ b/keyboards/25keys/aleth42/readme.md
@@ -0,0 +1,15 @@
+# ALETH42
+
+
+
+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 25keys/aleth42/rev1: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/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
new file mode 100644
index 0000000000..da10e30a4f
--- /dev/null
+++ b/keyboards/25keys/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 .
+*/
+
+#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/25keys/aleth42/rev0/readme.md b/keyboards/25keys/aleth42/rev0/readme.md
new file mode 100644
index 0000000000..2457a7a10a
--- /dev/null
+++ b/keyboards/25keys/aleth42/rev0/readme.md
@@ -0,0 +1,15 @@
+# ALETH42
+
+
+
+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/25keys/aleth42/rev0/rev0.c b/keyboards/25keys/aleth42/rev0/rev0.c
new file mode 100644
index 0000000000..ce91e83804
--- /dev/null
+++ b/keyboards/25keys/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 .
+ */
+
+#include "rev0.h"
\ No newline at end of file
diff --git a/keyboards/25keys/aleth42/rev0/rev0.h b/keyboards/25keys/aleth42/rev0/rev0.h
new file mode 100644
index 0000000000..a5dd74037f
--- /dev/null
+++ b/keyboards/25keys/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 .
+ */
+
+#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/25keys/aleth42/rev0/rules.mk b/keyboards/25keys/aleth42/rev0/rules.mk
new file mode 100644
index 0000000000..fd5789116d
--- /dev/null
+++ b/keyboards/25keys/aleth42/rev0/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+ENCODER_ENABLE = yes
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
new file mode 100644
index 0000000000..38c74c6bf1
--- /dev/null
+++ b/keyboards/25keys/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 .
+*/
+
+#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/25keys/aleth42/rev1/readme.md b/keyboards/25keys/aleth42/rev1/readme.md
new file mode 100644
index 0000000000..3da1231d60
--- /dev/null
+++ b/keyboards/25keys/aleth42/rev1/readme.md
@@ -0,0 +1,15 @@
+# ALETH42
+
+
+
+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/25keys/aleth42/rev1/rev1.c b/keyboards/25keys/aleth42/rev1/rev1.c
new file mode 100644
index 0000000000..360cf8e7f1
--- /dev/null
+++ b/keyboards/25keys/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 .
+ */
+
+#include "rev1.h"
\ No newline at end of file
diff --git a/keyboards/25keys/aleth42/rev1/rev1.h b/keyboards/25keys/aleth42/rev1/rev1.h
new file mode 100644
index 0000000000..a5dd74037f
--- /dev/null
+++ b/keyboards/25keys/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 .
+ */
+
+#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/25keys/aleth42/rev1/rules.mk b/keyboards/25keys/aleth42/rev1/rules.mk
new file mode 100644
index 0000000000..5ff179b0eb
--- /dev/null
+++ b/keyboards/25keys/aleth42/rev1/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+ENCODER_ENABLE = yes
diff --git a/keyboards/25keys/aleth42/rules.mk b/keyboards/25keys/aleth42/rules.mk
new file mode 100644
index 0000000000..8d130979b8
--- /dev/null
+++ b/keyboards/25keys/aleth42/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = aleth42/rev1
diff --git a/keyboards/25keys/cassette42/cassette42.c b/keyboards/25keys/cassette42/cassette42.c
new file mode 100644
index 0000000000..f5ca2b8a98
--- /dev/null
+++ b/keyboards/25keys/cassette42/cassette42.c
@@ -0,0 +1,16 @@
+/* Copyright 2019 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 .
+ */
+#include "cassette42.h"
diff --git a/keyboards/25keys/cassette42/cassette42.h b/keyboards/25keys/cassette42/cassette42.h
new file mode 100644
index 0000000000..32a686f3de
--- /dev/null
+++ b/keyboards/25keys/cassette42/cassette42.h
@@ -0,0 +1,34 @@
+/* Copyright 2019 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 .
+ */
+#pragma once
+
+#include "quantum.h"
+
+/* This 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.
+ */
+#define LAYOUT( \
+ k10, k11, \
+ k00, k01, k02, k03\
+) \
+{ \
+ { k00, k01, k02, k03, k10, k11 }, \
+}
diff --git a/keyboards/25keys/cassette42/common/glcdfont.c b/keyboards/25keys/cassette42/common/glcdfont.c
new file mode 100644
index 0000000000..dcffc71958
--- /dev/null
+++ b/keyboards/25keys/cassette42/common/glcdfont.c
@@ -0,0 +1,233 @@
+// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
+// See gfxfont.h for newer custom bitmap font info.
+
+#include "progmem.h"
+
+// Standard ASCII 5x7 font
+
+static const unsigned char font[] PROGMEM = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
+0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
+0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
+0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
+0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
+0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
+0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
+0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
+0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
+0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
+0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
+0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
+0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
+0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
+0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
+0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
+0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
+0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
+0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
+0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
+0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
+0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
+0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
+0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
+0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
+0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
+0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
+0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
+0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
+0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
+0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
+0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
+0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
+0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
+0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
+0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
+0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
+0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
+0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
+0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
+0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
+0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
+0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
+0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
+0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
+0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
+0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
+0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
+0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
+0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
+0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
+0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
+0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
+0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
+0x18, 0x24, 0x24, 0x1C, 0x38, 0x00,
+0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
+0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
+0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
+0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
+0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
+0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
+0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
+0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
+0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
+0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
+0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
+0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
+0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
+0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
+0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
+0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
+0x00, 0x00, 0x00, 0xFE, 0x01, 0x19,
+0x05, 0xC1, 0x21, 0x31, 0xD1, 0x11,
+0x11, 0x11, 0x11, 0x11, 0x11, 0xD1,
+0x31, 0x21, 0xC1, 0x01, 0x01, 0x01,
+0xFE, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x3E, 0x3E, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0x3E, 0x3E, 0x3E,
+0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+0x00, 0x00, 0x3E, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0x3E, 0xBE, 0xBE,
+0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0x7E,
+0x00, 0x00, 0xF8, 0xF8, 0xF8, 0x00,
+0xF8, 0xF8, 0xF8, 0x00, 0xF8, 0xF8,
+0xF8, 0xF8, 0x00, 0x00, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0,
+0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
+0xE0, 0xE0, 0xE0, 0x00, 0x00, 0x00,
+0xC0, 0xF0, 0xFE, 0x7E, 0x1E, 0xFE,
+0xFE, 0xFE, 0xFE, 0x00, 0x00, 0xF0,
+0xFC, 0xFC, 0xFE, 0x1E, 0x9E, 0xFE,
+0xFC, 0xFC, 0xF0, 0x00, 0x00, 0x00,
+0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
+0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
+0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
+0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
+0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
+0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
+0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
+0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3F, 0x40, 0x60,
+0x50, 0x48, 0x69, 0x4B, 0x4A, 0x4A,
+0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A,
+0x4B, 0x69, 0x48, 0x50, 0x60, 0x40,
+0x3F, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x7C, 0x7C, 0x7F, 0x7F,
+0x7F, 0x3F, 0x1F, 0x00, 0x7C, 0x7C,
+0x7F, 0x7F, 0x7F, 0x3F, 0x1F, 0x07,
+0x00, 0x00, 0x00, 0x0F, 0x3F, 0x7F,
+0x7F, 0x7F, 0x7F, 0x7C, 0x7D, 0x7D,
+0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7C,
+0x00, 0x00, 0x7B, 0x7B, 0x7B, 0x78,
+0x7B, 0x7B, 0x7B, 0x78, 0x7F, 0x7F,
+0x7F, 0x3F, 0x00, 0x00, 0x00, 0x7F,
+0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x03,
+0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+0x03, 0x03, 0x03, 0x00, 0x00, 0x06,
+0x07, 0x07, 0x07, 0x07, 0x00, 0x7F,
+0x7F, 0x7F, 0x7F, 0x00, 0x00, 0x00,
+0x41, 0x73, 0x78, 0x7E, 0x7F, 0x7F,
+0x7F, 0x7B, 0x78, 0x00, 0x00, 0x00,
+0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
+0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
+0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
+0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
+0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
+0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
+0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
+0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
diff --git a/keyboards/25keys/cassette42/common/oled_helper.c b/keyboards/25keys/cassette42/common/oled_helper.c
new file mode 100644
index 0000000000..8800699a85
--- /dev/null
+++ b/keyboards/25keys/cassette42/common/oled_helper.c
@@ -0,0 +1,25 @@
+#ifdef OLED_ENABLE
+# include QMK_KEYBOARD_H
+# include
+# include
+
+void render_logo(void) {
+ static const char PROGMEM logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0};
+ oled_write_P(logo, false);
+}
+
+# ifdef RGBLIGHT_ENABLE
+extern rgblight_config_t rgblight_config;
+static char led_buf[24] = "LED state ready.\n";
+rgblight_config_t rgblight_config_bak;
+
+void update_led_status(void) {
+ if (rgblight_config_bak.enable != rgblight_config.enable || rgblight_config_bak.mode != rgblight_config.mode || rgblight_config_bak.hue != rgblight_config.hue || rgblight_config_bak.sat != rgblight_config.sat || rgblight_config_bak.val != rgblight_config.val) {
+ snprintf(led_buf, sizeof(led_buf) - 1, "%c H%2d S%2d V%2d MODE%2d", rgblight_config.enable ? '*' : '.', (uint8_t)(rgblight_config.hue / RGBLIGHT_HUE_STEP), (uint8_t)(rgblight_config.sat / RGBLIGHT_SAT_STEP), (uint8_t)(rgblight_config.val / RGBLIGHT_VAL_STEP), (uint8_t)rgblight_config.mode);
+ rgblight_config_bak = rgblight_config;
+ }
+}
+
+void render_led_status(void) { oled_write(led_buf, false); }
+# endif
+#endif
diff --git a/keyboards/25keys/cassette42/common/oled_helper.h b/keyboards/25keys/cassette42/common/oled_helper.h
new file mode 100644
index 0000000000..daeb7bfa4d
--- /dev/null
+++ b/keyboards/25keys/cassette42/common/oled_helper.h
@@ -0,0 +1,22 @@
+#ifdef OLED_ENABLE
+
+void render_logo(void);
+
+# define RENDER_LOGO(a) render_logo(a)
+
+# ifdef RGBLIGHT_ENABLE
+void update_led_status(void);
+void render_led_status(void);
+# define UPDATE_LED_STATUS() update_led_status()
+# define RENDER_LED_STATUS(a) render_led_status(a)
+# else
+# define UPDATE_LED_STATUS()
+# define RENDER_LED_STATUS(a)
+# endif
+
+#else
+# define RENDER_LOGO(a)
+# define UPDATE_LED_STATUS()
+# define RENDER_LED_STATUS(a)
+
+#endif
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
new file mode 100644
index 0000000000..cac03f6346
--- /dev/null
+++ b/keyboards/25keys/cassette42/config.h
@@ -0,0 +1,52 @@
+/*
+Copyright 2019 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 .
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0xCA42
+#define DEVICE_VER 0x0001
+#define MANUFACTURER monksoffunk
+#define PRODUCT cassette42
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 6
+
+#define DIRECT_PINS {{ B4, F6, F5, F4, B5, F7 }}
+#define UNUSED_PINS
+
+#define ENCODERS_PAD_A { B6, B3 }
+#define ENCODERS_PAD_B { B2, B1 }
+#define ENCODER_RESOLUTION 4
+
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+# define