From 06a7a1c205f43c0c4c435d48de5ab3893398b19d Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Thu, 13 Oct 2022 17:07:07 -0600 Subject: [PATCH] Fixup momoka_ergo (#18704) --- keyboards/momoka_ergo/config.h | 68 ++----------------- .../momoka_ergo/keymaps/default/readme.md | 1 - keyboards/momoka_ergo/keymaps/via/keymap.c | 2 +- keyboards/momoka_ergo/keymaps/via/readme.md | 1 - 4 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 keyboards/momoka_ergo/keymaps/default/readme.md delete mode 100644 keyboards/momoka_ergo/keymaps/via/readme.md diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h index e4805812205..ccbbfe1cd8b 100644 --- a/keyboards/momoka_ergo/config.h +++ b/keyboards/momoka_ergo/config.h @@ -23,30 +23,26 @@ along with this program. If not, see . #define MATRIX_ROWS 14 #define MATRIX_COLS 6 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7 } #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0 } /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW #define SELECT_SOFT_SERIAL_SPEED 5 + /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. */ #define SOFT_SERIAL_PIN D1 // or D1, D2, D3, E6 #define RGB_DI_PIN C7 -#define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 22 +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_SPLIT { 11, 11 } #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -55,60 +51,10 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 3 -/* 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 - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT - -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 - -#define USE_SERIAL #define SPLIT_USB_DETECT #define EE_HANDS diff --git a/keyboards/momoka_ergo/keymaps/default/readme.md b/keyboards/momoka_ergo/keymaps/default/readme.md deleted file mode 100644 index 390149d6bb3..00000000000 --- a/keyboards/momoka_ergo/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for momoka_ergo diff --git a/keyboards/momoka_ergo/keymaps/via/keymap.c b/keyboards/momoka_ergo/keymaps/via/keymap.c index 707a2f1f496..34b363841e8 100644 --- a/keyboards/momoka_ergo/keymaps/via/keymap.c +++ b/keyboards/momoka_ergo/keymaps/via/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_ENT, KC_SPC ), [_FN1] = LAYOUT( - RESET, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, MO(_FN2), diff --git a/keyboards/momoka_ergo/keymaps/via/readme.md b/keyboards/momoka_ergo/keymaps/via/readme.md deleted file mode 100644 index 390149d6bb3..00000000000 --- a/keyboards/momoka_ergo/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for momoka_ergo