diff options
| author | Zach White <skullydazed@gmail.com> | 2021-07-14 10:30:28 -0700 |
|---|---|---|
| committer | Zach White <skullydazed@gmail.com> | 2021-07-14 10:30:28 -0700 |
| commit | 44d322623eb875f6eb2e0a317c76af2d47f7a9dc (patch) | |
| tree | ab722bcc4cea4e4ed16f0a5dce0602fe1f2c63e5 /keyboards/montex | |
| parent | 52cfc9259b58a3a11a244fbe35c49c7dd1a9cae0 (diff) | |
| parent | ffdfe3798bc7bd374991abe8f10494f2e73aedd5 (diff) | |
| download | qmk_firmware-44d322623eb875f6eb2e0a317c76af2d47f7a9dc.tar.gz qmk_firmware-44d322623eb875f6eb2e0a317c76af2d47f7a9dc.zip | |
Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
keyboards/checkerboards/nop60/info.json
Diffstat (limited to 'keyboards/montex')
| -rw-r--r-- | keyboards/montex/config.h | 2 | ||||
| -rw-r--r-- | keyboards/montex/keymaps/via/keymap.c | 52 | ||||
| -rw-r--r-- | keyboards/montex/keymaps/via/rules.mk | 2 |
3 files changed, 55 insertions, 1 deletions
diff --git a/keyboards/montex/config.h b/keyboards/montex/config.h index bad7b355fc..2321ce364e 100644 --- a/keyboards/montex/config.h +++ b/keyboards/montex/config.h @@ -19,7 +19,7 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED +#define VENDOR_ID 0x6964 #define PRODUCT_ID 0x6060 #define DEVICE_VER 0x0001 #define MANUFACTURER Idobao diff --git a/keyboards/montex/keymaps/via/keymap.c b/keyboards/montex/keymaps/via/keymap.c new file mode 100644 index 0000000000..eb7875dc32 --- /dev/null +++ b/keyboards/montex/keymaps/via/keymap.c @@ -0,0 +1,52 @@ +/* Copyright 2021 Tybera +* +* 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_numpad_6x5( + KC_GRAVE, KC_ESC, KC_TAB, MO(1), KC_BSPC, + KC_COMMA, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_LGUI, KC_P7, KC_P8, KC_P9, + KC_LALT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSHIFT, KC_P1, KC_P2, KC_P3, + KC_LCTRL, KC_P0, KC_PDOT, KC_PENT + ), + [1] = LAYOUT_numpad_6x5( + RESET, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, KC_HOME, KC_UP, KC_PGUP, + _______, KC_LEFT, XXXXXXX, KC_RGHT, _______, + _______, KC_END, KC_DOWN, KC_PGDN, + _______, KC_INS, KC_DEL, _______ + ), + [2] = LAYOUT_numpad_6x5( + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ), + [3] = LAYOUT_numpad_6x5( + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ) +}; diff --git a/keyboards/montex/keymaps/via/rules.mk b/keyboards/montex/keymaps/via/rules.mk new file mode 100644 index 0000000000..ca9fed0e6b --- /dev/null +++ b/keyboards/montex/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +LTO_ENABLE = yes +VIA_ENABLE = yes |