Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mtdjr userspace changes and Nyquist keymap addition #3940

Merged
merged 4 commits into from
Sep 26, 2018
Merged

mtdjr userspace changes and Nyquist keymap addition #3940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4dc4238
holefully correct error in mtdjr userspace for layer_state_set_user
mtdjr Jul 29, 2018
c48f898
return state and wrap rgb actions in their own conditional
mtdjr Jul 29, 2018
116024f
mtdjr nyquist and userspace updates
mtdjr Sep 19, 2018
4045b8d
mtdjr updates as requested
mtdjr Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions keyboards/nyquist/keymaps/mtdjr/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 64 additions & 0 deletions keyboards/nyquist/keymaps/mtdjr/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 0 deletions keyboards/nyquist/keymaps/mtdjr/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
RGBLIGHT_ENABLE = yes
BACKLIGHT_ENABLE = yes
12 changes: 9 additions & 3 deletions users/mtdjr/mtdjr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#endif

#ifndef RGB_MODE
#define RGB_MODE 16
#define RGB_MODE 2
#endif
#ifndef RGB_HUE
#define RGB_HUE 285
Expand Down Expand Up @@ -137,21 +137,27 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
};

uint32_t layer_state_set_user(uint32_t state) {
#ifdef RGBLIGHT_ENABLE
switch (biton32(state)) {
case _RAISE:
#ifdef RGBLIGHT_ENABLE
rgblight_sethsv_noeeprom (240, 255, 255);
#endif
break;
case _LOWER:
#ifdef RGBLIGHT_ENABLE
rgblight_sethsv_noeeprom (0, 255, 255);
#endif
break;
case _ADJUST:
#ifdef RGBLIGHT_ENABLE
rgblight_sethsv_noeeprom (0, 0, 255);
#endif
break;
default:
#ifdef RGBLIGHT_ENABLE
rgblight_sethsv_noeeprom (RGB_HUE, 255, 255);
#endif
break;
}
return state;
#endif
}
2 changes: 1 addition & 1 deletion users/mtdjr/mtdjr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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