fern/qmk-firmware
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/qmk_firmware.git synced 2024-11-22 11:30:30 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Keymap: mtdjr userspace changes and Nyquist keymap addition (#3940)

Browse source 
* holefully correct error in mtdjr userspace for layer_state_set_user

* return state and wrap rgb actions in their own conditional

* mtdjr nyquist and userspace updates

* mtdjr updates as requested
This commit is contained in:
mtdjr 2018-09-26 15:23:30 -04:00 committed by Drashna Jaelre
parent dbdbbbd5c9
commit 96648a133d
5 changed files with 104 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
keyboards/nyquist/keymaps/mtdjr/config.h Normal file
View file

@ -0,0 +1,36 @@
/*
Copyright 2017 Danny Nguyen <danny@hexwire.com>
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/>.
*/
#pragma once
/* Use I2C or Serial, not both */
#define USE_SERIAL
// #define USE_I2C
/* Select hand configuration */
#define MASTER_LEFT
// #define MASTER_RIGHT
// #define EE_HANDS
#undef RGBLED_NUM
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8

64
keyboards/nyquist/keymaps/mtdjr/keymap.c Normal file
View file

@ -0,0 +1,64 @@
#include QMK_KEYBOARD_H
#include "mtdjr.h"
extern keymap_config_t keymap_config;
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_kc (
// ,-----------------------------. .-----------------------------.
GESC, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,BSPC,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
TAB, Q , W , E , R , T , Y , U , I , O , P ,QUOT,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
RASE, A , S , D , F , G , H , J , K , L ,SCLN, ENT,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
LSFT, Z , X , C , V , B , N , M ,COMM, DOT,SLSH,xxxx,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
LOWR,LCTL,LALT,LGUI, SPC, SPC, SPC, SPC,LEFT,DOWN, UP ,RGHT
// '-----------------------------' '-----------------------------'
),
[_LOWER] = LAYOUT_kc(
// ,-----------------------------. .-----------------------------.
TILD,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,UNDS,PLUS, DEL,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,LBRC,RBRC,BSLS,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx, ,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
xxxx,UNDO, CUT,XCPY,XINS,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
, , , , , , , ,MNXT,VOLD,VOLU,MPLY
// '-----------------------------' '-----------------------------'
),
[_RAISE] = LAYOUT_kc(
// ,-----------------------------. .-----------------------------.
xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,MINS, EQL, ,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,LCBR,RCBR,PIPE,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx, ,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
, , , , , , , ,MNXT,VOLD,VOLU,MPLY
// '-----------------------------' '-----------------------------'
),
[_ADJUST] = LAYOUT_kc(
// ,-----------------------------. .-----------------------------.
xxxx,ROOT,PPLY,PSEF,xxxx,xxxx, F1 , F2 , F3 , F4 , F5 , F6 ,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
xxxx,xxxx,xxxx,xxxx, RST,xxxx, F7 , F8 , F9 , F10, F11, F12,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
, RGB,RHUI,RSAI,RVAI, MOD, xxxx,xxxx,xxxx,xxxx,xxxx, ,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
xxxx,RBTH,RHUD,RSAD,RVAD,RMOD, xxxx,xxxx,xxxx,xxxx,xxxx, BLB,
// |----+----+----+----+----+----| |----+----+----+----+----+----|
,xxxx,xxxx,xxxx, , , , ,BLOF, BLD, BLI,BLON
// '-----------------------------' '-----------------------------'
)
};

2
keyboards/nyquist/keymaps/mtdjr/rules.mk Normal file
View file

@ -0,0 +1,2 @@
RGBLIGHT_ENABLE = yes
BACKLIGHT_ENABLE = yes

2
users/mtdjr/mtdjr.c
View file

@ -5,7 +5,7 @@
#endif
#ifndef RGB_MODE
#define RGB_MODE 16
#define RGB_MODE 2
#endif
#ifndef RGB_HUE
#define RGB_HUE 285

2
users/mtdjr/mtdjr.h
View file

@ -95,7 +95,7 @@ enum user_tapdance {
#define KC_BLD BL_DEC
#define KC_BLB BL_BRTG
#define KC_BLON BL_ON
#define KB_BLOF BL_OFF
#define KC_BLOF BL_OFF
#endif