From 59fa34a6fab9a3dfa281e8595bdbd08f728dacb8 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Thu, 12 May 2022 12:24:03 -0600 Subject: [PATCH] [Keyboard] Refactor mechwild/mokulua (#17068) --- .../mechwild/mokulua/{standard => }/config.h | 9 +- .../mokulua/{lib/mokulua.c => glcdfont.c} | 0 keyboards/mechwild/mokulua/info.json | 5 +- .../{standard => }/keymaps/default/keymap.c | 4 +- .../{standard => }/keymaps/default/readme.md | 0 .../{standard => }/keymaps/silly/config.h | 0 .../{standard => }/keymaps/silly/keymap.c | 0 .../{standard => }/keymaps/silly/readme.md | 0 .../keymaps/via => keymaps/silly}/rules.mk | 0 .../{standard => }/keymaps/via/keymap.c | 4 +- .../{standard => }/keymaps/via/readme.md | 0 .../keymaps/silly => keymaps/via}/rules.mk | 0 keyboards/mechwild/mokulua/mirrored/config.h | 98 ------------------- .../mokulua/mirrored/keymaps/default/keymap.c | 46 --------- .../mirrored/keymaps/default/readme.md | 1 - .../mokulua/mirrored/keymaps/via/keymap.c | 46 --------- .../mokulua/mirrored/keymaps/via/readme.md | 1 - keyboards/mechwild/mokulua/mirrored/rules.mk | 22 ----- .../{mirrored/mirrored.c => mokulua.c} | 4 +- .../{mirrored/mirrored.h => mokulua.h} | 26 +---- keyboards/mechwild/mokulua/rules.mk | 23 ++++- .../mokulua/standard/keymaps/via/rules.mk | 2 - keyboards/mechwild/mokulua/standard/rules.mk | 22 ----- .../mechwild/mokulua/standard/standard.c | 82 ---------------- .../mechwild/mokulua/standard/standard.h | 52 ---------- 25 files changed, 33 insertions(+), 414 deletions(-) rename keyboards/mechwild/mokulua/{standard => }/config.h (94%) rename keyboards/mechwild/mokulua/{lib/mokulua.c => glcdfont.c} (100%) rename keyboards/mechwild/mokulua/{standard => }/keymaps/default/keymap.c (99%) rename keyboards/mechwild/mokulua/{standard => }/keymaps/default/readme.md (100%) rename keyboards/mechwild/mokulua/{standard => }/keymaps/silly/config.h (100%) rename keyboards/mechwild/mokulua/{standard => }/keymaps/silly/keymap.c (100%) rename keyboards/mechwild/mokulua/{standard => }/keymaps/silly/readme.md (100%) rename keyboards/mechwild/mokulua/{mirrored/keymaps/via => keymaps/silly}/rules.mk (100%) rename keyboards/mechwild/mokulua/{standard => }/keymaps/via/keymap.c (99%) rename keyboards/mechwild/mokulua/{standard => }/keymaps/via/readme.md (100%) rename keyboards/mechwild/mokulua/{standard/keymaps/silly => keymaps/via}/rules.mk (100%) delete mode 100644 keyboards/mechwild/mokulua/mirrored/config.h delete mode 100644 keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c delete mode 100644 keyboards/mechwild/mokulua/mirrored/keymaps/default/readme.md delete mode 100644 keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c delete mode 100644 keyboards/mechwild/mokulua/mirrored/keymaps/via/readme.md delete mode 100644 keyboards/mechwild/mokulua/mirrored/rules.mk rename keyboards/mechwild/mokulua/{mirrored/mirrored.c => mokulua.c} (96%) rename keyboards/mechwild/mokulua/{mirrored/mirrored.h => mokulua.h} (51%) delete mode 100644 keyboards/mechwild/mokulua/standard/keymaps/via/rules.mk delete mode 100644 keyboards/mechwild/mokulua/standard/rules.mk delete mode 100644 keyboards/mechwild/mokulua/standard/standard.c delete mode 100644 keyboards/mechwild/mokulua/standard/standard.h diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/config.h similarity index 94% rename from keyboards/mechwild/mokulua/standard/config.h rename to keyboards/mechwild/mokulua/config.h index be6495048c9..a424bc6648a 100644 --- a/keyboards/mechwild/mokulua/standard/config.h +++ b/keyboards/mechwild/mokulua/config.h @@ -32,7 +32,7 @@ /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define OLED_FONT_H "keyboards/mechwild/mokulua/lib/mokulua.c" +#define OLED_FONT_H "keyboards/mechwild/mokulua/glcdfont.c" /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. @@ -79,9 +79,6 @@ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ @@ -131,5 +128,5 @@ /* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 +//#define BOOTMAGIC_LITE_ROW 0 +//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/mechwild/mokulua/lib/mokulua.c b/keyboards/mechwild/mokulua/glcdfont.c similarity index 100% rename from keyboards/mechwild/mokulua/lib/mokulua.c rename to keyboards/mechwild/mokulua/glcdfont.c diff --git a/keyboards/mechwild/mokulua/info.json b/keyboards/mechwild/mokulua/info.json index 9620a4dddae..0be62ecf80b 100644 --- a/keyboards/mechwild/mokulua/info.json +++ b/keyboards/mechwild/mokulua/info.json @@ -3,11 +3,8 @@ "url": "https://mechwild.com", "maintainer": "kylemccreery", "layouts": { - "LAYOUT_standard": { + "LAYOUT": { "layout": [{"x":0.5, "y":0}, {"x":1.5, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":0.47, "y":1, "w":1.5}, {"x":1.97, "y":1}, {"x":15.5, "y":1}, {"x":16.5, "y":1, "w":1.5}, {"x":0.37, "y":2, "w":1.75}, {"x":2.12, "y":2}, {"x":15.85, "y":2}, {"x":16.85, "y":2, "w":1.75}, {"x":0.22, "y":3, "w":1.25}, {"x":1.47, "y":3}, {"x":2.47, "y":3}, {"x":9.43, "y":3}, {"x":15.5, "y":3}, {"x":16.5, "y":3}, {"x":17.5, "y":3, "w":1.25}, {"x":0.47, "y":4}, {"x":1.47, "y":4}, {"x":2.47, "y":4}, {"x":9.68, "y":4}, {"x":15.5, "y":4}, {"x":16.5, "y":4}, {"x":17.5, "y":4}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":0.5, "y":2.25}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":0.75, "y":3.25}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.57, "y":4.25}, {"x":1, "y":5.25, "w":1.25}, {"x":2.25, "y":5.25, "w":1.5}, {"x":3.75, "y":5.25, "w":1.5}, {"x":5.32, "y":5.25}, {"x":-1.5, "y":2}, {"x":-0.5, "y":2}, {"x":0.5, "y":2}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":-1.0, "y":3}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":-1.75, "y":4}, {"x":-0.75, "y":4}, {"x":0.25, "y":4}, {"x":1.25, "y":4}, {"x":2.25, "y":4}, {"x":-1.25, "y":5}, {"x":-0.25, "y":5}, {"x":0.75, "y":5}, {"x":1.75, "y":5}, {"x":-1.25, "y":6, "w":1.5}, {"x":0.25, "y":6, "w":1.5}, {"x":1.75, "y":6, "w":1.25}] - }, - "LAYOUT_mirrored": { - "layout": [{"x":0.5, "y":0}, {"x":1.5, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0.47, "y":1, "w":1.5}, {"x":1.97, "y":1}, {"x":15.78, "y":1}, {"x":16.78, "y":1, "w":1.5}, {"x":0.37, "y":2, "w":1.75}, {"x":2.12, "y":2}, {"x":15.63, "y":2}, {"x":16.63, "y":2, "w":1.75}, {"x":0.22, "y":3, "w":1.25}, {"x":1.47, "y":3}, {"x":2.47, "y":3}, {"x":9.43, "y":3}, {"x":15.28, "y":3}, {"x":16.28, "y":3}, {"x":17.28, "y":3, "w":1.25}, {"x":0.47, "y":4}, {"x":1.47, "y":4}, {"x":2.47, "y":4}, {"x":9.68, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}, {"x":17.25, "y":4}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":0.5, "y":2.25}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":0.75, "y":3.25}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.57, "y":4.25}, {"x":1, "y":5.25, "w":1.25}, {"x":2.25, "y":5.25, "w":1.5}, {"x":3.75, "y":5.25, "w":1.5}, {"x":5.32, "y":5.25}, {"x":-1.0, "y":2}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":-1.5, "y":3}, {"x":-0.5, "y":3}, {"x":0.5, "y":3}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":-1.75, "y":4}, {"x":-0.75, "y":4}, {"x":0.25, "y":4}, {"x":1.25, "y":4}, {"x":2.25, "y":4}, {"x":-1.25, "y":5}, {"x":-0.25, "y":5}, {"x":0.75, "y":5}, {"x":1.75, "y":5}, {"x":-1.25, "y":6, "w":1.5}, {"x":0.25, "y":6, "w":1.5}, {"x":1.75, "y":6, "w":1.25}] } } } diff --git a/keyboards/mechwild/mokulua/standard/keymaps/default/keymap.c b/keyboards/mechwild/mokulua/keymaps/default/keymap.c similarity index 99% rename from keyboards/mechwild/mokulua/standard/keymaps/default/keymap.c rename to keyboards/mechwild/mokulua/keymaps/default/keymap.c index 724dfee41c7..69a16d090f5 100644 --- a/keyboards/mechwild/mokulua/standard/keymaps/default/keymap.c +++ b/keyboards/mechwild/mokulua/keymaps/default/keymap.c @@ -10,8 +10,8 @@ enum layer_names { _BASE, _FN1, - _FN2, - _FN3 + _FN2, + _FN3 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/mechwild/mokulua/standard/keymaps/default/readme.md b/keyboards/mechwild/mokulua/keymaps/default/readme.md similarity index 100% rename from keyboards/mechwild/mokulua/standard/keymaps/default/readme.md rename to keyboards/mechwild/mokulua/keymaps/default/readme.md diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/config.h b/keyboards/mechwild/mokulua/keymaps/silly/config.h similarity index 100% rename from keyboards/mechwild/mokulua/standard/keymaps/silly/config.h rename to keyboards/mechwild/mokulua/keymaps/silly/config.h diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c b/keyboards/mechwild/mokulua/keymaps/silly/keymap.c similarity index 100% rename from keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c rename to keyboards/mechwild/mokulua/keymaps/silly/keymap.c diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/readme.md b/keyboards/mechwild/mokulua/keymaps/silly/readme.md similarity index 100% rename from keyboards/mechwild/mokulua/standard/keymaps/silly/readme.md rename to keyboards/mechwild/mokulua/keymaps/silly/readme.md diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/via/rules.mk b/keyboards/mechwild/mokulua/keymaps/silly/rules.mk similarity index 100% rename from keyboards/mechwild/mokulua/mirrored/keymaps/via/rules.mk rename to keyboards/mechwild/mokulua/keymaps/silly/rules.mk diff --git a/keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c b/keyboards/mechwild/mokulua/keymaps/via/keymap.c similarity index 99% rename from keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c rename to keyboards/mechwild/mokulua/keymaps/via/keymap.c index 724dfee41c7..69a16d090f5 100644 --- a/keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c +++ b/keyboards/mechwild/mokulua/keymaps/via/keymap.c @@ -10,8 +10,8 @@ enum layer_names { _BASE, _FN1, - _FN2, - _FN3 + _FN2, + _FN3 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/mechwild/mokulua/standard/keymaps/via/readme.md b/keyboards/mechwild/mokulua/keymaps/via/readme.md similarity index 100% rename from keyboards/mechwild/mokulua/standard/keymaps/via/readme.md rename to keyboards/mechwild/mokulua/keymaps/via/readme.md diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/rules.mk b/keyboards/mechwild/mokulua/keymaps/via/rules.mk similarity index 100% rename from keyboards/mechwild/mokulua/standard/keymaps/silly/rules.mk rename to keyboards/mechwild/mokulua/keymaps/via/rules.mk diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h deleted file mode 100644 index d5887c7ff5d..00000000000 --- a/keyboards/mechwild/mokulua/mirrored/config.h +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright 2022 Kyle McCreery (@kylemccreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6D77 // mw = "MechWild" -#define PRODUCT_ID 0x170C -#define DEVICE_VER 0x0103 -#define MANUFACTURER MechWild -#define PRODUCT Mokulua - -/* Key matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 6 - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define UNUSED_PINS - -/* Encoder pins */ -#define ENCODERS_PAD_A { D2 } -#define ENCODERS_PAD_B { B2 } - -/* Encoder resolution */ -#define ENCODER_RESOLUTION 4 -#define TAP_CODE_DELAY 10 - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define OLED_FONT_H "keyboards/mechwild/mokulua/lib/mokulua.c" - -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -#define SOFT_SERIAL_PIN D3 -#define MASTER_LEFT -//#define MASTER_RIGHT -#define RGBLIGHT_SPLIT -#define RGBLED_SPLIT { 8, 8 } -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_MODS_ENABLE -#define SPLIT_OLED_ENABLE - -/* RGB options */ -#define RGB_DI_PIN B6 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 16 -# 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 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* 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 - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is useful for the Windows task manager shortcut (ctrl+shift+esc). - */ -//#define GRAVE_ESC_CTRL_OVERRIDE - - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c b/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c deleted file mode 100644 index 330c9320a02..00000000000 --- a/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2022 Kyle McCreery (@kylemccreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -#define FN1_SPC LT(1, KC_SPC) -#define FN2_SPC LT(2, KC_SPC) - -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE, - _FN1, - _FN2, - _FN3 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, _______, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRC, KC_BSLS, - MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_SCLN, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, - KC_LSFT, _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_MUTE, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, MO(2), FN1_SPC, FN2_SPC, RGB_RMOD, RGB_MOD, FN2_SPC, FN1_SPC, MO(2), KC_LEFT, KC_DOWN, KC_RGHT - ), - [_FN1] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, KC_DEL, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, KC_PGUP, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END - ), - [_FN2] = LAYOUT( - _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [_FN3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/default/readme.md b/keyboards/mechwild/mokulua/mirrored/keymaps/default/readme.md deleted file mode 100644 index 727105dcba6..00000000000 --- a/keyboards/mechwild/mokulua/mirrored/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Mokulua using a mirrored right-half diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c b/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c deleted file mode 100644 index 330c9320a02..00000000000 --- a/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2022 Kyle McCreery (@kylemccreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -#define FN1_SPC LT(1, KC_SPC) -#define FN2_SPC LT(2, KC_SPC) - -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE, - _FN1, - _FN2, - _FN3 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, _______, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRC, KC_BSLS, - MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_SCLN, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, - KC_LSFT, _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_MUTE, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, MO(2), FN1_SPC, FN2_SPC, RGB_RMOD, RGB_MOD, FN2_SPC, FN1_SPC, MO(2), KC_LEFT, KC_DOWN, KC_RGHT - ), - [_FN1] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, KC_DEL, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, KC_PGUP, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END - ), - [_FN2] = LAYOUT( - _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [_FN3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/via/readme.md b/keyboards/mechwild/mokulua/mirrored/keymaps/via/readme.md deleted file mode 100644 index 37aca6eac7e..00000000000 --- a/keyboards/mechwild/mokulua/mirrored/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Mokulua using a mirrored right-half diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk deleted file mode 100644 index 5aae5c7c769..00000000000 --- a/keyboards/mechwild/mokulua/mirrored/rules.mk +++ /dev/null @@ -1,22 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # 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 -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable encoder -OLED_ENABLE = yes # Enable OLED Screen -OLED_DRIVER = SSD1306 # Define OLED Driver -SPLIT_KEYBOARD = yes # Define split functionality \ No newline at end of file diff --git a/keyboards/mechwild/mokulua/mirrored/mirrored.c b/keyboards/mechwild/mokulua/mokulua.c similarity index 96% rename from keyboards/mechwild/mokulua/mirrored/mirrored.c rename to keyboards/mechwild/mokulua/mokulua.c index 777c146d64e..57c800ef899 100644 --- a/keyboards/mechwild/mokulua/mirrored/mirrored.c +++ b/keyboards/mechwild/mokulua/mokulua.c @@ -1,7 +1,7 @@ // Copyright 2022 Kyle McCreery (@Kyle McCreery) // SPDX-License-Identifier: GPL-2.0-or-later -#include "standard.h" +#include "mokulua.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { @@ -28,7 +28,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { #endif #ifdef OLED_ENABLE - oled_rotation_t oled_init_user(oled_rotation_t rotation) { + oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_270; // flips the display 270 degrees } diff --git a/keyboards/mechwild/mokulua/mirrored/mirrored.h b/keyboards/mechwild/mokulua/mokulua.h similarity index 51% rename from keyboards/mechwild/mokulua/mirrored/mirrored.h rename to keyboards/mechwild/mokulua/mokulua.h index 5b7dd29c251..95ea1e37093 100644 --- a/keyboards/mechwild/mokulua/mirrored/mirrored.h +++ b/keyboards/mechwild/mokulua/mokulua.h @@ -7,28 +7,7 @@ #define ___ KC_NO -#define LAYOUT_mirrored( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { L46, L36, L37, L26, L16, L06 }, \ - { R06, R05, R04, R03, R02, R01 }, \ - { R16, R15, R14, R13, R12, R11 }, \ - { R26, R25, R24, R23, R22, R21 }, \ - { R37, R36, R35, R34, R33, R32 }, \ - { R46, R45, R44, R43, R42, R41 }, \ - { R40, R31, R30, R20, R10, R00 } \ -} - -#define LAYOUT_standard( \ +#define LAYOUT( \ L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ L10, L11, L12, L13, L14, L15, L16, R11, R12, R13, R14, R15, R16, \ L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ @@ -48,6 +27,3 @@ { R41, R42, R43, R44, R45, R46 }, \ { R00, R20, R31, R30, R40, ___ } \ } - - -#define LAYOUT LAYOUT_mirrored \ No newline at end of file diff --git a/keyboards/mechwild/mokulua/rules.mk b/keyboards/mechwild/mokulua/rules.mk index 3a87a143e51..17eb654430f 100644 --- a/keyboards/mechwild/mokulua/rules.mk +++ b/keyboards/mechwild/mokulua/rules.mk @@ -1 +1,22 @@ -DEFAULT_FOLDER = mechwild/mokulua/standard \ No newline at end of file +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # 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 +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes # Enable encoder +OLED_ENABLE = yes # Enable OLED Screen +OLED_DRIVER = SSD1306 # Define OLED Driver +SPLIT_KEYBOARD = yes # Define split functionality diff --git a/keyboards/mechwild/mokulua/standard/keymaps/via/rules.mk b/keyboards/mechwild/mokulua/standard/keymaps/via/rules.mk deleted file mode 100644 index 36b7ba9cbc9..00000000000 --- a/keyboards/mechwild/mokulua/standard/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk deleted file mode 100644 index 5aae5c7c769..00000000000 --- a/keyboards/mechwild/mokulua/standard/rules.mk +++ /dev/null @@ -1,22 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # 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 -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable encoder -OLED_ENABLE = yes # Enable OLED Screen -OLED_DRIVER = SSD1306 # Define OLED Driver -SPLIT_KEYBOARD = yes # Define split functionality \ No newline at end of file diff --git a/keyboards/mechwild/mokulua/standard/standard.c b/keyboards/mechwild/mokulua/standard/standard.c deleted file mode 100644 index 777c146d64e..00000000000 --- a/keyboards/mechwild/mokulua/standard/standard.c +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright 2022 Kyle McCreery (@Kyle McCreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "standard.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - switch (index) { - case 0: - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - case 1: - if (clockwise) { - tap_code(KC_PGUP); - } else { - tap_code(KC_PGDN); - } - break; - - } - return true; -} -#endif - -#ifdef OLED_ENABLE - oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return OLED_ROTATION_270; // flips the display 270 degrees - } - - static void render_logo(void) { // Render MechWild "MW" Logo - static const char PROGMEM logo_1[] = {0x8A, 0x8B, 0x8C, 0x8D, 0x00}; - static const char PROGMEM logo_2[] = {0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0x00}; - static const char PROGMEM logo_3[] = {0xCA, 0xCB, 0xCC, 0xCD, 0x00}; - static const char PROGMEM logo_4[] = {0x20, 0x8E, 0x8F, 0x90, 0x00}; - oled_set_cursor(0,0); - oled_write_P(logo_1, false); - oled_set_cursor(0,1); - oled_write_P(logo_2, false); - oled_set_cursor(0,2); - oled_write_P(logo_3, false); - oled_set_cursor(0,3); - oled_write_P(logo_4, false); - } - bool oled_task_kb(void) { - if (!oled_task_user()) { - return false; - } - render_logo(); - oled_set_cursor(0,6); - - oled_write_ln_P(PSTR("Layer"), false); - - switch (get_highest_layer(layer_state)) { - case 0: - oled_write_ln_P(PSTR("Base"), false); - break; - case 1: - oled_write_ln_P(PSTR("FN 1"), false); - break; - case 2: - oled_write_ln_P(PSTR("FN 2"), false); - break; - case 3: - oled_write_ln_P(PSTR("FN 3"), false); - break; - default: - oled_write_ln_P(PSTR("Undef"), false); - } - oled_write_ln_P(PSTR(""), false); - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - return false; - } -#endif diff --git a/keyboards/mechwild/mokulua/standard/standard.h b/keyboards/mechwild/mokulua/standard/standard.h deleted file mode 100644 index a25fe3eff47..00000000000 --- a/keyboards/mechwild/mokulua/standard/standard.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2022 Kyle McCreery (@kylemccreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_mirrored( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { L46, L36, L37, L26, L16, L06 }, \ - { R06, R05, R04, R03, R02, R01 }, \ - { R16, R15, R14, R13, R12, R11 }, \ - { R26, R25, R24, R23, R22, R21 }, \ - { R37, R36, R35, R34, R33, R32 }, \ - { R46, R45, R44, R43, R42, R41 }, \ - { R40, R31, R30, R20, R10, R00 } \ -} - -#define LAYOUT_standard( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { L46, L36, L37, L26, L16, L06 }, \ - { R01, R02, R03, R04, R05, R06 }, \ - { R11, R12, R13, R14, R15, R16 }, \ - { R21, R22, R23, R24, R25, R26 }, \ - { R32, R33, R34, R35, R36, R37 }, \ - { R41, R42, R43, R44, R45, R46 }, \ - { R00, R20, R31, R30, R40, ___ } \ -} - -#define LAYOUT LAYOUT_standard