summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtdjr <mtdjr@users.noreply.github.com>2018-09-26 15:23:30 -0400
committerDrashna Jaelre <drashna@live.com>2018-09-26 12:23:30 -0700
commit96648a133de7f297157b7d447be59354c1200c09 (patch)
tree3960c496d673a807752207f4d49ad7d2cf408cf8
parentdbdbbbd5c9b1458f682eec661d0a17f91dccb4dc (diff)
Keymap: mtdjr userspace changes and Nyquist keymap addition (#3940)
* 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
-rw-r--r--keyboards/nyquist/keymaps/mtdjr/config.h36
-rw-r--r--keyboards/nyquist/keymaps/mtdjr/keymap.c64
-rw-r--r--keyboards/nyquist/keymaps/mtdjr/rules.mk2
-rw-r--r--users/mtdjr/mtdjr.c2
-rw-r--r--users/mtdjr/mtdjr.h2
5 files changed, 104 insertions, 2 deletions
diff --git a/keyboards/nyquist/keymaps/mtdjr/config.h b/keyboards/nyquist/keymaps/mtdjr/config.h
new file mode 100644
index 0000000000..0fa606f296
--- /dev/null
+++ b/keyboards/nyquist/keymaps/mtdjr/config.h
@@ -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
diff --git a/keyboards/nyquist/keymaps/mtdjr/keymap.c b/keyboards/nyquist/keymaps/mtdjr/keymap.c
new file mode 100644
index 0000000000..668e7964b5
--- /dev/null
+++ b/keyboards/nyquist/keymaps/mtdjr/keymap.c
@@ -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
+// '-----------------------------' '-----------------------------'
+)
+
+};
diff --git a/keyboards/nyquist/keymaps/mtdjr/rules.mk b/keyboards/nyquist/keymaps/mtdjr/rules.mk
new file mode 100644
index 0000000000..d7463419b4
--- /dev/null
+++ b/keyboards/nyquist/keymaps/mtdjr/rules.mk
@@ -0,0 +1,2 @@
+RGBLIGHT_ENABLE = yes
+BACKLIGHT_ENABLE = yes
diff --git a/users/mtdjr/mtdjr.c b/users/mtdjr/mtdjr.c
index d8d6871a17..c31b077b46 100644
--- a/users/mtdjr/mtdjr.c
+++ b/users/mtdjr/mtdjr.c
@@ -5,7 +5,7 @@
#endif
#ifndef RGB_MODE
- #define RGB_MODE 16
+ #define RGB_MODE 2
#endif
#ifndef RGB_HUE
#define RGB_HUE 285
diff --git a/users/mtdjr/mtdjr.h b/users/mtdjr/mtdjr.h
index 3efcb45ec2..85ca1596dc 100644
--- a/users/mtdjr/mtdjr.h
+++ b/users/mtdjr/mtdjr.h
@@ -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