From 99d5b5506ae780ffb522075788e3472b570ed7a4 Mon Sep 17 00:00:00 2001
From: Nostril <hong.aaron.c@gmail.com>
Date: Wed, 26 Oct 2022 12:40:44 -0700
Subject: [PATCH 1/3] [Keymap] Add new IIDX gamepad keymap for Synth Labs Solo
(#18741)
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
keyboards/synthlabs/solo/config.h | 2 +-
.../synthlabs/solo/keymaps/gamepad/readme.md | 2 +-
.../synthlabs/solo/keymaps/iidx/keymap.c | 72 +++++++++++++++++++
.../synthlabs/solo/keymaps/iidx/readme.md | 16 +++++
.../synthlabs/solo/keymaps/iidx/rules.mk | 3 +
5 files changed, 93 insertions(+), 2 deletions(-)
create mode 100644 keyboards/synthlabs/solo/keymaps/iidx/keymap.c
create mode 100644 keyboards/synthlabs/solo/keymaps/iidx/readme.md
create mode 100644 keyboards/synthlabs/solo/keymaps/iidx/rules.mk
diff --git a/keyboards/synthlabs/solo/config.h b/keyboards/synthlabs/solo/config.h
index 112d12d1ee..e8d9870e46 100644
--- a/keyboards/synthlabs/solo/config.h
+++ b/keyboards/synthlabs/solo/config.h
@@ -53,6 +53,6 @@
#define BOOTMAGIC_LITE_ROW 1
#define BOOTMAGIC_LITE_COLUMN 1
-#define JOYSTICK_BUTTON_COUNT 8
+#define JOYSTICK_BUTTON_COUNT 13
#define JOYSTICK_AXES_COUNT 1
#define JOYSTICK_AXES_RESOLUTION 16
diff --git a/keyboards/synthlabs/solo/keymaps/gamepad/readme.md b/keyboards/synthlabs/solo/keymaps/gamepad/readme.md
index 9930bb61b4..12e0df2cf2 100644
--- a/keyboards/synthlabs/solo/keymaps/gamepad/readme.md
+++ b/keyboards/synthlabs/solo/keymaps/gamepad/readme.md
@@ -1,3 +1,3 @@
# Gamepad Synth Labs Solo Layout
-This keymap is intended for usage as a IIDX controller. The rotary encoder is mapped as a virtual 1-axis joystick.
+This keymap is intended for usage as a generic gamepad. The rotary encoder is mapped as a virtual 1-axis joystick.
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/keymap.c b/keyboards/synthlabs/solo/keymaps/iidx/keymap.c
new file mode 100644
index 0000000000..f274ba9c06
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/iidx/keymap.c
@@ -0,0 +1,72 @@
+// Copyright 2022 Aaron Hong (@hongaaronc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "joystick.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6,
+ JS_BUTTON8, MO(1), JS_BUTTON7,
+ JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6
+ ),
+ [1] = LAYOUT_all(
+ JS_BUTTON9,JS_BUTTON0,JS_BUTTON10, _______,JS_BUTTON11,JS_BUTTON1,JS_BUTTON12,
+ _______, _______, _______,
+ JS_BUTTON10,JS_BUTTON0,JS_BUTTON9, _______,JS_BUTTON11,JS_BUTTON1,JS_BUTTON12
+ ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+/* The amount of time the encoder has to remain stationary, before unregistering encoder bindings */
+uint16_t encoder_stationary_release_delay_ms = 25;
+
+uint16_t encoder_last_update_time = 0;
+
+enum {
+ CCW_JOYSTICK_BUTTON = 8,
+ CW_JOYSTICK_BUTTON = 7,
+};
+
+enum {
+ CCW_MACRO = SAFE_RANGE,
+ CW_MACRO,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case CCW_MACRO:
+ unregister_joystick_button(CW_JOYSTICK_BUTTON);
+ register_joystick_button(CCW_JOYSTICK_BUTTON);
+ encoder_last_update_time = timer_read(); /* Update the last time that the encoder was detected as rotated */
+ return false;
+ case CW_MACRO:
+ unregister_joystick_button(CCW_JOYSTICK_BUTTON);
+ register_joystick_button(CW_JOYSTICK_BUTTON);
+ encoder_last_update_time = timer_read(); /* Update the last time that the encoder was detected as rotated */
+ return false;
+ default:
+ return true;
+ }
+}
+
+void housekeeping_task_user(void) {
+ uint16_t current_time = timer_read();
+ uint16_t elapsed_time_since_last_update = current_time - encoder_last_update_time;
+
+ /* If an encoder has been stationary for encoder_stationary_release_delay_ms, then unregister the joystick buttons for both directions */
+ if (elapsed_time_since_last_update >= encoder_stationary_release_delay_ms) {
+ unregister_joystick_button(CCW_JOYSTICK_BUTTON);
+ unregister_joystick_button(CW_JOYSTICK_BUTTON);
+ }
+}
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [0] = { ENCODER_CCW_CW(
+ CCW_MACRO,
+ CW_MACRO
+ ) },
+ [1] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/readme.md b/keyboards/synthlabs/solo/keymaps/iidx/readme.md
new file mode 100644
index 0000000000..f56fa622d3
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/iidx/readme.md
@@ -0,0 +1,16 @@
+# IIDX Synth Labs Solo Layout
+
+This keymap is intended for usage as a gamepad for [beatmania IIDX INFINITAS](https://p.eagate.573.jp/game/infinitas/2/index.html).
+
+This keycap follows the default keymapping for the game, shown here:
+
+
+
+The face buttons correspond directly to ボタン 1 - ボタン 7
+
+Turning the knob clockwise corresponds to スクラッチ-右回転
+Turning the knob counter-clockwise corresponds to スクラッチ-左回転
+
+While holding down the knob button
+* The bottom row of face buttons corresponds to ボタン E1 - ボタン E4
+* The top-left and top-right face buttons correspond to ボタン 1 and ボタン 2, for adjustment of in-game scroll speed
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/rules.mk b/keyboards/synthlabs/solo/keymaps/iidx/rules.mk
new file mode 100644
index 0000000000..550de16143
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/iidx/rules.mk
@@ -0,0 +1,3 @@
+JOYSTICK_ENABLE = yes
+DEBOUNCE_TYPE = sym_eager_pk
+ENCODER_MAP_ENABLE = yes
From 48dc8122e71abd76763109e02295d29644a75b96 Mon Sep 17 00:00:00 2001
From: kopibeng <52724926+kopibeng@users.noreply.github.com>
Date: Thu, 27 Oct 2022 03:41:02 +0800
Subject: [PATCH 2/3] [Keyboard] Update MNK65 (#18743)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
keyboards/kopibeng/mnk65/config.h | 8 +-
keyboards/kopibeng/mnk65/info.json | 144 +++++++++---------
.../kopibeng/mnk65/keymaps/default/keymap.c | 22 ++-
keyboards/kopibeng/mnk65/keymaps/via/keymap.c | 8 +-
keyboards/kopibeng/mnk65/mnk65.h | 38 +++--
keyboards/kopibeng/mnk65/readme.md | 6 +-
6 files changed, 127 insertions(+), 99 deletions(-)
diff --git a/keyboards/kopibeng/mnk65/config.h b/keyboards/kopibeng/mnk65/config.h
index a5bc7430c8..bdabb4af7e 100644
--- a/keyboards/kopibeng/mnk65/config.h
+++ b/keyboards/kopibeng/mnk65/config.h
@@ -32,10 +32,12 @@
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
-#define MATRIX_ROW_PINS { F0, F1, F4, B7, B3 }
-#define MATRIX_COL_PINS { D0, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 }
-#define LED_CAPS_LOCK_PIN D1
+#define MATRIX_ROW_PINS { B3, D0, F6, F4, F1 }
+#define MATRIX_COL_PINS { B7, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, F5 }
+#define UNUSED_PINS
+
+#define LED_CAPS_LOCK_PIN F0
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kopibeng/mnk65/info.json b/keyboards/kopibeng/mnk65/info.json
index 90266e2438..63db590dd3 100644
--- a/keyboards/kopibeng/mnk65/info.json
+++ b/keyboards/kopibeng/mnk65/info.json
@@ -1,89 +1,91 @@
{
"keyboard_name": "MNK65",
"manufacturer": "kopibeng",
- "url": "https://monokei.co/",
"maintainer": "kopibeng",
+ "url": "https://monokei.co/",
"usb": {
"vid": "0x4B50",
"pid": "0x0651",
- "device_version": "0.0.1"
+ "device_version": "1.0.0"
},
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "0,0", "x": 0, "y": 0 },
- { "label": "0,1", "x": 1, "y": 0 },
- { "label": "0,2", "x": 2, "y": 0 },
- { "label": "0,3", "x": 3, "y": 0 },
- { "label": "0,4", "x": 4, "y": 0 },
- { "label": "0,5", "x": 5, "y": 0 },
- { "label": "0,6", "x": 6, "y": 0 },
- { "label": "0,7", "x": 7, "y": 0 },
- { "label": "0,8", "x": 8, "y": 0 },
- { "label": "0,9", "x": 9, "y": 0 },
- { "label": "0,10", "x": 10, "y": 0 },
- { "label": "0,11", "x": 11, "y": 0 },
- { "label": "0,12", "x": 12, "y": 0 },
- { "label": "1,13", "x": 13, "y": 0 },
- { "label": "0,13", "x": 14, "y": 0 },
- { "label": "0,14", "x": 15, "y": 0 },
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [0, 6], "x": 6, "y": 0 },
+ { "matrix": [0, 7], "x": 7, "y": 0 },
+ { "matrix": [0, 8], "x": 8, "y": 0 },
+ { "matrix": [0, 9], "x": 9, "y": 0 },
+ { "matrix": [0, 10], "x": 10, "y": 0 },
+ { "matrix": [0, 11], "x": 11, "y": 0 },
+ { "matrix": [0, 12], "x": 12, "y": 0 },
+ { "matrix": [1, 13], "x": 13, "y": 0 },
+ { "matrix": [0, 13], "x": 14, "y": 0 },
+ { "matrix": [0, 14], "x": 15, "y": 0 },
- { "label": "1,0", "w": 1.5, "x": 0, "y": 1 },
- { "label": "1,1", "x": 1.5, "y": 1 },
- { "label": "1,2", "x": 2.5, "y": 1 },
- { "label": "1,3", "x": 3.5, "y": 1 },
- { "label": "1,4", "x": 4.5, "y": 1 },
- { "label": "1,5", "x": 5.5, "y": 1 },
- { "label": "1,6", "x": 6.5, "y": 1 },
- { "label": "1,7", "x": 7.5, "y": 1 },
- { "label": "1,8", "x": 8.5, "y": 1 },
- { "label": "1,9", "x": 9.5, "y": 1 },
- { "label": "1,10", "x": 10.5, "y": 1 },
- { "label": "1,11", "x": 11.5, "y": 1 },
- { "label": "2,12", "x": 12.5, "y": 1 },
- { "label": "1,12", "w": 1.5, "x": 13.5, "y": 1 },
- { "label": "1,14", "x": 15, "y": 1 },
+ { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "matrix": [2, 12], "x": 12.5, "y": 1 },
+ { "matrix": [1, 12], "w": 1.5, "x": 13.5, "y": 1 },
+ { "matrix": [1, 14], "x": 15, "y": 1 },
- { "label": "2,0", "w": 1.75, "x": 0, "y": 2 },
- { "label": "2,1", "x": 1.75, "y": 2 },
- { "label": "2,2", "x": 2.75, "y": 2 },
- { "label": "2,3", "x": 3.75, "y": 2 },
- { "label": "2,4", "x": 4.75, "y": 2 },
- { "label": "2,5", "x": 5.75, "y": 2 },
- { "label": "2,6", "x": 6.75, "y": 2 },
- { "label": "2,7", "x": 7.75, "y": 2 },
- { "label": "2,8", "x": 8.75, "y": 2 },
- { "label": "2,9", "x": 9.75, "y": 2 },
- { "label": "2,10", "x": 10.75, "y": 2 },
- { "label": "2,11", "x": 11.75, "y": 2 },
- { "label": "2,13", "w": 2.25, "x": 12.75, "y": 2 },
- { "label": "2,14", "x": 15, "y": 2 },
+ { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "matrix": [2, 11], "x": 11.75, "y": 2 },
+ { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+ { "matrix": [2, 14], "x": 15, "y": 2 },
- { "label": "3,0", "w": 1.25, "x": 0, "y": 3 },
- { "label": "3,1", "x": 1.25, "y": 3 },
- { "label": "3,2", "x": 2.25, "y": 3 },
- { "label": "3,3", "x": 3.25, "y": 3 },
- { "label": "3,4", "x": 4.25, "y": 3 },
- { "label": "3,5", "x": 5.25, "y": 3 },
- { "label": "3,6", "x": 6.25, "y": 3 },
- { "label": "3,7", "x": 7.25, "y": 3 },
- { "label": "3,8", "x": 8.25, "y": 3 },
- { "label": "3,9", "x": 9.25, "y": 3 },
- { "label": "3,10", "x": 10.25, "y": 3 },
- { "label": "3,11", "x": 11.25, "y": 3 },
- { "label": "3,12", "w": 1.75, "x": 12.25, "y": 3 },
- { "label": "3,13", "x": 14, "y": 3 },
- { "label": "3,14", "x": 15, "y": 3 },
+ { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "matrix": [3, 1], "x": 1.25, "y": 3 },
+ { "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+ { "matrix": [3, 13], "x": 14, "y": 3 },
+ { "matrix": [3, 14], "x": 15, "y": 3 },
- { "label": "4,0", "w": 1.25, "x": 0, "y": 4 },
- { "label": "4,1", "w": 1.25, "x": 1.25, "y": 4 },
- { "label": "4,2", "w": 1.25, "x": 2.5, "y": 4 },
- { "label": "4,6", "w": 6.25, "x": 3.75, "y": 4 },
- { "label": "4,10", "w": 1.25, "x": 10, "y": 4 },
- { "label": "4,11", "w": 1.25, "x": 11.25, "y": 4 },
- { "label": "4,12", "x": 13, "y": 4 },
- { "label": "4,13", "x": 14, "y": 4 },
- { "label": "4,14", "x": 15, "y": 4 }
+ { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+ { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+ { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+ { "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+ { "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+ { "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+ { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+ { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+ { "matrix": [4, 12], "x": 13, "y": 4 },
+ { "matrix": [4, 13], "x": 14, "y": 4 },
+ { "matrix": [4, 14], "x": 15, "y": 4 }
]
}
}
diff --git a/keyboards/kopibeng/mnk65/keymaps/default/keymap.c b/keyboards/kopibeng/mnk65/keymaps/default/keymap.c
index 75221584d8..809502ad80 100644
--- a/keyboards/kopibeng/mnk65/keymaps/default/keymap.c
+++ b/keyboards/kopibeng/mnk65/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
// Fn1 Layer
@@ -33,7 +33,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+ // Fn2 Layer
+ [2] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+ // Fn3 Layer
+ [3] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
};
diff --git a/keyboards/kopibeng/mnk65/keymaps/via/keymap.c b/keyboards/kopibeng/mnk65/keymaps/via/keymap.c
index 3f8d0f5f27..809502ad80 100644
--- a/keyboards/kopibeng/mnk65/keymaps/via/keymap.c
+++ b/keyboards/kopibeng/mnk65/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
// Fn1 Layer
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
// Fn2 Layer
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
// Fn3 Layer
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
};
diff --git a/keyboards/kopibeng/mnk65/mnk65.h b/keyboards/kopibeng/mnk65/mnk65.h
index 60a92f1a65..7e1483ba9e 100644
--- a/keyboards/kopibeng/mnk65/mnk65.h
+++ b/keyboards/kopibeng/mnk65/mnk65.h
@@ -23,33 +23,39 @@
/*
*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │1D │0D │0E │ │0D │ Full Backspace
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │010│011│012│113│013│014│ │013 │ Full Backspace
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │2C │1C │1E │ │2D │
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │110│111│212│112 │114│ │213 │
* 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌─┴─┐ │ ISO
- * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2E │ │1C │ │
+ * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │210│211│213 │214│ │112│ │
* ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴───┘
- * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
+ * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │310│311│312 │313│314│
* └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40 │41 │42 │46 │4A │4B │ │4C │4D │4E │
+ * │40 │41 │42 │46 │410 │411 │ │412│413│414│
* └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ * ┌────┬────┬────┬────────┬────┬──────────┬────┬────┐
+ * │40 │41 │42 │44 │46 │48 │410 │411 │ 2.25u-1.25u-2.75u Split
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┘
+ * ┌────┬────┬────┬──────────┬────┬────────┬────┬────┐
+ * │40 │41 │42 │44 │46 │48 │410 │411 │ 2.75u-1.25u-2.25u Split
+ * └────┴────┴────┴──────────┴────┴────────┴────┴────┘
* ┌─────┬───┬─────┬───────────────────────────┬─────┐
- * │40 │41 │42 │46 │4B │ 7u Tsangan
+ * │40 │41 │42 │46 │411 │ 7u Tsangan
* └─────┴───┴─────┴───────────────────────────┴─────┘
*
*/
// LAYOUT_all:
#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K2C, K1C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K113, K013, K014, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K212, K112, K114, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K213, K214, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313, K314, \
+ K40, K41, K42, K44, K46, K48, K410, K411, K412, K413, K414 \
) { \
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \
- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E}, \
- {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E}, \
- {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E} \
+ {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014}, \
+ {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113, K114}, \
+ {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213, K214}, \
+ {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313, K314}, \
+ {K40, K41, K42, ___, K44, ___, K46, ___, K48, ___, K410, K411, K412, K413, K414} \
}
diff --git a/keyboards/kopibeng/mnk65/readme.md b/keyboards/kopibeng/mnk65/readme.md
index f4c07ce6a8..e3eefb6d67 100644
--- a/keyboards/kopibeng/mnk65/readme.md
+++ b/keyboards/kopibeng/mnk65/readme.md
@@ -1,11 +1,11 @@
# MNK65
-
+
-A QMK-powered, VIA-enabled 65% PCB with support for ANSI/ISO layouts, split Backspace and 6.25U/7U bottom row.
+A QMK-powered, VIA-enabled 65% PCB with support for ANSI/ISO layouts, split Backspace and various bottom row layout configurations.
* Keyboard Maintainer: kopibeng
-* Hardware Supported: MONOKEI - Hiro
+* Hardware Supported: MONOKEI
* Hardware Availability: https://monokei.co/
Make example for this keyboard (after setting up your build environment):
From 8ea8a4edcb2e33df93bdcfae08b4aeef05d995c6 Mon Sep 17 00:00:00 2001
From: Terlekchi Seityagiya <seityaya@ukr.net>
Date: Wed, 26 Oct 2022 22:41:30 +0300
Subject: [PATCH 3/3] [Keyboard] Kepler 33 (#18771)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
keyboards/kepler_33/proto/info.json | 85 +++++++++++++++++++
.../kepler_33/proto/keymaps/default/keymap.c | 30 +++++++
keyboards/kepler_33/proto/readme.md | 3 +
keyboards/kepler_33/proto/rules.mk | 0
keyboards/kepler_33/readme.md | 26 ++++++
5 files changed, 144 insertions(+)
create mode 100644 keyboards/kepler_33/proto/info.json
create mode 100644 keyboards/kepler_33/proto/keymaps/default/keymap.c
create mode 100644 keyboards/kepler_33/proto/readme.md
create mode 100644 keyboards/kepler_33/proto/rules.mk
create mode 100644 keyboards/kepler_33/readme.md
diff --git a/keyboards/kepler_33/proto/info.json b/keyboards/kepler_33/proto/info.json
new file mode 100644
index 0000000000..bcf8405ecd
--- /dev/null
+++ b/keyboards/kepler_33/proto/info.json
@@ -0,0 +1,85 @@
+{
+ "manufacturer": "Yaya-alone-Team",
+ "keyboard_name": "Kepler-33",
+ "maintainer": "Seityaya",
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+
+ "processor": "STM32F401",
+ "board": "BLACKPILL_STM32_F401",
+ "url": "https://github.com/seityaya/Kepler-33",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0000",
+ "vid": "0xFEED"
+ },
+ "diode_direction": "ROW2COL",
+ "matrix_pins": {
+ "rows": ["B12", "B13", "B14", "B15"],
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B6", "B10", "B9", "B8", "B7"]
+ },
+ "layouts": {
+ "LAYOUT_proto": {
+ "layout": [
+ {"matrix": [0, 0], "label":"Esc", "x":0, "y":0},
+ {"matrix": [0, 1], "label":"Q", "x":1, "y":0},
+ {"matrix": [0, 2], "label":"W", "x":2, "y":0},
+ {"matrix": [0, 3], "label":"E", "x":3, "y":0},
+ {"matrix": [0, 4], "label":"R", "x":4, "y":0},
+ {"matrix": [0, 5], "label":"T", "x":5, "y":0},
+ {"matrix": [0, 6], "label":"Y", "x":6, "y":0},
+ {"matrix": [0, 8], "label":"U", "x":7, "y":0},
+ {"matrix": [0, 9], "label":"I", "x":8, "y":0},
+ {"matrix": [0, 10], "label":"O", "x":9, "y":0},
+ {"matrix": [0, 11], "label":"P", "x":10, "y":0},
+ {"matrix": [0, 12], "label":"[{", "x":11, "y":0},
+ {"matrix": [0, 13], "label":"]}", "x":12, "y":0},
+ {"matrix": [0, 14], "label":"Del", "x":13, "y":0},
+
+ {"matrix": [1, 0], "label":"Layer", "x":0.25, "y":1},
+ {"matrix": [1, 1], "label":"A", "x":1.5, "y":1},
+ {"matrix": [1, 2], "label":"S", "x":2.5, "y":1},
+ {"matrix": [1, 3], "label":"D", "x":3.5, "y":1},
+ {"matrix": [1, 4], "label":"F", "x":4.5, "y":1},
+ {"matrix": [1, 5], "label":"G", "x":5.5, "y":1},
+ {"matrix": [1, 7], "label":"H", "x":6.5, "y":1},
+ {"matrix": [1, 9], "label":"J", "x":7.5, "y":1},
+ {"matrix": [1, 10], "label":"K", "x":8.5, "y":1},
+ {"matrix": [1, 11], "label":"L", "x":9.5, "y":1},
+ {"matrix": [1, 12], "label":";:", "x":10.5, "y":1},
+ {"matrix": [1, 13], "label":"'\"", "x":11.5, "y":1},
+ {"matrix": [1, 14], "label":"Enter", "x":12.75, "y":1},
+
+ {"matrix": [2, 0], "label":"Shift_L", "x":0.5, "y":2},
+ {"matrix": [2, 1], "label":"Z", "x":2, "y":2},
+ {"matrix": [2, 2], "label":"X", "x":3, "y":2},
+ {"matrix": [2, 3], "label":"C", "x":4, "y":2},
+ {"matrix": [2, 4], "label":"V", "x":5, "y":2},
+ {"matrix": [2, 6], "label":"B", "x":6, "y":2},
+ {"matrix": [2, 8], "label":"N", "x":7, "y":2},
+ {"matrix": [2, 10], "label":"M", "x":8, "y":2},
+ {"matrix": [2, 11], "label":",<", "x":9, "y":2},
+ {"matrix": [2, 12], "label":".>", "x":10, "y":2},
+ {"matrix": [2, 13], "label":"/?", "x":11, "y":2},
+ {"matrix": [2, 14], "label":"BackS", "x":12.5, "y":2},
+
+ {"matrix": [3, 0], "label":"Ctrl_L", "x":0, "y":3},
+ {"matrix": [3, 1], "label":"FN_L", "x":1.25, "y":3},
+ {"matrix": [3, 2], "label":"Alt_L", "x":2.5, "y":3},
+ {"matrix": [3, 4], "label":"Space", "x":5, "y":3},
+ {"matrix": [3, 7], "label":"Space", "x":6.5, "y":3},
+ {"matrix": [3, 10], "label":"Menu", "x":8, "y":3},
+ {"matrix": [3, 12], "label":"Alt_R", "x":10.5, "y":3},
+ {"matrix": [3, 13], "label":"FN_R", "x":11.75, "y":3},
+ {"matrix": [3, 14], "label":"Ctrl_R", "x":13, "y":3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kepler_33/proto/keymaps/default/keymap.c b/keyboards/kepler_33/proto/keymaps/default/keymap.c
new file mode 100644
index 0000000000..13eec6661d
--- /dev/null
+++ b/keyboards/kepler_33/proto/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2022 Seityaya <seityaya@ukr.net>
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_proto(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL,
+ MO(15), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSPC,
+ KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_SPC, KC_APP, KC_RALT, MO(2), KC_RCTL
+ )
+};
diff --git a/keyboards/kepler_33/proto/readme.md b/keyboards/kepler_33/proto/readme.md
new file mode 100644
index 0000000000..ad1918ee1d
--- /dev/null
+++ b/keyboards/kepler_33/proto/readme.md
@@ -0,0 +1,3 @@
+# Kepler-33 / proto
+
+True 40% keyboard. So far only a prototype.
\ No newline at end of file
diff --git a/keyboards/kepler_33/proto/rules.mk b/keyboards/kepler_33/proto/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/kepler_33/readme.md b/keyboards/kepler_33/readme.md
new file mode 100644
index 0000000000..edafb26c42
--- /dev/null
+++ b/keyboards/kepler_33/readme.md
@@ -0,0 +1,26 @@
+# Kepler-33
+
+
+
+True 40% keyboard. The simple and symmetric.
+
+* Keyboard Maintainer: [Yaya](https://github.com/seityaya)
+* Hardware Supported: Kepler-33/proto, STM32F401
+* Hardware Availability: *[Telegram](https://t.me/seityaya)*
+* Keyboard Layout Editor: [Kepler-33](http://www.keyboard-layout-editor.com/#/gists/a456c2256174a2cfa0b4aea832e78d8e)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make kepler_33/proto:default
+
+Flashing example for this keyboard:
+
+ make kepler_33/proto:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 1 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
\ No newline at end of file