From 7240b6e5517269bd1f9010438119fdbac63b1ed3 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Thu, 13 Jan 2022 14:19:09 +0800 Subject: [PATCH 01/21] [Keyboard] Idobao Montex V2(RGB) --- keyboards/idobao/montex/v2/config.h | 57 +++++++++++++++++++ keyboards/idobao/montex/v2/info.json | 39 +++++++++++++ .../idobao/montex/v2/keymaps/default/keymap.c | 26 +++++++++ .../montex/v2/keymaps/default/readme.md | 1 + keyboards/idobao/montex/v2/readme.md | 27 +++++++++ keyboards/idobao/montex/v2/rules.mk | 22 +++++++ keyboards/idobao/montex/v2/v2.c | 4 ++ keyboards/idobao/montex/v2/v2.h | 27 +++++++++ 8 files changed, 203 insertions(+) create mode 100644 keyboards/idobao/montex/v2/config.h create mode 100644 keyboards/idobao/montex/v2/info.json create mode 100644 keyboards/idobao/montex/v2/keymaps/default/keymap.c create mode 100644 keyboards/idobao/montex/v2/keymaps/default/readme.md create mode 100644 keyboards/idobao/montex/v2/readme.md create mode 100644 keyboards/idobao/montex/v2/rules.mk create mode 100644 keyboards/idobao/montex/v2/v2.c create mode 100644 keyboards/idobao/montex/v2/v2.h diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h new file mode 100644 index 000000000000..3d66c37621c7 --- /dev/null +++ b/keyboards/idobao/montex/v2/config.h @@ -0,0 +1,57 @@ +// Copyright 2022 peepeetee (@peepeetee) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x6964 // "id" +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0002 +#define MANUFACTURER IDOBAO +#define PRODUCT Montex + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 5 + +/* + * 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 { D4, D6, D7, B4, B5, C6 } +#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 } + +#define DIODE_DIRECTION ROW2COL + + +#define RGB_DI_PIN B1 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 31 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #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 +#endif + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json new file mode 100644 index 000000000000..2a573defd97a --- /dev/null +++ b/keyboards/idobao/montex/v2/info.json @@ -0,0 +1,39 @@ +{ + "keyboard_name": "A201", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "K00 (D4,D5)", "x": 0, "y": 0 }, + { "label": "K01 (D4,D3)", "x": 1, "y": 0 }, + { "label": "K02 (D4,D2)", "x": 2, "y": 0 }, + { "label": "K03 (D4,D1)", "x": 3, "y": 0 }, + { "label": "K04 (D4,D0)", "x": 4, "y": 0 }, + { "label": "K10 (D6,D5)", "x": 0, "y": 1 }, + { "label": "K11 (D6,D3)", "x": 1, "y": 1 }, + { "label": "K12 (D6,D2)", "x": 2, "y": 1 }, + { "label": "K13 (D6,D1)", "x": 3, "y": 1 }, + { "label": "K14 (D6,D0)", "x": 4, "y": 1 }, + { "label": "K20 (D7,D5)", "x": 0, "y": 2 }, + { "label": "K21 (D7,D3)", "x": 1, "y": 2 }, + { "label": "K22 (D7,D2)", "x": 2, "y": 2 }, + { "label": "K23 (D7,D1)", "x": 3, "y": 2 }, + { "label": "K24 (D7,D0)", "x": 4, "y": 2, "h": 2 }, + { "label": "K30 (B4,D5)", "x": 0, "y": 3 }, + { "label": "K31 (B4,D3)", "x": 1, "y": 3 }, + { "label": "K32 (B4,D2)", "x": 2, "y": 3 }, + { "label": "K33 (B4,D1)", "x": 3, "y": 3 }, + { "label": "K40 (B5,D5)", "x": 0, "y": 4 }, + { "label": "K41 (B5,D3)", "x": 1, "y": 4 }, + { "label": "K42 (B5,D2)", "x": 2, "y": 4 }, + { "label": "K43 (B5,D1)", "x": 3, "y": 4 }, + { "label": "K53 (C6,D1)", "x": 4, "y": 4, "h": 2 }, + { "label": "K50 (C6,D5)", "x": 0, "y": 5 }, + { "label": "K51 (C6,D3)", "x": 1, "y": 5, "w": 2 }, + { "label": "K52 (C6,D2)", "x": 3, "y": 5 } + ] + } + } + ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} diff --git a/keyboards/idobao/montex/v2/keymaps/default/keymap.c b/keyboards/idobao/montex/v2/keymaps/default/keymap.c new file mode 100644 index 000000000000..d763ecff207e --- /dev/null +++ b/keyboards/idobao/montex/v2/keymaps/default/keymap.c @@ -0,0 +1,26 @@ +// Copyright 2022 peepeetee (@peepeetee) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_DLR, KC_LPRN, KC_RPRN, MO(1), KC_DEL, + KC_NLCK, KC_ESC, KC_SLSH, KC_PAST, KC_PMNS, + KC_EQL, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_TAB, KC_P4, KC_P5, KC_P6, + KC_CAPS, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_BSPC, KC_P0, KC_DOT + ), + + [1] = LAYOUT( + RESET, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______ + ), + +}; diff --git a/keyboards/idobao/montex/v2/keymaps/default/readme.md b/keyboards/idobao/montex/v2/keymaps/default/readme.md new file mode 100644 index 000000000000..e56d2e058b29 --- /dev/null +++ b/keyboards/idobao/montex/v2/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for v2 diff --git a/keyboards/idobao/montex/v2/readme.md b/keyboards/idobao/montex/v2/readme.md new file mode 100644 index 000000000000..d43420e0772f --- /dev/null +++ b/keyboards/idobao/montex/v2/readme.md @@ -0,0 +1,27 @@ +# v2 + +![v2](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make v2:default + +Flashing example for this keyboard: + + make v2: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 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/idobao/montex/v2/rules.mk b/keyboards/idobao/montex/v2/rules.mk new file mode 100644 index 000000000000..65555619235a --- /dev/null +++ b/keyboards/idobao/montex/v2/rules.mk @@ -0,0 +1,22 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# 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 = yes # Console for debug +COMMAND_ENABLE = yes # 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 +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output + +# generated by KBFirmware JSON to QMK Parser +# https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/idobao/montex/v2/v2.c b/keyboards/idobao/montex/v2/v2.c new file mode 100644 index 000000000000..c9cbfc4fed2f --- /dev/null +++ b/keyboards/idobao/montex/v2/v2.c @@ -0,0 +1,4 @@ +// Copyright 2022 peepeetee (@peepeetee) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "v2.h" diff --git a/keyboards/idobao/montex/v2/v2.h b/keyboards/idobao/montex/v2/v2.h new file mode 100644 index 000000000000..f4dfa3e00b45 --- /dev/null +++ b/keyboards/idobao/montex/v2/v2.h @@ -0,0 +1,27 @@ +// Copyright 2022 peepeetee (@peepeetee) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + +#define LAYOUT( \ + K00, K01, K02, K03, K04, \ + K10, K11, K12, K13, K14, \ + K20, K21, K22, K23, K24, \ + K30, K31, K32, K33, \ + K40, K41, K42, K43, K53, \ + K50, K51, K52 \ +) { \ + { K00, K01, K02, K03, K04 }, \ + { K10, K11, K12, K13, K14 }, \ + { K20, K21, K22, K23, K24 }, \ + { K30, K31, K32, K33, XXX }, \ + { K40, K41, K42, K43, XXX }, \ + { K50, K51, K52, K53, XXX }, \ +} + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ From 92a0e5768457c1d224f8f46ee06e7fdd881e83fd Mon Sep 17 00:00:00 2001 From: peepeetee Date: Thu, 13 Jan 2022 22:04:06 +0800 Subject: [PATCH 02/21] add RGB matrix --- keyboards/idobao/montex/v2/config.h | 72 +++++++++++++---- .../idobao/montex/v2/keymaps/default/keymap.c | 78 ++++++++++++++----- keyboards/idobao/montex/v2/rules.mk | 5 +- keyboards/idobao/montex/v2/v2.c | 33 ++++++++ keyboards/idobao/montex/v2/v2.h | 2 +- 5 files changed, 153 insertions(+), 37 deletions(-) diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h index 3d66c37621c7..0b5b5a110c2d 100644 --- a/keyboards/idobao/montex/v2/config.h +++ b/keyboards/idobao/montex/v2/config.h @@ -33,24 +33,62 @@ #define RGB_DI_PIN B1 +// The number of LEDs connected +#define DRIVER_LED_TOTAL 31 #ifdef RGB_DI_PIN - #define RGBLED_NUM 31 - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 - #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 +# define RGBLED_NUM 31 +# define RGB_MATRIX_KEYPRESSES // reacts to keypresses +#endif +#ifdef RGB_MATRIX_ENABLE +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif // generated by KBFirmware JSON to QMK Parser diff --git a/keyboards/idobao/montex/v2/keymaps/default/keymap.c b/keyboards/idobao/montex/v2/keymaps/default/keymap.c index d763ecff207e..3d85abe8cc65 100644 --- a/keyboards/idobao/montex/v2/keymaps/default/keymap.c +++ b/keyboards/idobao/montex/v2/keymaps/default/keymap.c @@ -1,26 +1,68 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later +/* Copyright 2021 NachoxMacho +* Copyright 2022 peepeetee +* +* 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( - KC_DLR, KC_LPRN, KC_RPRN, MO(1), KC_DEL, - KC_NLCK, KC_ESC, KC_SLSH, KC_PAST, KC_PMNS, - KC_EQL, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_TAB, KC_P4, KC_P5, KC_P6, - KC_CAPS, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_BSPC, KC_P0, KC_DOT + /* + * ┌───┌───┬───┬───┬───┐ + * │ ` │Esc│Tab│MO1│Bsp│ + * ├───┼───┼───┼───┼───┤ + * │ , │Num│ / │ * │ - │ + * ├───┼───┼───┼───┼───┤ + * │Gui│ 7 │ 8 │ 9 │ │ + * ├───┼───┼───┼───┤ + │ + * │Alt│ 4 │ 5 │ 6 │ │ + * ├───┼───┼───┼───┼───┤ + * │Shi│ 1 │ 2 │ 3 │ │ + * ├───┼───┴───┼───┤Ent│ + * │Ctr│ 0 │ . │ │ + * └───┴───────┴───┴───┘ + */ + [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( - RESET, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, _______, _______, _______, - _______, _______, _______, _______, + /* + * ┌───┌───┐───┬───┬───┐ + * │Rst│ ` │Tab│MO1│Bsp│ + * ├───┼───┘───┼───┼───┤ + * │ , │Num│ / │ * │ - │ + * ├───┼───┼───┼───┼───┤ + * │Gui│Hom│ ↑ │PgU│ │ + * ├───┼───┼───┼───┤ + │ + * │Alt│ ← │ │ → │ │ + * ├───┼───┼───┼───┤───┤ + * │Shi│End│ ↓ │PgD│ │ + * ├───┼───┴───┼───┤Ent│ + * │Ctr│Insert │Del│ │ + * └───┴───────┴───┘───┘ + */ + [1] = LAYOUT_numpad_6x5( + RESET, _______, TG(2), _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______ - ), - + _______, KC_HOME, KC_UP, KC_PGUP, + _______, KC_LEFT, XXXXXXX, KC_RGHT, _______, + RGB_MOD, KC_END, KC_DOWN, KC_PGDN, + RGB_TOG, KC_INS, KC_DEL, _______ + ) }; diff --git a/keyboards/idobao/montex/v2/rules.mk b/keyboards/idobao/montex/v2/rules.mk index 65555619235a..29fbe56d9744 100644 --- a/keyboards/idobao/montex/v2/rules.mk +++ b/keyboards/idobao/montex/v2/rules.mk @@ -14,9 +14,12 @@ CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # 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 +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = WS2812 +LTO_ENABLE = yes # generated by KBFirmware JSON to QMK Parser # https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/idobao/montex/v2/v2.c b/keyboards/idobao/montex/v2/v2.c index c9cbfc4fed2f..3d9636cbcb74 100644 --- a/keyboards/idobao/montex/v2/v2.c +++ b/keyboards/idobao/montex/v2/v2.c @@ -2,3 +2,36 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "v2.h" + +#ifdef RGB_MATRIX_ENABLE +led_config_t g_led_config = { { + // Key Matrix to LED Index + { 6, 5, 4, 30, 29}, //0 + { 24, 25, 26, 27, 28}, //12.8 + { 23, 22, 21, 20, 19}, //25.6 + { 15, 16, 17, 18, NO_LED}, //38.4 + { 14, 13, 12, 11, NO_LED}, //51.2 + { 7, 8, 9, 10, NO_LED} //64 +}, { + // LED Index to Physical Position + { 180, 3}, { 142, 54}, { 30, 54}, { 50, 3}, // 0 1 2 3 (underglow) + { 112, 0}, { 56, 0}, { 0, 0}, // 4 5 6 + { 0, 64}, { 84, 64}, { 168, 64}, { 210, 54}, // 7 - 10 + { 168, 51}, { 112, 51}, { 56, 51}, { 0, 51}, //11 - 14 + { 0, 38}, { 56, 38}, { 112, 38}, { 168, 38}, //15 - 18 + { 210, 30}, { 168, 26}, { 112, 26}, { 56, 26}, { 0, 26}, //19 - 23 + { 0, 13}, { 56, 13}, { 112, 13}, { 168, 13}, { 224, 13}, //24 - 28 + { 224, 0}, { 168, 0} //29 30 +}, { + // LED Index to Flag + 2, 2, 2, 2, // 0 1 2 3 (underglow) + 1, 1, 1, // 4 5 6 + 1, 4, 4, 1, // 7 - 10 + 4, 4, 4, 1, //11 - 14 + 1, 4, 4, 4, //15 - 18 + 1, 4, 4, 4, 1, //19 - 23 + 1, 1, 1, 1, 1, //24 - 28 + 1, 1 //29 30 +} }; + +#endif diff --git a/keyboards/idobao/montex/v2/v2.h b/keyboards/idobao/montex/v2/v2.h index f4dfa3e00b45..6ba5843fe97f 100644 --- a/keyboards/idobao/montex/v2/v2.h +++ b/keyboards/idobao/montex/v2/v2.h @@ -7,7 +7,7 @@ #define XXX KC_NO -#define LAYOUT( \ +#define LAYOUT_numpad_6x5( \ K00, K01, K02, K03, K04, \ K10, K11, K12, K13, K14, \ K20, K21, K22, K23, K24, \ From 17664db40f43ed2ed4b5aa56e62cf0da7ceec26c Mon Sep 17 00:00:00 2001 From: peepeetee Date: Thu, 13 Jan 2022 22:11:29 +0800 Subject: [PATCH 03/21] add VIA implementation, clean up --- .../idobao/montex/v2/keymaps/default/keymap.c | 11 +-- .../idobao/montex/v2/keymaps/via/keymap.c | 85 +++++++++++++++++++ .../idobao/montex/v2/keymaps/via/rules.mk | 1 + 3 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 keyboards/idobao/montex/v2/keymaps/via/keymap.c create mode 100644 keyboards/idobao/montex/v2/keymaps/via/rules.mk diff --git a/keyboards/idobao/montex/v2/keymaps/default/keymap.c b/keyboards/idobao/montex/v2/keymaps/default/keymap.c index 3d85abe8cc65..404b41e4cdf3 100644 --- a/keyboards/idobao/montex/v2/keymaps/default/keymap.c +++ b/keyboards/idobao/montex/v2/keymaps/default/keymap.c @@ -58,11 +58,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └───┴───────┴───┘───┘ */ [1] = LAYOUT_numpad_6x5( - RESET, _______, TG(2), _______, _______, + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_HOME, KC_UP, KC_PGUP, - _______, KC_LEFT, XXXXXXX, KC_RGHT, _______, - RGB_MOD, KC_END, KC_DOWN, KC_PGDN, - RGB_TOG, KC_INS, KC_DEL, _______ + RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, + RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ ) + }; diff --git a/keyboards/idobao/montex/v2/keymaps/via/keymap.c b/keyboards/idobao/montex/v2/keymaps/via/keymap.c new file mode 100644 index 000000000000..c5ff46cac0c4 --- /dev/null +++ b/keyboards/idobao/montex/v2/keymaps/via/keymap.c @@ -0,0 +1,85 @@ +/* Copyright 2021 NachoxMacho +* Copyright 2022 peepeetee +* +* 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] = { + /* + * ┌───┌───┬───┬───┬───┐ + * │ ` │Esc│Tab│MO1│Bsp│ + * ├───┼───┼───┼───┼───┤ + * │ , │Num│ / │ * │ - │ + * ├───┼───┼───┼───┼───┤ + * │Gui│ 7 │ 8 │ 9 │ │ + * ├───┼───┼───┼───┤ + │ + * │Alt│ 4 │ 5 │ 6 │ │ + * ├───┼───┼───┼───┼───┤ + * │Shi│ 1 │ 2 │ 3 │ │ + * ├───┼───┴───┼───┤Ent│ + * │Ctr│ 0 │ . │ │ + * └───┴───────┴───┴───┘ + */ + [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 + ), + + /* + * ┌───┌───┐───┬───┬───┐ + * │Rst│ ` │Tab│MO1│Bsp│ + * ├───┼───┘───┼───┼───┤ + * │ , │Num│ / │ * │ - │ + * ├───┼───┼───┼───┼───┤ + * │Gui│Hom│ ↑ │PgU│ │ + * ├───┼───┼───┼───┤ + │ + * │Alt│ ← │ │ → │ │ + * ├───┼───┼───┼───┤───┤ + * │Shi│End│ ↓ │PgD│ │ + * ├───┼───┴───┼───┤Ent│ + * │Ctr│Insert │Del│ │ + * └───┴───────┴───┘───┘ + */ + [1] = LAYOUT_numpad_6x5( + RESET, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, + RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ), + [2] = LAYOUT_numpad_6x5( + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ), + [3] = LAYOUT_numpad_6x5( + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ) + +}; diff --git a/keyboards/idobao/montex/v2/keymaps/via/rules.mk b/keyboards/idobao/montex/v2/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/idobao/montex/v2/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From 3d6ef18de4b7173e87cf2188c25c1b15613468e9 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Thu, 13 Jan 2022 22:14:11 +0800 Subject: [PATCH 04/21] squeeze some AVR; VIA now compiles --- keyboards/idobao/montex/v2/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/idobao/montex/v2/rules.mk b/keyboards/idobao/montex/v2/rules.mk index 29fbe56d9744..31bfbe72f9bd 100644 --- a/keyboards/idobao/montex/v2/rules.mk +++ b/keyboards/idobao/montex/v2/rules.mk @@ -10,8 +10,8 @@ BOOTLOADER = atmel-dfu BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration +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 = no # Enable keyboard RGB underglow From 6b0e8146d7a1c24e55aeb3ab5d874c6900f45d57 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Thu, 13 Jan 2022 22:23:11 +0800 Subject: [PATCH 05/21] readme --- keyboards/idobao/montex/v2/readme.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/idobao/montex/v2/readme.md b/keyboards/idobao/montex/v2/readme.md index d43420e0772f..c0ddc0add019 100644 --- a/keyboards/idobao/montex/v2/readme.md +++ b/keyboards/idobao/montex/v2/readme.md @@ -1,20 +1,20 @@ -# v2 +# IDOBAO MONTEX V2 -![v2](imgur.com image replace me!) +![MONTEX V2](https://i.imgur.com/sfHhyAn.jpg) -*A short description of the keyboard/project* +A hotswap RGB numpad from IDOBAO. * Keyboard Maintainer: [peepeetee](https://github.com/peepeetee) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Hardware Supported: IDOBAO MONTEX V2 +* Hardware Availability: https://idobao.net/collections/20-layout/products/idobao-montex-pad-hot-swappable-keyboard-kit-%E7%9A%84%E5%89%AF%E6%9C%AC Make example for this keyboard (after setting up your build environment): - make v2:default + make idobao/montex/v2:default Flashing example for this keyboard: - make v2:default:flash + make idobao/montex/v2: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). @@ -23,5 +23,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Physical reset button**: Briefly press the button on the back of the PCB * **Keycode in layout**: Press the key mapped to `RESET` if it is available From bcf9d91ab88ad752643dba2412631703ea86f938 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Thu, 13 Jan 2022 22:27:36 +0800 Subject: [PATCH 06/21] add RGB_MOD --- keyboards/idobao/montex/v2/keymaps/default/keymap.c | 2 +- keyboards/idobao/montex/v2/keymaps/via/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/idobao/montex/v2/keymaps/default/keymap.c b/keyboards/idobao/montex/v2/keymaps/default/keymap.c index 404b41e4cdf3..27fa693eea7a 100644 --- a/keyboards/idobao/montex/v2/keymaps/default/keymap.c +++ b/keyboards/idobao/montex/v2/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └───┴───────┴───┘───┘ */ [1] = LAYOUT_numpad_6x5( - RESET, _______, _______, _______, _______, + RESET, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, diff --git a/keyboards/idobao/montex/v2/keymaps/via/keymap.c b/keyboards/idobao/montex/v2/keymaps/via/keymap.c index c5ff46cac0c4..8daf40035e52 100644 --- a/keyboards/idobao/montex/v2/keymaps/via/keymap.c +++ b/keyboards/idobao/montex/v2/keymaps/via/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └───┴───────┴───┘───┘ */ [1] = LAYOUT_numpad_6x5( - RESET, _______, _______, _______, _______, + RESET, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, From e9f1182c007e61045b84c588088258de890f3e11 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Thu, 20 Jan 2022 15:15:06 +0800 Subject: [PATCH 07/21] add via lighting --- .../idobao/montex/v2/keymaps/via/config.h | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 keyboards/idobao/montex/v2/keymaps/via/config.h diff --git a/keyboards/idobao/montex/v2/keymaps/via/config.h b/keyboards/idobao/montex/v2/keymaps/via/config.h new file mode 100644 index 000000000000..29a84fced5f3 --- /dev/null +++ b/keyboards/idobao/montex/v2/keymaps/via/config.h @@ -0,0 +1,21 @@ +/* Copyright 2022 peepeetee + * + * 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 . + */ + +#pragma once + +#if defined(RGB_MATRIX_ENABLE) + #define VIA_QMK_RGBLIGHT_ENABLE +#endif From d1ddccb9ac4447888432c3fcc5d777abf2773c23 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Thu, 20 Jan 2022 15:22:43 +0800 Subject: [PATCH 08/21] add some missed RGB effects --- keyboards/idobao/montex/v2/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h index 0b5b5a110c2d..001fecee4369 100644 --- a/keyboards/idobao/montex/v2/config.h +++ b/keyboards/idobao/montex/v2/config.h @@ -44,6 +44,8 @@ // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define RGB_MATRIX_KEYPRESSES # define ENABLE_RGB_MATRIX_ALPHAS_MODS # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT From 2a61accbd44a206b2f168e8264fda9fa19327c9f Mon Sep 17 00:00:00 2001 From: Christian Hofstede <4440939+chofstede@users.noreply.github.com> Date: Thu, 20 Jan 2022 23:48:20 +0100 Subject: [PATCH 09/21] Different Wiring than old Montex Hello, I received the RGB Montex today and I flashed something based on your work. I noticed, that the wiring is different than in the old model without RGB. The "+" Sign and the "Enter" Key are now one row further up, which moved some keys arround (starting from row 4). Maybe this issue is just different hardware revisions. idk. But with this changes, all keys on the MontexV2 are working perfectly on my unit here. Thank you very much for you work and effort :) --- .../idobao/montex/v2/keymaps/default/keymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/idobao/montex/v2/keymaps/default/keymap.c b/keyboards/idobao/montex/v2/keymaps/default/keymap.c index 27fa693eea7a..805c12db985d 100644 --- a/keyboards/idobao/montex/v2/keymaps/default/keymap.c +++ b/keyboards/idobao/montex/v2/keymaps/default/keymap.c @@ -36,10 +36,10 @@ 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 + KC_LGUI, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_LALT, KC_P4, KC_P5, KC_P6, + KC_LSHIFT, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTRL, KC_P0, KC_PDOT ), /* @@ -60,10 +60,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_numpad_6x5( RESET, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, - RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, - RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, - _______, _______, _______, _______, - _______, _______, _______, _______ + RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, + RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, + _______, _______, _______, _______, _______, + _______, _______, _______ ) }; From 8e22e5f9366ce4a1b4603e9d6751f66ead37f03c Mon Sep 17 00:00:00 2001 From: peepeetee Date: Mon, 24 Jan 2022 22:52:10 +0800 Subject: [PATCH 10/21] apply @chofstede 's fix to via keymap --- .../idobao/montex/v2/keymaps/via/keymap.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/idobao/montex/v2/keymaps/via/keymap.c b/keyboards/idobao/montex/v2/keymaps/via/keymap.c index 8daf40035e52..3f666b534aec 100644 --- a/keyboards/idobao/montex/v2/keymaps/via/keymap.c +++ b/keyboards/idobao/montex/v2/keymaps/via/keymap.c @@ -36,10 +36,10 @@ 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 + KC_LGUI, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_LALT, KC_P4, KC_P5, KC_P6, + KC_LSHIFT, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTRL, KC_P0, KC_PDOT ), /* @@ -60,26 +60,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_numpad_6x5( RESET, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, - RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, - RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, - _______, _______, _______, _______, - _______, _______, _______, _______ + RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, + RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, + _______, _______, _______, _______, _______, + _______, _______, _______ ), [2] = LAYOUT_numpad_6x5( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______ + _______, _______, _______, _______, _______, + _______, _______, _______ ), [3] = LAYOUT_numpad_6x5( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______ + _______, _______, _______, _______, _______, + _______, _______, _______ ) }; From c9a1bf772debe1f9654c0e065d77b946c7ed3aea Mon Sep 17 00:00:00 2001 From: Vino Rodrigues Date: Sat, 30 Apr 2022 20:05:06 +1000 Subject: [PATCH 11/21] rename folder to `v1rgb` --- keyboards/idobao/montex/{v2 => v1rgb}/config.h | 0 keyboards/idobao/montex/{v2 => v1rgb}/info.json | 0 keyboards/idobao/montex/{v2 => v1rgb}/keymaps/default/keymap.c | 0 keyboards/idobao/montex/{v2 => v1rgb}/keymaps/default/readme.md | 0 keyboards/idobao/montex/{v2 => v1rgb}/keymaps/via/config.h | 0 keyboards/idobao/montex/{v2 => v1rgb}/keymaps/via/keymap.c | 0 keyboards/idobao/montex/{v2 => v1rgb}/keymaps/via/rules.mk | 0 keyboards/idobao/montex/{v2 => v1rgb}/readme.md | 0 keyboards/idobao/montex/{v2 => v1rgb}/rules.mk | 0 keyboards/idobao/montex/{v2 => v1rgb}/v2.c | 0 keyboards/idobao/montex/{v2 => v1rgb}/v2.h | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/idobao/montex/{v2 => v1rgb}/config.h (100%) rename keyboards/idobao/montex/{v2 => v1rgb}/info.json (100%) rename keyboards/idobao/montex/{v2 => v1rgb}/keymaps/default/keymap.c (100%) rename keyboards/idobao/montex/{v2 => v1rgb}/keymaps/default/readme.md (100%) rename keyboards/idobao/montex/{v2 => v1rgb}/keymaps/via/config.h (100%) rename keyboards/idobao/montex/{v2 => v1rgb}/keymaps/via/keymap.c (100%) rename keyboards/idobao/montex/{v2 => v1rgb}/keymaps/via/rules.mk (100%) rename keyboards/idobao/montex/{v2 => v1rgb}/readme.md (100%) rename keyboards/idobao/montex/{v2 => v1rgb}/rules.mk (100%) rename keyboards/idobao/montex/{v2 => v1rgb}/v2.c (100%) rename keyboards/idobao/montex/{v2 => v1rgb}/v2.h (100%) diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v1rgb/config.h similarity index 100% rename from keyboards/idobao/montex/v2/config.h rename to keyboards/idobao/montex/v1rgb/config.h diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v1rgb/info.json similarity index 100% rename from keyboards/idobao/montex/v2/info.json rename to keyboards/idobao/montex/v1rgb/info.json diff --git a/keyboards/idobao/montex/v2/keymaps/default/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c similarity index 100% rename from keyboards/idobao/montex/v2/keymaps/default/keymap.c rename to keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c diff --git a/keyboards/idobao/montex/v2/keymaps/default/readme.md b/keyboards/idobao/montex/v1rgb/keymaps/default/readme.md similarity index 100% rename from keyboards/idobao/montex/v2/keymaps/default/readme.md rename to keyboards/idobao/montex/v1rgb/keymaps/default/readme.md diff --git a/keyboards/idobao/montex/v2/keymaps/via/config.h b/keyboards/idobao/montex/v1rgb/keymaps/via/config.h similarity index 100% rename from keyboards/idobao/montex/v2/keymaps/via/config.h rename to keyboards/idobao/montex/v1rgb/keymaps/via/config.h diff --git a/keyboards/idobao/montex/v2/keymaps/via/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c similarity index 100% rename from keyboards/idobao/montex/v2/keymaps/via/keymap.c rename to keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c diff --git a/keyboards/idobao/montex/v2/keymaps/via/rules.mk b/keyboards/idobao/montex/v1rgb/keymaps/via/rules.mk similarity index 100% rename from keyboards/idobao/montex/v2/keymaps/via/rules.mk rename to keyboards/idobao/montex/v1rgb/keymaps/via/rules.mk diff --git a/keyboards/idobao/montex/v2/readme.md b/keyboards/idobao/montex/v1rgb/readme.md similarity index 100% rename from keyboards/idobao/montex/v2/readme.md rename to keyboards/idobao/montex/v1rgb/readme.md diff --git a/keyboards/idobao/montex/v2/rules.mk b/keyboards/idobao/montex/v1rgb/rules.mk similarity index 100% rename from keyboards/idobao/montex/v2/rules.mk rename to keyboards/idobao/montex/v1rgb/rules.mk diff --git a/keyboards/idobao/montex/v2/v2.c b/keyboards/idobao/montex/v1rgb/v2.c similarity index 100% rename from keyboards/idobao/montex/v2/v2.c rename to keyboards/idobao/montex/v1rgb/v2.c diff --git a/keyboards/idobao/montex/v2/v2.h b/keyboards/idobao/montex/v1rgb/v2.h similarity index 100% rename from keyboards/idobao/montex/v2/v2.h rename to keyboards/idobao/montex/v1rgb/v2.h From 133a090cd657972e22d9cc202c2f43e3b12ee92c Mon Sep 17 00:00:00 2001 From: Vino Rodrigues Date: Sat, 30 Apr 2022 20:07:36 +1000 Subject: [PATCH 12/21] rename files to `v1rgb.*` --- keyboards/idobao/montex/v1rgb/{v2.c => v1rgb.c} | 0 keyboards/idobao/montex/v1rgb/{v2.h => v1rgb.h} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/idobao/montex/v1rgb/{v2.c => v1rgb.c} (100%) rename keyboards/idobao/montex/v1rgb/{v2.h => v1rgb.h} (100%) diff --git a/keyboards/idobao/montex/v1rgb/v2.c b/keyboards/idobao/montex/v1rgb/v1rgb.c similarity index 100% rename from keyboards/idobao/montex/v1rgb/v2.c rename to keyboards/idobao/montex/v1rgb/v1rgb.c diff --git a/keyboards/idobao/montex/v1rgb/v2.h b/keyboards/idobao/montex/v1rgb/v1rgb.h similarity index 100% rename from keyboards/idobao/montex/v1rgb/v2.h rename to keyboards/idobao/montex/v1rgb/v1rgb.h From 91ee21c319a64e2a6db9824d93aa6a8bc11674fe Mon Sep 17 00:00:00 2001 From: Vino Rodrigues Date: Sat, 30 Apr 2022 21:02:00 +1000 Subject: [PATCH 13/21] several code adjustments, and RGB matrix redo --- keyboards/idobao/montex/v1rgb/config.h | 130 ++++++++++++------------ keyboards/idobao/montex/v1rgb/info.json | 5 +- keyboards/idobao/montex/v1rgb/readme.md | 10 +- keyboards/idobao/montex/v1rgb/rules.mk | 6 -- keyboards/idobao/montex/v1rgb/v1rgb.c | 71 +++++++++---- keyboards/idobao/montex/v1rgb/v1rgb.h | 15 ++- 6 files changed, 127 insertions(+), 110 deletions(-) mode change 100644 => 100755 keyboards/idobao/montex/v1rgb/config.h mode change 100644 => 100755 keyboards/idobao/montex/v1rgb/info.json mode change 100644 => 100755 keyboards/idobao/montex/v1rgb/readme.md mode change 100644 => 100755 keyboards/idobao/montex/v1rgb/rules.mk mode change 100644 => 100755 keyboards/idobao/montex/v1rgb/v1rgb.c mode change 100644 => 100755 keyboards/idobao/montex/v1rgb/v1rgb.h diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h old mode 100644 new mode 100755 index 001fecee4369..b6e307c5e525 --- a/keyboards/idobao/montex/v1rgb/config.h +++ b/keyboards/idobao/montex/v1rgb/config.h @@ -7,10 +7,10 @@ /* USB Device descriptor parameter */ #define VENDOR_ID 0x6964 // "id" -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0002 +#define PRODUCT_ID 0x0127 +#define DEVICE_VER 0x0001 #define MANUFACTURER IDOBAO -#define PRODUCT Montex +#define PRODUCT Montex RGB /* key matrix size */ #define MATRIX_ROWS 6 @@ -24,74 +24,72 @@ * 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 { D4, D6, D7, B4, B5, C6 } #define MATRIX_COL_PINS { D5, D3, D2, D1, D0 } #define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN B1 -// The number of LEDs connected -#define DRIVER_LED_TOTAL 31 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 31 -# define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#endif -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -# define RGB_MATRIX_KEYPRESSES -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#endif -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ +#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) + + // The number of LEDs connected + #define DRIVER_LED_TOTAL 31 + + #define RGB_MATRIX_KEYPRESSES // reacts to keypresses + #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value + + // RGB Matrix Animation modes. Explicitly enabled + // For full list of effects, see: + // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects + /* *** Items disabled are visually unappealing in a 5x6 key matrix *** */ + #define ENABLE_RGB_MATRIX_SOLID_COLOR + #define ENABLE_RGB_MATRIX_ALPHAS_MODS + #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN + #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT + #define ENABLE_RGB_MATRIX_BREATHING + // #define ENABLE_RGB_MATRIX_BAND_SAT + // #define ENABLE_RGB_MATRIX_BAND_VAL + // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT + // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL + // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT + // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL + #define ENABLE_RGB_MATRIX_CYCLE_ALL + #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT + #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN + // #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON + #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN + // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL + #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL + #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL + // #define ENABLE_RGB_MATRIX_DUAL_BEACON + #define ENABLE_RGB_MATRIX_RAINBOW_BEACON + // #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS + #define ENABLE_RGB_MATRIX_RAINDROPS + #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS + #define ENABLE_RGB_MATRIX_HUE_BREATHING + #define ENABLE_RGB_MATRIX_HUE_PENDULUM + #define ENABLE_RGB_MATRIX_HUE_WAVE + #define ENABLE_RGB_MATRIX_PIXEL_RAIN + #define ENABLE_RGB_MATRIX_PIXEL_FLOW + #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL + + // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined + // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP + // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN + + // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE + #define ENABLE_RGB_MATRIX_SOLID_REACTIVE + #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE + #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS + #define ENABLE_RGB_MATRIX_SPLASH + // #define ENABLE_RGB_MATRIX_MULTISPLASH + #define ENABLE_RGB_MATRIX_SOLID_SPLASH + // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#endif diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json old mode 100644 new mode 100755 index 2a573defd97a..bd433a4cc060 --- a/keyboards/idobao/montex/v1rgb/info.json +++ b/keyboards/idobao/montex/v1rgb/info.json @@ -1,7 +1,5 @@ { - "keyboard_name": "A201", - "url": "", - "maintainer": "qmk", + "keyboard_name": "IDOBAO MONTEX RGB", "layouts": { "LAYOUT": { "layout": [ @@ -35,5 +33,4 @@ ] } } - ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" } diff --git a/keyboards/idobao/montex/v1rgb/readme.md b/keyboards/idobao/montex/v1rgb/readme.md old mode 100644 new mode 100755 index c0ddc0add019..e2af8399148d --- a/keyboards/idobao/montex/v1rgb/readme.md +++ b/keyboards/idobao/montex/v1rgb/readme.md @@ -1,20 +1,20 @@ -# IDOBAO MONTEX V2 +# IDOBAO MONTEX RGB -![MONTEX V2](https://i.imgur.com/sfHhyAn.jpg) +![MONTEX RGB](https://idobao.github.io/assets/img/idobao-id27.png) A hotswap RGB numpad from IDOBAO. * Keyboard Maintainer: [peepeetee](https://github.com/peepeetee) -* Hardware Supported: IDOBAO MONTEX V2 +* Hardware Supported: IDOBAO MONTEX RGB * Hardware Availability: https://idobao.net/collections/20-layout/products/idobao-montex-pad-hot-swappable-keyboard-kit-%E7%9A%84%E5%89%AF%E6%9C%AC Make example for this keyboard (after setting up your build environment): - make idobao/montex/v2:default + make idobao/montex/v1rgb:default Flashing example for this keyboard: - make idobao/montex/v2:default:flash + make idobao/montex/v1rgb: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). diff --git a/keyboards/idobao/montex/v1rgb/rules.mk b/keyboards/idobao/montex/v1rgb/rules.mk old mode 100644 new mode 100755 index 31bfbe72f9bd..140d126df8c2 --- a/keyboards/idobao/montex/v1rgb/rules.mk +++ b/keyboards/idobao/montex/v1rgb/rules.mk @@ -15,11 +15,5 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 -LTO_ENABLE = yes - -# generated by KBFirmware JSON to QMK Parser -# https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.c b/keyboards/idobao/montex/v1rgb/v1rgb.c old mode 100644 new mode 100755 index 3d9636cbcb74..ca7cfd3d1d9a --- a/keyboards/idobao/montex/v1rgb/v1rgb.c +++ b/keyboards/idobao/montex/v1rgb/v1rgb.c @@ -1,37 +1,68 @@ // Copyright 2022 peepeetee (@peepeetee) // SPDX-License-Identifier: GPL-2.0-or-later -#include "v2.h" +#include "v1rgb.h" #ifdef RGB_MATRIX_ENABLE + +/* WS2812 index start at 0 + * underglow = 0-3 + * ┌───┌───┐───┬───┬───┐ + * │ 6 │ 5 │ 4 │30 │29 │ + * ├───┼───┘───┼───┼───┤ + * │24 │25 │26 │27 │28 │ + * ├───┼───┼───┼───┼───┤ + * │23 │22 │21 │20 │19 │ + * ├───┼───┼───┼───┤ │ + * │15 │16 │17 │18 │ │ + * ├───┼───┼───┼───┤───┤ + * │14 │13 │12 │11 │10 │ + * ├───┼───┴───┼───┤ │ + * │ 7 │ 8 │ 9 │ │ + * └───┴───────┴───┘───┘ + */ + led_config_t g_led_config = { { // Key Matrix to LED Index - { 6, 5, 4, 30, 29}, //0 - { 24, 25, 26, 27, 28}, //12.8 - { 23, 22, 21, 20, 19}, //25.6 - { 15, 16, 17, 18, NO_LED}, //38.4 - { 14, 13, 12, 11, NO_LED}, //51.2 - { 7, 8, 9, 10, NO_LED} //64 + { 6, 5, 4, 30, 29}, + { 24, 25, 26, 27, 28}, + { 23, 22, 21, 20, 19}, + { 15, 16, 17, 18, NO_LED}, + { 14, 13, 12, 11, NO_LED}, + { 7, 8, 9, 10, NO_LED} }, { // LED Index to Physical Position - { 180, 3}, { 142, 54}, { 30, 54}, { 50, 3}, // 0 1 2 3 (underglow) - { 112, 0}, { 56, 0}, { 0, 0}, // 4 5 6 - { 0, 64}, { 84, 64}, { 168, 64}, { 210, 54}, // 7 - 10 - { 168, 51}, { 112, 51}, { 56, 51}, { 0, 51}, //11 - 14 - { 0, 38}, { 56, 38}, { 112, 38}, { 168, 38}, //15 - 18 - { 210, 30}, { 168, 26}, { 112, 26}, { 56, 26}, { 0, 26}, //19 - 23 - { 0, 13}, { 56, 13}, { 112, 13}, { 168, 13}, { 224, 13}, //24 - 28 - { 224, 0}, { 168, 0} //29 30 + /* underglow: because this is under the kb, you want the colors on the edge of the acrylic plate */ + { 224,0 }, { 224,64}, { 0,64 }, { 0,0 }, // 0-3 (underglow) + /* per-key: origins generated from https://xelus.netlify.app/guides/KLE_to_RGB_parser */ + { 112,0 }, { 56,0 }, { 0,0 }, /* ---- */ /* ---- */ // 4-6 (top row middle to left) + { 0,64 }, { 84,64 }, { 168,64 }, // 7-9 (jump to bottom left) + { 224,58 }, { 168,41 }, { 112,41 }, { 56,41 }, { 0,41 }, // 10-14 (flow Z pattern upwards...) + { 0,29 }, { 56,29 }, { 112,29 }, { 224,35 }, // 15-18 + { 224,35 }, { 168,29 }, { 112,29 }, { 56,29 }, { 0,29 }, // 19-23 + { 0,17 }, { 56,17 }, { 112,17 }, { 168,17 }, { 224,17 }, // 24-28 + /* ---- */ /* ---- */ /* ---- */ { 224,0 }, { 168,0 } // 29-30 (end at top) }, { // LED Index to Flag 2, 2, 2, 2, // 0 1 2 3 (underglow) 1, 1, 1, // 4 5 6 - 1, 4, 4, 1, // 7 - 10 - 4, 4, 4, 1, //11 - 14 - 1, 4, 4, 4, //15 - 18 - 1, 4, 4, 4, 1, //19 - 23 - 1, 1, 1, 1, 1, //24 - 28 + 4, 4, 4, 4, // 7 - 10 + 4, 4, 4, 4, //11 - 14 + 4, 4, 4, 4, //15 - 18 + 4, 4, 4, 4, 4, //19 - 23 + 4, 4, 4, 4, 4, //24 - 28 1, 1 //29 30 } }; #endif + +/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! DELETE THIS !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! after testing LED matrix + * generated output + { 0,0 }, { 56,0 }, {112,0 }, {168,0 }, {224,0 }, + { 0,17 }, { 56,17 }, {112,17 }, {168,17 }, {224,17 }, + { 0,29 }, { 56,29 }, {112,29 }, {168,29 }, {224,35 }, + { 0,41 }, { 56,41 }, {112,41 }, {168,41 }, + { 0,52 }, { 56,52 }, {112,52 }, {168,52 }, {224,58 }, + { 0,64 }, { 84,64 }, {168,64 }, + * + */ diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.h b/keyboards/idobao/montex/v1rgb/v1rgb.h old mode 100644 new mode 100755 index 6ba5843fe97f..d5eff034a378 --- a/keyboards/idobao/montex/v1rgb/v1rgb.h +++ b/keyboards/idobao/montex/v1rgb/v1rgb.h @@ -5,23 +5,20 @@ #include "quantum.h" -#define XXX KC_NO +#define ___ KC_NO -#define LAYOUT_numpad_6x5( \ +#define LAYOUT( \ K00, K01, K02, K03, K04, \ K10, K11, K12, K13, K14, \ K20, K21, K22, K23, K24, \ K30, K31, K32, K33, \ K40, K41, K42, K43, K53, \ - K50, K51, K52 \ + K50, K51, K52 \ ) { \ { K00, K01, K02, K03, K04 }, \ { K10, K11, K12, K13, K14 }, \ { K20, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, XXX }, \ - { K40, K41, K42, K43, XXX }, \ - { K50, K51, K52, K53, XXX }, \ + { K30, K31, K32, K33, ___ }, \ + { K40, K41, K42, K43, ___ }, \ + { K50, K51, K52, K53, ___ }, \ } - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ From c0ee4909555a1fcb8bb4ebd863f735eb2c00fb9e Mon Sep 17 00:00:00 2001 From: Vino Rodrigues Date: Sat, 30 Apr 2022 21:02:44 +1000 Subject: [PATCH 14/21] copt v2 keymap with [Fn] at bottom left --- .../montex/v1rgb/keymaps/default/keymap.c | 67 +++++-------- .../montex/v1rgb/keymaps/default/readme.md | 1 - .../idobao/montex/v1rgb/keymaps/via/config.h | 17 +--- .../idobao/montex/v1rgb/keymaps/via/keymap.c | 95 ++++++++++--------- .../idobao/montex/v1rgb/keymaps/via/rules.mk | 1 + 5 files changed, 81 insertions(+), 100 deletions(-) mode change 100644 => 100755 keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c delete mode 100644 keyboards/idobao/montex/v1rgb/keymaps/default/readme.md mode change 100644 => 100755 keyboards/idobao/montex/v1rgb/keymaps/via/config.h mode change 100644 => 100755 keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c mode change 100644 => 100755 keyboards/idobao/montex/v1rgb/keymaps/via/rules.mk diff --git a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c old mode 100644 new mode 100755 index 805c12db985d..1f3db46512b3 --- a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c +++ b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c @@ -1,28 +1,14 @@ -/* Copyright 2021 NachoxMacho -* Copyright 2022 peepeetee -* -* 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/>. -*/ +// Copyright 2022 peepeetee (@peepeetee) +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * ┌───┌───┬───┬───┬───┐ - * │ ` │Esc│Tab│MO1│Bsp│ + * │Esc│Tab│ F1│Cal│Bsp│ * ├───┼───┼───┼───┼───┤ - * │ , │Num│ / │ * │ - │ + * │Ctr│Num│ / │ * │ - │ * ├───┼───┼───┼───┼───┤ * │Gui│ 7 │ 8 │ 9 │ │ * ├───┼───┼───┼───┤ + │ @@ -30,40 +16,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├───┼───┼───┼───┼───┤ * │Shi│ 1 │ 2 │ 3 │ │ * ├───┼───┴───┼───┤Ent│ - * │Ctr│ 0 │ . │ │ + * │MO1│ 0 │ . │ │ * └───┴───────┴───┴───┘ */ - [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_PPLS, - KC_LALT, KC_P4, KC_P5, KC_P6, - KC_LSHIFT, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTRL, KC_P0, KC_PDOT + [0] = LAYOUT( + KC_GESC, KC_TAB, KC_F1, KC_CALC, KC_BSPC, + KC_LCTRL, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_LGUI, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_LALT, KC_P4, KC_P5, KC_P6, + KC_LSHIFT, KC_P1, KC_P2, KC_P3, KC_PENT, + MO(1), KC_P0, KC_PDOT ), /* * ┌───┌───┐───┬───┬───┐ - * │Rst│ ` │Tab│MO1│Bsp│ + * │Rst│TOG│MOD│PSc│SLk│ * ├───┼───┘───┼───┼───┤ - * │ , │Num│ / │ * │ - │ + * │Hu+│ │Sp-│Sp+│Br-│ * ├───┼───┼───┼───┼───┤ - * │Gui│Hom│ ↑ │PgU│ │ - * ├───┼───┼───┼───┤ + │ - * │Alt│ ← │ │ → │ │ + * │Hu-│Hom│ ↑ │PgU│ │ + * ├───┼───┼───┼───┤Br+│ + * │St+│ ← │ │ → │ │ * ├───┼───┼───┼───┤───┤ - * │Shi│End│ ↓ │PgD│ │ + * │St-│End│ ↓ │PgD│ │ * ├───┼───┴───┼───┤Ent│ - * │Ctr│Insert │Del│ │ + * │mo1│Insert │Del│ │ * └───┴───────┴───┘───┘ */ - [1] = LAYOUT_numpad_6x5( - RESET, RGB_TOG, RGB_MOD, _______, _______, - _______, _______, _______, _______, _______, - RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, - RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, - _______, _______, _______, _______, _______, - _______, _______, _______ + [1] = LAYOUT( + RESET, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK, + RGB_HUI, XXXXXXX, RGB_SPD, RGB_SPI, RGB_VAD, + RGB_HUD, KC_HOME, KC_UP, KC_PGUP, RGB_VAI, + RGB_SAI, KC_LEFT, XXXXXXX, KC_RGHT, + RGB_SAD, KC_END, KC_DOWN, KC_PGDN, KC_ENT, + _______, KC_INS, KC_DEL ) - }; diff --git a/keyboards/idobao/montex/v1rgb/keymaps/default/readme.md b/keyboards/idobao/montex/v1rgb/keymaps/default/readme.md deleted file mode 100644 index e56d2e058b29..000000000000 --- a/keyboards/idobao/montex/v1rgb/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for v2 diff --git a/keyboards/idobao/montex/v1rgb/keymaps/via/config.h b/keyboards/idobao/montex/v1rgb/keymaps/via/config.h old mode 100644 new mode 100755 index 29a84fced5f3..29d0e53f7151 --- a/keyboards/idobao/montex/v1rgb/keymaps/via/config.h +++ b/keyboards/idobao/montex/v1rgb/keymaps/via/config.h @@ -1,18 +1,5 @@ -/* Copyright 2022 peepeetee - * - * 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 . - */ +// Copyright 2022 peepeetee (@peepeetee) +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c old mode 100644 new mode 100755 index 3f666b534aec..b7d435b440c9 --- a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c +++ b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c @@ -1,28 +1,21 @@ -/* Copyright 2021 NachoxMacho -* Copyright 2022 peepeetee -* -* 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/>. -*/ +// Copyright 2022 peepeetee (@peepeetee) +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H +enum montex_layers { + _BASE, + _FN, + _EMPTY2, // Just to initialize dynamic layers in VIA + _EMPTY3 +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * ┌───┌───┬───┬───┬───┐ - * │ ` │Esc│Tab│MO1│Bsp│ + * │Esc│Tab│ F1│Cal│Bsp│ * ├───┼───┼───┼───┼───┤ - * │ , │Num│ / │ * │ - │ + * │Ctr│Num│ / │ * │ - │ * ├───┼───┼───┼───┼───┤ * │Gui│ 7 │ 8 │ 9 │ │ * ├───┼───┼───┼───┤ + │ @@ -30,42 +23,58 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├───┼───┼───┼───┼───┤ * │Shi│ 1 │ 2 │ 3 │ │ * ├───┼───┴───┼───┤Ent│ - * │Ctr│ 0 │ . │ │ + * │MO1│ 0 │ . │ │ * └───┴───────┴───┴───┘ */ - [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_PPLS, - KC_LALT, KC_P4, KC_P5, KC_P6, - KC_LSHIFT, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTRL, KC_P0, KC_PDOT + [_BASE] = LAYOUT( + KC_GESC, KC_TAB, KC_F1, KC_CALC, KC_BSPC, + KC_LCTRL, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_LGUI, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_LALT, KC_P4, KC_P5, KC_P6, + KC_LSHIFT, KC_P1, KC_P2, KC_P3, KC_PENT, + MO(1), KC_P0, KC_PDOT ), /* * ┌───┌───┐───┬───┬───┐ - * │Rst│ ` │Tab│MO1│Bsp│ + * │Rst│TOG│MOD│PSs│SLk│ * ├───┼───┘───┼───┼───┤ - * │ , │Num│ / │ * │ - │ + * │Hu+│ │Sp-│Sp+│Br-│ * ├───┼───┼───┼───┼───┤ - * │Gui│Hom│ ↑ │PgU│ │ - * ├───┼───┼───┼───┤ + │ - * │Alt│ ← │ │ → │ │ + * │Hu-│Hom│ ↑ │PgU│ │ + * ├───┼───┼───┼───┤Br+│ + * │St+│ ← │ │ → │ │ * ├───┼───┼───┼───┤───┤ - * │Shi│End│ ↓ │PgD│ │ + * │St-│End│ ↓ │PgD│ │ * ├───┼───┴───┼───┤Ent│ - * │Ctr│Insert │Del│ │ + * │mo1│Insert │Del│ │ * └───┴───────┴───┘───┘ */ - [1] = LAYOUT_numpad_6x5( - RESET, RGB_TOG, RGB_MOD, _______, _______, - _______, _______, _______, _______, _______, - RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, - RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, - _______, _______, _______, _______, _______, - _______, _______, _______ + [_FN] = LAYOUT( + RESET, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK, + RGB_HUI, XXXXXXX, RGB_SPD, RGB_SPI, RGB_VAD, + RGB_HUD, KC_HOME, KC_UP, KC_PGUP, RGB_VAI, + RGB_SAI, KC_LEFT, XXXXXXX, KC_RGHT, + RGB_SAD, KC_END, KC_DOWN, KC_PGDN, KC_ENT, + _______, KC_INS, KC_DEL ), - [2] = LAYOUT_numpad_6x5( + + /* + * ┌───┌───┐───┬───┬───┐ + * │ │ │ │ │ │ + * ├───┼───┘───┼───┼───┤ + * │ │ │ │ │ │ + * ├───┼───┼───┼───┼───┤ + * │ │ │ │ │ │ + * ├───┼───┼───┼───┤ │ + * │ │ │ │ │ │ + * ├───┼───┼───┼───┤───┤ + * │ │ │ │ │ │ + * ├───┼───┴───┼───┤ │ + * │ │ │ │ │ + * └───┴───────┴───┘───┘ + */ + [_EMPTY2] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -73,7 +82,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT_numpad_6x5( + + [_EMPTY3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -81,5 +91,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ ) - }; diff --git a/keyboards/idobao/montex/v1rgb/keymaps/via/rules.mk b/keyboards/idobao/montex/v1rgb/keymaps/via/rules.mk old mode 100644 new mode 100755 index 1e5b99807cb7..36b7ba9cbc98 --- a/keyboards/idobao/montex/v1rgb/keymaps/via/rules.mk +++ b/keyboards/idobao/montex/v1rgb/keymaps/via/rules.mk @@ -1 +1,2 @@ VIA_ENABLE = yes +LTO_ENABLE = yes From a8aa7587bb7d29fe6fae8995a04a5446ae49e8d6 Mon Sep 17 00:00:00 2001 From: Vino Rodrigues Date: Sun, 1 May 2022 08:32:47 +1000 Subject: [PATCH 15/21] credit @willi-on-fire for helping us test --- keyboards/idobao/montex/v1rgb/readme.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/keyboards/idobao/montex/v1rgb/readme.md b/keyboards/idobao/montex/v1rgb/readme.md index e2af8399148d..296f05f239c5 100755 --- a/keyboards/idobao/montex/v1rgb/readme.md +++ b/keyboards/idobao/montex/v1rgb/readme.md @@ -4,9 +4,12 @@ A hotswap RGB numpad from IDOBAO. -* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee) +* Keyboard Maintainer: + - [peepeetee](https://github.com/peepeetee) + - [vinorodrigues](https://github.com/vinorodrigues) + - [willi-on-fire](https://github.com/willi-on-fire) * Hardware Supported: IDOBAO MONTEX RGB -* Hardware Availability: https://idobao.net/collections/20-layout/products/idobao-montex-pad-hot-swappable-keyboard-kit-%E7%9A%84%E5%89%AF%E6%9C%AC +* Hardware Availability: [Drop](https://drop.com/buy/idobao-montex-numpad-hotswappable-kit), [AliExpress](https://www.aliexpress.com/item/1005003885788698.html) & [IDOBAO.net](https://idobao.net/collections/20-layout/products/idobao-montex-pad-hot-swappable-keyboard-kit-%E7%9A%84%E5%89%AF%E6%9C%AC) Make example for this keyboard (after setting up your build environment): @@ -22,6 +25,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or [Esc]) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB * **Keycode in layout**: Press the key mapped to `RESET` if it is available From d3b19116f45db77c3e9156051d91cc029e6025ae Mon Sep 17 00:00:00 2001 From: Vino Rodrigues Date: Sun, 1 May 2022 08:33:30 +1000 Subject: [PATCH 16/21] fix for [6] key co-ord typo --- keyboards/idobao/montex/v1rgb/v1rgb.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.c b/keyboards/idobao/montex/v1rgb/v1rgb.c index ca7cfd3d1d9a..f6d2cd00c78a 100755 --- a/keyboards/idobao/montex/v1rgb/v1rgb.c +++ b/keyboards/idobao/montex/v1rgb/v1rgb.c @@ -7,6 +7,7 @@ /* WS2812 index start at 0 * underglow = 0-3 + * note: starting point of 4 and jump from 6 to 7 * ┌───┌───┐───┬───┬───┐ * │ 6 │ 5 │ 4 │30 │29 │ * ├───┼───┘───┼───┼───┤ @@ -38,7 +39,7 @@ led_config_t g_led_config = { { { 112,0 }, { 56,0 }, { 0,0 }, /* ---- */ /* ---- */ // 4-6 (top row middle to left) { 0,64 }, { 84,64 }, { 168,64 }, // 7-9 (jump to bottom left) { 224,58 }, { 168,41 }, { 112,41 }, { 56,41 }, { 0,41 }, // 10-14 (flow Z pattern upwards...) - { 0,29 }, { 56,29 }, { 112,29 }, { 224,35 }, // 15-18 + { 0,29 }, { 56,29 }, { 112,29 }, { 168,29 }, // 15-18 { 224,35 }, { 168,29 }, { 112,29 }, { 56,29 }, { 0,29 }, // 19-23 { 0,17 }, { 56,17 }, { 112,17 }, { 168,17 }, { 224,17 }, // 24-28 /* ---- */ /* ---- */ /* ---- */ { 224,0 }, { 168,0 } // 29-30 (end at top) @@ -55,14 +56,3 @@ led_config_t g_led_config = { { } }; #endif - -/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! DELETE THIS !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! after testing LED matrix - * generated output - { 0,0 }, { 56,0 }, {112,0 }, {168,0 }, {224,0 }, - { 0,17 }, { 56,17 }, {112,17 }, {168,17 }, {224,17 }, - { 0,29 }, { 56,29 }, {112,29 }, {168,29 }, {224,35 }, - { 0,41 }, { 56,41 }, {112,41 }, {168,41 }, - { 0,52 }, { 56,52 }, {112,52 }, {168,52 }, {224,58 }, - { 0,64 }, { 84,64 }, {168,64 }, - * - */ From 1a3c749c58a74ed4e5d43cd954d899d365e5f916 Mon Sep 17 00:00:00 2001 From: Vino Rodrigues Date: Sun, 1 May 2022 08:48:33 +1000 Subject: [PATCH 17/21] added keymap readme --- .../montex/v1rgb/keymaps/default/readme.md | 3 +++ .../idobao/montex/v1rgb/keymaps/via/readme.md | 3 +++ keyboards/idobao/montex/v1rgb/v1rgb.c | 20 +++++++++---------- 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100755 keyboards/idobao/montex/v1rgb/keymaps/default/readme.md create mode 100755 keyboards/idobao/montex/v1rgb/keymaps/via/readme.md diff --git a/keyboards/idobao/montex/v1rgb/keymaps/default/readme.md b/keyboards/idobao/montex/v1rgb/keymaps/default/readme.md new file mode 100755 index 000000000000..a5ed54cbc55e --- /dev/null +++ b/keyboards/idobao/montex/v1rgb/keymaps/default/readme.md @@ -0,0 +1,3 @@ +# The default keymap for RGB Version + +![](https://idobao.github.io/kle/idobao-id27-v2.png) diff --git a/keyboards/idobao/montex/v1rgb/keymaps/via/readme.md b/keyboards/idobao/montex/v1rgb/keymaps/via/readme.md new file mode 100755 index 000000000000..692de7e69fd5 --- /dev/null +++ b/keyboards/idobao/montex/v1rgb/keymaps/via/readme.md @@ -0,0 +1,3 @@ +# The VIA keymap for RGB Version + +![](https://idobao.github.io/kle/idobao-id27-v2.png) diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.c b/keyboards/idobao/montex/v1rgb/v1rgb.c index f6d2cd00c78a..3d2a847c0014 100755 --- a/keyboards/idobao/montex/v1rgb/v1rgb.c +++ b/keyboards/idobao/montex/v1rgb/v1rgb.c @@ -5,7 +5,7 @@ #ifdef RGB_MATRIX_ENABLE -/* WS2812 index start at 0 +/* WS2812 indices always start at 0 * underglow = 0-3 * note: starting point of 4 and jump from 6 to 7 * ┌───┌───┐───┬───┬───┐ @@ -33,16 +33,16 @@ led_config_t g_led_config = { { { 7, 8, 9, 10, NO_LED} }, { // LED Index to Physical Position - /* underglow: because this is under the kb, you want the colors on the edge of the acrylic plate */ - { 224,0 }, { 224,64}, { 0,64 }, { 0,0 }, // 0-3 (underglow) + /* underglow: because this is under the kb, you want the colors on the edge (corners) of the acrylic plate */ + { 224,0 }, { 224,64}, { 0,64 }, { 0,0 }, // 0-3 (underglow) /* per-key: origins generated from https://xelus.netlify.app/guides/KLE_to_RGB_parser */ - { 112,0 }, { 56,0 }, { 0,0 }, /* ---- */ /* ---- */ // 4-6 (top row middle to left) - { 0,64 }, { 84,64 }, { 168,64 }, // 7-9 (jump to bottom left) - { 224,58 }, { 168,41 }, { 112,41 }, { 56,41 }, { 0,41 }, // 10-14 (flow Z pattern upwards...) - { 0,29 }, { 56,29 }, { 112,29 }, { 168,29 }, // 15-18 - { 224,35 }, { 168,29 }, { 112,29 }, { 56,29 }, { 0,29 }, // 19-23 - { 0,17 }, { 56,17 }, { 112,17 }, { 168,17 }, { 224,17 }, // 24-28 - /* ---- */ /* ---- */ /* ---- */ { 224,0 }, { 168,0 } // 29-30 (end at top) + { 112,0 }, { 56,0 }, { 0,0 }, /* ---- */ /* ---- */ // 4-6 (top row middle to left) + { 0,64 }, { 84,64 }, { 168,64 }, // 7-9 (jump to bottom left) + { 224,58 }, { 168,41 }, { 112,41 }, { 56,41 }, { 0,41 }, // 10-14 (flow Z pattern upwards...) + { 0,29 }, { 56,29 }, { 112,29 }, { 168,29 }, // 15-18 + { 224,35 }, { 168,29 }, { 112,29 }, { 56,29 }, { 0,29 }, // 19-23 + { 0,17 }, { 56,17 }, { 112,17 }, { 168,17 }, { 224,17 }, // 24-28 + /* ---- */ /* ---- */ /* ---- */ { 224,0 }, { 168,0 } // 29-30 (end at top) }, { // LED Index to Flag 2, 2, 2, 2, // 0 1 2 3 (underglow) From 84abb272963c7e7cb407f6b3017ec473faf99241 Mon Sep 17 00:00:00 2001 From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com> Date: Wed, 11 May 2022 21:17:12 +1000 Subject: [PATCH 18/21] Apply suggestions from code review post drashna review. rename `LAYOUT` to `LAYOUT_numpad_6x5` Co-authored-by: Drashna Jaelre --- keyboards/idobao/montex/v1rgb/info.json | 2 +- keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c | 4 ++-- keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c | 8 ++++---- keyboards/idobao/montex/v1rgb/rules.mk | 2 ++ keyboards/idobao/montex/v1rgb/v1rgb.h | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json index bd433a4cc060..27144e499c27 100755 --- a/keyboards/idobao/montex/v1rgb/info.json +++ b/keyboards/idobao/montex/v1rgb/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "IDOBAO MONTEX RGB", "layouts": { - "LAYOUT": { + "LAYOUT_numpad_6x5": { "layout": [ { "label": "K00 (D4,D5)", "x": 0, "y": 0 }, { "label": "K01 (D4,D3)", "x": 1, "y": 0 }, diff --git a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c index 1f3db46512b3..87849def395d 100755 --- a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c +++ b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │MO1│ 0 │ . │ │ * └───┴───────┴───┴───┘ */ - [0] = LAYOUT( + [0] = LAYOUT_numpad_6x5( KC_GESC, KC_TAB, KC_F1, KC_CALC, KC_BSPC, KC_LCTRL, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_LGUI, KC_P7, KC_P8, KC_P9, KC_PPLS, @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │mo1│Insert │Del│ │ * └───┴───────┴───┘───┘ */ - [1] = LAYOUT( + [1] = LAYOUT_numpad_6x5( RESET, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK, RGB_HUI, XXXXXXX, RGB_SPD, RGB_SPI, RGB_VAD, RGB_HUD, KC_HOME, KC_UP, KC_PGUP, RGB_VAI, diff --git a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c index b7d435b440c9..5e45679ea974 100755 --- a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c +++ b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │MO1│ 0 │ . │ │ * └───┴───────┴───┴───┘ */ - [_BASE] = LAYOUT( + [_BASE] = LAYOUT_numpad_6x5( KC_GESC, KC_TAB, KC_F1, KC_CALC, KC_BSPC, KC_LCTRL, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_LGUI, KC_P7, KC_P8, KC_P9, KC_PPLS, @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │mo1│Insert │Del│ │ * └───┴───────┴───┘───┘ */ - [_FN] = LAYOUT( + [_FN] = LAYOUT_numpad_6x5( RESET, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK, RGB_HUI, XXXXXXX, RGB_SPD, RGB_SPI, RGB_VAD, RGB_HUD, KC_HOME, KC_UP, KC_PGUP, RGB_VAI, @@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ * └───┴───────┴───┘───┘ */ - [_EMPTY2] = LAYOUT( + [_EMPTY2] = LAYOUT_numpad_6x5( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______ ), - [_EMPTY3] = LAYOUT( + [_EMPTY3] = LAYOUT_numpad_6x5( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/idobao/montex/v1rgb/rules.mk b/keyboards/idobao/montex/v1rgb/rules.mk index 140d126df8c2..c4d4a6ae667e 100755 --- a/keyboards/idobao/montex/v1rgb/rules.mk +++ b/keyboards/idobao/montex/v1rgb/rules.mk @@ -17,3 +17,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 + +LAYOUTS = numpad_6x5 diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.h b/keyboards/idobao/montex/v1rgb/v1rgb.h index d5eff034a378..e069771c6fdd 100755 --- a/keyboards/idobao/montex/v1rgb/v1rgb.h +++ b/keyboards/idobao/montex/v1rgb/v1rgb.h @@ -7,7 +7,7 @@ #define ___ KC_NO -#define LAYOUT( \ +#define LAYOUT_numpad_6x5( \ K00, K01, K02, K03, K04, \ K10, K11, K12, K13, K14, \ K20, K21, K22, K23, K24, \ From 59b9dc4fca03b67481037a0f8ce3a08a68627940 Mon Sep 17 00:00:00 2001 From: Vino Rodrigues Date: Wed, 11 May 2022 21:29:23 +1000 Subject: [PATCH 19/21] disable PIXEL_FRACTAL on suggestion from sigprof --- keyboards/idobao/montex/v1rgb/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h index b6e307c5e525..609aeb417e61 100755 --- a/keyboards/idobao/montex/v1rgb/config.h +++ b/keyboards/idobao/montex/v1rgb/config.h @@ -73,7 +73,7 @@ #define ENABLE_RGB_MATRIX_HUE_WAVE #define ENABLE_RGB_MATRIX_PIXEL_RAIN #define ENABLE_RGB_MATRIX_PIXEL_FLOW - #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL + // #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP From 479c2875fafdd3280080391f492cb525b5ece941 Mon Sep 17 00:00:00 2001 From: Vino Rodrigues Date: Thu, 12 May 2022 09:39:52 +1000 Subject: [PATCH 20/21] Delete config.h --- keyboards/idobao/montex/v1rgb/keymaps/via/config.h | 8 -------- 1 file changed, 8 deletions(-) delete mode 100755 keyboards/idobao/montex/v1rgb/keymaps/via/config.h diff --git a/keyboards/idobao/montex/v1rgb/keymaps/via/config.h b/keyboards/idobao/montex/v1rgb/keymaps/via/config.h deleted file mode 100755 index 29d0e53f7151..000000000000 --- a/keyboards/idobao/montex/v1rgb/keymaps/via/config.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#if defined(RGB_MATRIX_ENABLE) - #define VIA_QMK_RGBLIGHT_ENABLE -#endif From f8bfb3928c35003d6a3f0558e8c20afa9f547e42 Mon Sep 17 00:00:00 2001 From: Vino Rodrigues Date: Wed, 18 May 2022 10:39:26 +1000 Subject: [PATCH 21/21] RESET -> QK_BOOT --- .../montex/v1rgb/keymaps/default/keymap.c | 12 ++++++------ .../idobao/montex/v1rgb/keymaps/via/keymap.c | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c index 87849def395d..e4b9b2b1807a 100755 --- a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c +++ b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c @@ -5,7 +5,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* - * ┌───┌───┬───┬───┬───┐ + * ┌───┬───┬───┬───┬───┐ * │Esc│Tab│ F1│Cal│Bsp│ * ├───┼───┼───┼───┼───┤ * │Ctr│Num│ / │ * │ - │ @@ -29,22 +29,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* - * ┌───┌───┐───┬───┬───┐ + * ┌───┬───┬───┬───┬───┐ * │Rst│TOG│MOD│PSc│SLk│ - * ├───┼───┘───┼───┼───┤ + * ├───┼───┼───┼───┼───┤ * │Hu+│ │Sp-│Sp+│Br-│ * ├───┼───┼───┼───┼───┤ * │Hu-│Hom│ ↑ │PgU│ │ * ├───┼───┼───┼───┤Br+│ * │St+│ ← │ │ → │ │ - * ├───┼───┼───┼───┤───┤ + * ├───┼───┼───┼───┼───┤ * │St-│End│ ↓ │PgD│ │ * ├───┼───┴───┼───┤Ent│ * │mo1│Insert │Del│ │ - * └───┴───────┴───┘───┘ + * └───┴───────┴───┴───┘ */ [1] = LAYOUT_numpad_6x5( - RESET, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK, + QK_BOOT, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK, RGB_HUI, XXXXXXX, RGB_SPD, RGB_SPI, RGB_VAD, RGB_HUD, KC_HOME, KC_UP, KC_PGUP, RGB_VAI, RGB_SAI, KC_LEFT, XXXXXXX, KC_RGHT, diff --git a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c index 5e45679ea974..7a48d6faee34 100755 --- a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c +++ b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c @@ -36,22 +36,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* - * ┌───┌───┐───┬───┬───┐ + * ┌───┬───┬───┬───┬───┐ * │Rst│TOG│MOD│PSs│SLk│ - * ├───┼───┘───┼───┼───┤ + * ├───┼───┼───┼───┼───┤ * │Hu+│ │Sp-│Sp+│Br-│ * ├───┼───┼───┼───┼───┤ * │Hu-│Hom│ ↑ │PgU│ │ * ├───┼───┼───┼───┤Br+│ * │St+│ ← │ │ → │ │ - * ├───┼───┼───┼───┤───┤ + * ├───┼───┼───┼───├───┤ * │St-│End│ ↓ │PgD│ │ * ├───┼───┴───┼───┤Ent│ * │mo1│Insert │Del│ │ - * └───┴───────┴───┘───┘ + * └───┴───────┴───┴───┘ */ [_FN] = LAYOUT_numpad_6x5( - RESET, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK, + QK_BOOT, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK, RGB_HUI, XXXXXXX, RGB_SPD, RGB_SPI, RGB_VAD, RGB_HUD, KC_HOME, KC_UP, KC_PGUP, RGB_VAI, RGB_SAI, KC_LEFT, XXXXXXX, KC_RGHT, @@ -60,19 +60,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* - * ┌───┌───┐───┬───┬───┐ + * ┌───┬───┬───┬───┬───┐ * │ │ │ │ │ │ - * ├───┼───┘───┼───┼───┤ + * ├───┼───┼───┼───┼───┤ * │ │ │ │ │ │ * ├───┼───┼───┼───┼───┤ * │ │ │ │ │ │ * ├───┼───┼───┼───┤ │ * │ │ │ │ │ │ - * ├───┼───┼───┼───┤───┤ + * ├───┼───┼───┼───├───┤ * │ │ │ │ │ │ * ├───┼───┴───┼───┤ │ * │ │ │ │ │ - * └───┴───────┴───┘───┘ + * └───┴───────┴───┴───┘ */ [_EMPTY2] = LAYOUT_numpad_6x5( _______, _______, _______, _______, _______,