From 84569788d59ab01f0dec22aed53450bdfae5230e Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 27 Oct 2022 09:52:21 -0700 Subject: MelGeek MJ6XY Refactor (#18862) * mj6xy.h: convert tabs to spaces * info.json: convert tabs to spaces * info.json: apply friendly formatting Whitespace-only change. * rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan - rename `60_ansi_7u_spc` keymap to `default_ansi_tsangan` * add K31 position to LAYOUT_60_iso * rename LAYOUT_60_iso_7u_spc_split_rshift to LAYOUT_60_iso_tsangan_split_rshift - rename `60_iso_7u_spc_split_rshift` keymap to `default_iso_tsangan_split_rshift` * add K31 position to LAYOUT_60_iso_arrow * add K31 position to LAYOUT_60_iso_arrow_6u_spc * add K31 position to LAYOUT_60_iso_arrow_3u_spc * refactor LAYOUT_60_iso_7u_spc into LAYOUT_60_iso_tsangan - add K31 position to layout macro - rename `60_iso_7u_spc` keymap to `default_iso_tsangan` * add K31 position to LAYOUT_64_iso - rename `64_iso` keymap to `default_64_iso` * add K31 position to LAYOUT_64_iso_3u_spc - rename `64_iso_3u_spc` keymap to `default_64_iso_3u_spc` * add K31 position to LAYOUT_64_iso_split_3u_spc - rename `64_iso_split_3u_spc` keymap to `default_64_iso_split_3u_spc` * remove LAYOUT_60_iso_1u_lshift_split_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_split_rshift`. * remove LAYOUT_60_iso_1u_lshift_7u_spc_split_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_tsangan_split_rshift`. * rename LAYOUT_60_ansi_7u_spc_split_bs to LAYOUT_60_ansi_tsangan_split_bs - rename `60_ansi_7u_spc_split_bs` keymap to `default_60_ansi_tsangan_split_bs` * add K31 position to LAYOUT_60_iso_split_bs * rename LAYOUT_60_iso_7u_spc_split_bs_rshift to LAYOUT_60_iso_tsangan_split_bs_rshift - rename `60_iso_7u_spc_split_bs_rshift` keymap to `default_60_iso_tsangan_split_bs_rshift` * add K31 position to LAYOUT_60_iso_arrow_split_bs * add K31 position to LAYOUT_60_iso_arrow_3u_spc_split_bs - rename `60_iso_arrow_3u_spc_split_bs` keymap to `default_60_iso_arrow_3u_spc_split_bs` * add K31 position to LAYOUT_60_iso_arrow_split_bs_3u_spc - rename `60_iso_arrow_split_bs_3u_spc` keymap to `default_60_iso_arrow_split_bs_3u_spc` * refactor LAYOUT_60_iso_7u_spc_split_bs into LAYOUT_60_iso_tsangan_split_bs - add K31 position to layout macro - rename `60_iso_7u_spc_split_bs` keymap to `default_60_iso_tsangan_split_bs` * add K31 position to LAYOUT_64_iso_split_bs - rename `64_iso_split_bs` keymap to `default_64_iso_split_bs` * add K31 position to LAYOUT_64_iso_3u_spc_split_bs rename `64_iso_3u_spc_split_bs` keymap to `default_64_iso_3u_spc_split_bs` * add K31 position to LAYOUT_64_iso_split_bs_3u_spc - rename `64_iso_split_bs_3u_spc` keymap to `default_64_iso_split_bs_3u_spc` * remove LAYOUT_60_ansi_arrow_6u_spc macro and keymap Functionally identical to `LAYOUT_60_ansi_arrow`. * remove LAYOUT_64_ansi_6u_spc macro and keymap Functionally identical to `LAYOUT_64_ansi`. * remove LAYOUT_60_iso_arrow_6u_spc macro and keymap Functionally identical to `LAYOUT_60_iso_arrow`. * remove LAYOUT_64_iso_6u_spc macro and keymap Functionally identical to `LAYOUT_64_iso`. * remove LAYOUT_60_ansi_arrow_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_60_ansi_arrow_split_bs`. * remove LAYOUT_64_ansi_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_64_ansi_split_bs`. * remove LAYOUT_60_iso_arrow_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_60_iso_arrow_split_bs`. * remove LAYOUT_64_iso_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_64_iso_split_bs`. * remove LAYOUT_60_iso_1u_lshift_split_bs_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_split_bs_rshift`. * remove LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_tsangan_split_bs_rshift`. * refactor keymaps - convert tabs to spaces - update keycode grid alignment * remove LAYOUT_60_ansi_arrow_3u_spc macro and keymap Subset of `LAYOUT_60_ansi_arrow_3u_spc_split_bs`. * remove LAYOUT_60_iso_arrow_3u_spc macro and keymap Subset of `LAYOUT_60_iso_arrow_3u_spc_split_bs`. * remove LAYOUT_60_iso_tsangan_split_bs macro and keymap Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`. * remove LAYOUT_60_iso_tsangan_split_rshift macro and keymap Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`. * remove LAYOUT_64_ansi_3u_spc macro and keymap Subset of `LAYOUT_64_ansi_3u_spc_split_bs`. * remove LAYOUT_64_iso_3u_spc macro and keymap Subset of `LAYOUT_64_iso_3u_spc_split_bs`. * remove LAYOUT_60_iso_split_bs macro and keymap Subset of `LAYOUT_60_iso_split_bs_rshift`. * remove LAYOUT_60_iso_split_rshift macro and keymap Subset of `LAYOUT_60_iso_split_bs_rshift`. * add LAYOUT_60_ansi_split_bs_rshift macro and keymap * remove LAYOUT_60_ansi_split_bs macro and keymap Subset of `LAYOUT_60_ansi_split_bs_rshift`. * add LAYOUT_60_tsangan_hhkb macro and keymap * remove LAYOUT_60_ansi_tsangan_split_bs macro and keymap Subset of `LAYOUT_60_tsangan_hhkb`. * standardize keymap names Rename all keymaps per QMK guidelines (e.g. keymap using `LAYOUT_60_ansi_arrow` should be named `default_60_ansi_arrow`). * add LAYOUT_all; refactor default keymap Add a `LAYOUT_all` macro, and update the `default` keymap to use the new macro. * refactor via keymap Update the `via` keymap to match the behaviour of the `default` keymap. * improve keyboard readme - fix broken image reference - improve grammar on keyboard description - fix Hardware Availability link - fix `make` instructions - add bootloader and flashing instructions * fix default_60_tsangan_hhkb keymap Fix a keycode count mismatch. * mj6xy.h: add matrix diagram * KC_GESC -> QK_GESC per fauxpark * KC_SLCK -> KC_SCRL per fauxpark --- .../melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c (limited to 'keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow') diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c deleted file mode 100755 index 1b0e576ac8..0000000000 --- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 MelGeek - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - LAYOUT_60_ansi_arrow( - 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_EQL, KC_BSPC, - 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_DEL, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT,KC_DOWN, KC_RGHT), - - LAYOUT_60_ansi_arrow( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, BL_STEP, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) -}; - -- cgit v1.2.3