From 2b754898c6e471ed134aa81ef121705bfbaf5980 Mon Sep 17 00:00:00 2001 From: Felix Jen Date: Fri, 10 Sep 2021 15:11:38 -0700 Subject: [PATCH 1/6] added QMK stuff, need to fill in company name --- keyboards/fjlabs/mk61-rgb-ansi/config.h | 121 ++++++++++++++++++ .../fjlabs/mk61-rgb-ansi/default/keymap.c | 40 ++++++ keyboards/fjlabs/mk61-rgb-ansi/info.json | 76 +++++++++++ .../fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.c | 14 ++ .../fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.h | 32 +++++ keyboards/fjlabs/mk61-rgb-ansi/readme.md | 14 ++ keyboards/fjlabs/mk61-rgb-ansi/rules.mk | 28 ++++ keyboards/fjlabs/mk61-rgb-ansi/via/keymap.c | 58 +++++++++ keyboards/fjlabs/mk61-rgb-ansi/via/rules.mk | 1 + 9 files changed, 384 insertions(+) create mode 100644 keyboards/fjlabs/mk61-rgb-ansi/config.h create mode 100644 keyboards/fjlabs/mk61-rgb-ansi/default/keymap.c create mode 100644 keyboards/fjlabs/mk61-rgb-ansi/info.json create mode 100644 keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.c create mode 100644 keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.h create mode 100644 keyboards/fjlabs/mk61-rgb-ansi/readme.md create mode 100644 keyboards/fjlabs/mk61-rgb-ansi/rules.mk create mode 100644 keyboards/fjlabs/mk61-rgb-ansi/via/keymap.c create mode 100644 keyboards/fjlabs/mk61-rgb-ansi/via/rules.mk diff --git a/keyboards/fjlabs/mk61-rgb-ansi/config.h b/keyboards/fjlabs/mk61-rgb-ansi/config.h new file mode 100644 index 000000000000..10a87066ceae --- /dev/null +++ b/keyboards/fjlabs/mk61-rgb-ansi/config.h @@ -0,0 +1,121 @@ +/* +Copyright 2021 + +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 + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x7074 // FJLabs +#define PRODUCT_ID 0x1011 // mk61-rgb-ansi +#define DEVICE_VER 0x0001 // Version 1 +#define MANUFACTURER [FILL] +#define PRODUCT MK61-RGB-ANSI + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +/* + * 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) + * +*/ + +// Checked with Eagle Schematic +#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 } +#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Define RGB Underglow */ +#define RGB_DI_PIN F7 +#define RGBLED_NUM 64 +#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 RGBLIGHT_EFFECT_TWINKLE +#define RGBLIGHT_LIMIT_VAL 108 +#define RGB_VAL_STEP 12 +#define RGBLIGHT_DEFAULT_SPD 144 +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL +/* #define RGBLIGHT_LAYER_BLINK*/ + +/* Define less important options */ + +/* + * 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 +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION diff --git a/keyboards/fjlabs/mk61-rgb-ansi/default/keymap.c b/keyboards/fjlabs/mk61-rgb-ansi/default/keymap.c new file mode 100644 index 000000000000..7873f0e5e5b5 --- /dev/null +++ b/keyboards/fjlabs/mk61-rgb-ansi/default/keymap.c @@ -0,0 +1,40 @@ +/* +Copyright 2021 +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 + +enum layers { + _LAYER0, + _LAYER1, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_LAYER0] = LAYOUT_60_ansi( + 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_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTRL + ), + + [_LAYER1] = LAYOUT_60_ansi( + KC_GESC, 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_PAUSE, RESET, + KC_TRNS, RGB_SPI, RGB_SPD, 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, NK_TOGG, 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 + ) + +}; \ No newline at end of file diff --git a/keyboards/fjlabs/mk61-rgb-ansi/info.json b/keyboards/fjlabs/mk61-rgb-ansi/info.json new file mode 100644 index 000000000000..6ce3c579bf46 --- /dev/null +++ b/keyboards/fjlabs/mk61-rgb-ansi/info.json @@ -0,0 +1,76 @@ +{ + "keyboard_name": "MK61-RGB-ANSI", + "url": "https://www.fjlaboratories.com/", + "maintainer": "[FILL]", + "layouts": { + "LAYOUT_60_ansi": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0}, + {"x": 5, "y": 0}, + {"x": 6, "y": 0}, + {"x": 7, "y": 0}, + {"x": 8, "y": 0}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0, "w": 2}, + + {"x": 0, "y": 1, "w": 1.5}, + {"x": 1.5, "y": 1}, + {"x": 2.5, "y": 1}, + {"x": 3.5, "y": 1}, + {"x": 4.5, "y": 1}, + {"x": 5.5, "y": 1}, + {"x": 6.5, "y": 1}, + {"x": 7.5, "y": 1}, + {"x": 8.5, "y": 1}, + {"x": 9.5, "y": 1}, + {"x": 10.5, "y": 1}, + {"x": 11.5, "y": 1}, + {"x": 12.5, "y": 1}, + {"x": 13.5, "y": 1, "w": 1.5}, + + {"x": 0, "y": 2, "w": 1.75}, + {"x": 1.75, "y": 2}, + {"x": 2.75, "y": 2}, + {"x": 3.75, "y": 2}, + {"x": 4.75, "y": 2}, + {"x": 5.75, "y": 2}, + {"x": 6.75, "y": 2}, + {"x": 7.75, "y": 2}, + {"x": 8.75, "y": 2}, + {"x": 9.75, "y": 2}, + {"x": 10.75, "y": 2}, + {"x": 11.75, "y": 2}, + {"x": 12.75, "y": 2, "w": 2.25}, + + {"x": 0, "y": 3, "w": 2.25}, + {"x": 2.25, "y": 3}, + {"x": 3.25, "y": 3}, + {"x": 4.25, "y": 3}, + {"x": 5.25, "y": 3}, + {"x": 6.25, "y": 3}, + {"x": 7.25, "y": 3}, + {"x": 8.25, "y": 3}, + {"x": 9.25, "y": 3}, + {"x": 10.25, "y": 3}, + {"x": 11.25, "y": 3}, + {"x": 12.25, "y": 3, "w": 2.75}, + + {"x": 0, "y": 4, "w": 1.25}, + {"x": 1.25, "y": 4, "w": 1.25}, + {"x": 2.5, "y": 4, "w": 1.25}, + {"x": 3.75, "y": 4, "w": 6.25}, + {"x": 10, "y": 4, "w": 1.25}, + {"x": 11.25, "y": 4, "w": 1.25}, + {"x": 12.5, "y": 4, "w": 1.25}, + {"x": 13.75, "y": 4, "w": 1.25} + ] + } + } +} diff --git a/keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.c b/keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.c new file mode 100644 index 000000000000..1f1c95511fc5 --- /dev/null +++ b/keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.c @@ -0,0 +1,14 @@ +/* +Copyright 2021 +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 "mk61-rgb-ansi.h" diff --git a/keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.h b/keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.h new file mode 100644 index 000000000000..64b4be4b7b8f --- /dev/null +++ b/keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.h @@ -0,0 +1,32 @@ +/* +Copyright 2021 +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 + +#include "quantum.h" + +/* MK61-RGB-ANSI Keymap Definitions */ +#define LAYOUT_60_ansi( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, \ + K40, K41, K42, K45, K49, K4A, K4C, K4D \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, K3C, KC_NO }, \ + { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C, K4D } \ +} diff --git a/keyboards/fjlabs/mk61-rgb-ansi/readme.md b/keyboards/fjlabs/mk61-rgb-ansi/readme.md new file mode 100644 index 000000000000..6f52bb75456b --- /dev/null +++ b/keyboards/fjlabs/mk61-rgb-ansi/readme.md @@ -0,0 +1,14 @@ +# [FILL] MK61-RGB-ANSI + +The following is the QMK Firmware for the [FILL] MK61-RGB-ANSI PCB. + +--- + +* Keyboard Maintainer: [FILL] +* Hardware Supported: MK61-RGB-ANSI + +Make example for this keyboard (after setting up your build environment): + + make fjlabs/mk61-rgb-ansi:default + +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). You can enter the bootloader by pressing the reset button on the back of the PCB. diff --git a/keyboards/fjlabs/mk61-rgb-ansi/rules.mk b/keyboards/fjlabs/mk61-rgb-ansi/rules.mk new file mode 100644 index 000000000000..e6608c16b64f --- /dev/null +++ b/keyboards/fjlabs/mk61-rgb-ansi/rules.mk @@ -0,0 +1,28 @@ +# MCU name +MCU = atmega32u4 + +# Processor frequency +F_CPU = 8000000 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey 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 +KEYBOARD_LOCK_ENABLE = yes + +LAYOUTS = 60_ansi diff --git a/keyboards/fjlabs/mk61-rgb-ansi/via/keymap.c b/keyboards/fjlabs/mk61-rgb-ansi/via/keymap.c new file mode 100644 index 000000000000..2e4dac7fc2de --- /dev/null +++ b/keyboards/fjlabs/mk61-rgb-ansi/via/keymap.c @@ -0,0 +1,58 @@ +/* +Copyright 2021 +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 + +enum layers { + _LAYER0, + _LAYER1, + _LAYER2, + _LAYER3, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_LAYER0] = LAYOUT_60_ansi( + 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_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTRL + ), + + [_LAYER1] = LAYOUT_60_ansi( + KC_GESC, 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_PAUSE, RESET, + KC_TRNS, RGB_SPI, RGB_SPD, 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, NK_TOGG, 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 + ), + + [_LAYER2] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [_LAYER3] = LAYOUT_60_ansi( + 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, 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, 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 + ), + +}; diff --git a/keyboards/fjlabs/mk61-rgb-ansi/via/rules.mk b/keyboards/fjlabs/mk61-rgb-ansi/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/fjlabs/mk61-rgb-ansi/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From dc7fc4b0d79ca3a545bc973b383f6eeba38263f8 Mon Sep 17 00:00:00 2001 From: Felix Jen Date: Fri, 10 Sep 2021 16:40:30 -0700 Subject: [PATCH 2/6] added company name --- keyboards/fjlabs/mk61-rgb-ansi/config.h | 2 +- keyboards/fjlabs/mk61-rgb-ansi/info.json | 2 +- keyboards/fjlabs/mk61-rgb-ansi/readme.md | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/fjlabs/mk61-rgb-ansi/config.h b/keyboards/fjlabs/mk61-rgb-ansi/config.h index 10a87066ceae..2d6fc52c62e2 100644 --- a/keyboards/fjlabs/mk61-rgb-ansi/config.h +++ b/keyboards/fjlabs/mk61-rgb-ansi/config.h @@ -23,7 +23,7 @@ along with this program. If not, see . #define VENDOR_ID 0x7074 // FJLabs #define PRODUCT_ID 0x1011 // mk61-rgb-ansi #define DEVICE_VER 0x0001 // Version 1 -#define MANUFACTURER [FILL] +#define MANUFACTURER Mechanical Keyboards, LLC #define PRODUCT MK61-RGB-ANSI /* key matrix size */ diff --git a/keyboards/fjlabs/mk61-rgb-ansi/info.json b/keyboards/fjlabs/mk61-rgb-ansi/info.json index 6ce3c579bf46..486ac53ad8f4 100644 --- a/keyboards/fjlabs/mk61-rgb-ansi/info.json +++ b/keyboards/fjlabs/mk61-rgb-ansi/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "MK61-RGB-ANSI", "url": "https://www.fjlaboratories.com/", - "maintainer": "[FILL]", + "maintainer": "Mechanical Keyboards, LLC", "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/fjlabs/mk61-rgb-ansi/readme.md b/keyboards/fjlabs/mk61-rgb-ansi/readme.md index 6f52bb75456b..6425f0940655 100644 --- a/keyboards/fjlabs/mk61-rgb-ansi/readme.md +++ b/keyboards/fjlabs/mk61-rgb-ansi/readme.md @@ -1,10 +1,10 @@ -# [FILL] MK61-RGB-ANSI +# Mechanical Keyboards, LLC MK61-RGB-ANSI -The following is the QMK Firmware for the [FILL] MK61-RGB-ANSI PCB. +The following is the QMK Firmware for the Mechanical Keyboards, LLC MK61-RGB-ANSI PCB. --- -* Keyboard Maintainer: [FILL] +* Keyboard Maintainer: Mechanical Keyboards, LLC * Hardware Supported: MK61-RGB-ANSI Make example for this keyboard (after setting up your build environment): From 3270d5090f870b87723281558b10775244e2753e Mon Sep 17 00:00:00 2001 From: Felix Jen Date: Fri, 10 Sep 2021 16:52:41 -0700 Subject: [PATCH 3/6] changed names to compile properly --- keyboards/fjlabs/{mk61-rgb-ansi => mk61rgbansi}/config.h | 2 +- keyboards/fjlabs/{mk61-rgb-ansi => mk61rgbansi}/info.json | 0 .../{mk61-rgb-ansi => mk61rgbansi/keymaps}/default/keymap.c | 0 .../{mk61-rgb-ansi => mk61rgbansi/keymaps}/via/keymap.c | 0 .../{mk61-rgb-ansi => mk61rgbansi/keymaps}/via/rules.mk | 0 .../mk61-rgb-ansi.c => mk61rgbansi/mk61rgbansi.c} | 5 ++--- .../mk61-rgb-ansi.h => mk61rgbansi/mk61rgbansi.h} | 0 keyboards/fjlabs/{mk61-rgb-ansi => mk61rgbansi}/readme.md | 0 keyboards/fjlabs/{mk61-rgb-ansi => mk61rgbansi}/rules.mk | 0 9 files changed, 3 insertions(+), 4 deletions(-) rename keyboards/fjlabs/{mk61-rgb-ansi => mk61rgbansi}/config.h (98%) rename keyboards/fjlabs/{mk61-rgb-ansi => mk61rgbansi}/info.json (100%) rename keyboards/fjlabs/{mk61-rgb-ansi => mk61rgbansi/keymaps}/default/keymap.c (100%) rename keyboards/fjlabs/{mk61-rgb-ansi => mk61rgbansi/keymaps}/via/keymap.c (100%) rename keyboards/fjlabs/{mk61-rgb-ansi => mk61rgbansi/keymaps}/via/rules.mk (100%) rename keyboards/fjlabs/{mk61-rgb-ansi/mk61-rgb-ansi.c => mk61rgbansi/mk61rgbansi.c} (89%) rename keyboards/fjlabs/{mk61-rgb-ansi/mk61-rgb-ansi.h => mk61rgbansi/mk61rgbansi.h} (100%) rename keyboards/fjlabs/{mk61-rgb-ansi => mk61rgbansi}/readme.md (100%) rename keyboards/fjlabs/{mk61-rgb-ansi => mk61rgbansi}/rules.mk (100%) diff --git a/keyboards/fjlabs/mk61-rgb-ansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h similarity index 98% rename from keyboards/fjlabs/mk61-rgb-ansi/config.h rename to keyboards/fjlabs/mk61rgbansi/config.h index 2d6fc52c62e2..4d459b6f8896 100644 --- a/keyboards/fjlabs/mk61-rgb-ansi/config.h +++ b/keyboards/fjlabs/mk61rgbansi/config.h @@ -23,7 +23,7 @@ along with this program. If not, see . #define VENDOR_ID 0x7074 // FJLabs #define PRODUCT_ID 0x1011 // mk61-rgb-ansi #define DEVICE_VER 0x0001 // Version 1 -#define MANUFACTURER Mechanical Keyboards, LLC +#define MANUFACTURER Mechanical Keyboards LLC #define PRODUCT MK61-RGB-ANSI /* key matrix size */ diff --git a/keyboards/fjlabs/mk61-rgb-ansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json similarity index 100% rename from keyboards/fjlabs/mk61-rgb-ansi/info.json rename to keyboards/fjlabs/mk61rgbansi/info.json diff --git a/keyboards/fjlabs/mk61-rgb-ansi/default/keymap.c b/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c similarity index 100% rename from keyboards/fjlabs/mk61-rgb-ansi/default/keymap.c rename to keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c diff --git a/keyboards/fjlabs/mk61-rgb-ansi/via/keymap.c b/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c similarity index 100% rename from keyboards/fjlabs/mk61-rgb-ansi/via/keymap.c rename to keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c diff --git a/keyboards/fjlabs/mk61-rgb-ansi/via/rules.mk b/keyboards/fjlabs/mk61rgbansi/keymaps/via/rules.mk similarity index 100% rename from keyboards/fjlabs/mk61-rgb-ansi/via/rules.mk rename to keyboards/fjlabs/mk61rgbansi/keymaps/via/rules.mk diff --git a/keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.c b/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.c similarity index 89% rename from keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.c rename to keyboards/fjlabs/mk61rgbansi/mk61rgbansi.c index 1f1c95511fc5..5bf82ad44370 100644 --- a/keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.c +++ b/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.c @@ -1,5 +1,4 @@ -/* -Copyright 2021 +/* Copyright 2021 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 @@ -11,4 +10,4 @@ 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 "mk61-rgb-ansi.h" +#include "mk61rgbansi.h" diff --git a/keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.h b/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.h similarity index 100% rename from keyboards/fjlabs/mk61-rgb-ansi/mk61-rgb-ansi.h rename to keyboards/fjlabs/mk61rgbansi/mk61rgbansi.h diff --git a/keyboards/fjlabs/mk61-rgb-ansi/readme.md b/keyboards/fjlabs/mk61rgbansi/readme.md similarity index 100% rename from keyboards/fjlabs/mk61-rgb-ansi/readme.md rename to keyboards/fjlabs/mk61rgbansi/readme.md diff --git a/keyboards/fjlabs/mk61-rgb-ansi/rules.mk b/keyboards/fjlabs/mk61rgbansi/rules.mk similarity index 100% rename from keyboards/fjlabs/mk61-rgb-ansi/rules.mk rename to keyboards/fjlabs/mk61rgbansi/rules.mk From 5dea6ee4a3d81cdf538122356e768e9281a8f05d Mon Sep 17 00:00:00 2001 From: Felix Jen Date: Sat, 25 Sep 2021 12:44:02 -0500 Subject: [PATCH 4/6] unflipped macro --- keyboards/fjlabs/mk61rgbansi/mk61rgbansi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.h b/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.h index 64b4be4b7b8f..8ab4873e084e 100644 --- a/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.h +++ b/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.h @@ -25,8 +25,8 @@ along with this program. If not, see . K40, K41, K42, K45, K49, K4A, K4C, K4D \ ) { \ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, K3C, KC_NO }, \ { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C, K4D } \ } From 93d6ed22c100d06a0f4a708527e54ba1a83deb0f Mon Sep 17 00:00:00 2001 From: Felix Jen Date: Thu, 14 Oct 2021 18:30:49 -0500 Subject: [PATCH 5/6] Apply suggestions from code review Co-authored-by: Drashna Jaelre --- keyboards/fjlabs/mk61rgbansi/rules.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/fjlabs/mk61rgbansi/rules.mk b/keyboards/fjlabs/mk61rgbansi/rules.mk index e6608c16b64f..dbd20b9e1e5e 100644 --- a/keyboards/fjlabs/mk61rgbansi/rules.mk +++ b/keyboards/fjlabs/mk61rgbansi/rules.mk @@ -10,7 +10,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug @@ -21,8 +21,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey 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 -KEYBOARD_LOCK_ENABLE = yes LAYOUTS = 60_ansi From 2a745f898c63b47bc6402ca2f316fd0e91c4c131 Mon Sep 17 00:00:00 2001 From: Felix Jen Date: Thu, 14 Oct 2021 20:44:57 -0500 Subject: [PATCH 6/6] Update keyboards/fjlabs/mk61rgbansi/info.json Co-authored-by: Ryan --- keyboards/fjlabs/mk61rgbansi/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json index 486ac53ad8f4..84cc8a46aed6 100644 --- a/keyboards/fjlabs/mk61rgbansi/info.json +++ b/keyboards/fjlabs/mk61rgbansi/info.json @@ -69,7 +69,7 @@ {"x": 10, "y": 4, "w": 1.25}, {"x": 11.25, "y": 4, "w": 1.25}, {"x": 12.5, "y": 4, "w": 1.25}, - {"x": 13.75, "y": 4, "w": 1.25} + {"x": 13.75, "y": 4, "w": 1.25} ] } }