aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h1
-rw-r--r--keyboards/iris/keymaps/mtdjr/config.h10
-rw-r--r--keyboards/iris/keymaps/mtdjr/rules.mk2
-rw-r--r--keyboards/lets_split/keymaps/mtdjr/config.h12
-rw-r--r--keyboards/lets_split/keymaps/mtdjr/keymap.c108
-rw-r--r--keyboards/lets_split/keymaps/mtdjr/rules.mk2
-rw-r--r--keyboards/xd75/keymaps/mtdjr/keymap.c24
-rw-r--r--users/mtdjr/mtdjr.c122
-rw-r--r--users/mtdjr/mtdjr.h85
-rw-r--r--users/mtdjr/solenoid.h14
10 files changed, 202 insertions, 178 deletions
diff --git a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h
index fa6151e10..701c2cf35 100644
--- a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h
+++ b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h
@@ -5,7 +5,6 @@
5 5
6#define SOLENOID_ENABLE 6#define SOLENOID_ENABLE
7#define SOLENOID_PIN F6 7#define SOLENOID_PIN F6
8#undef SOLENOID_ACTIVE
9#define SOLENOID_ACTIVE true 8#define SOLENOID_ACTIVE true
10 9
11#endif 10#endif
diff --git a/keyboards/iris/keymaps/mtdjr/config.h b/keyboards/iris/keymaps/mtdjr/config.h
index 28109d3ab..93dc4c211 100644
--- a/keyboards/iris/keymaps/mtdjr/config.h
+++ b/keyboards/iris/keymaps/mtdjr/config.h
@@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20 20
21#include "config_common.h" 21#include "config_common.h"
22 22
23#define SOLENOID_ENABLE 23//#define SOLENOID_ENABLE
24#define SOLENOID_PIN C6 24//#define SOLENOID_PIN C6
25 25
26/* Use I2C or Serial, not both */ 26/* Use I2C or Serial, not both */
27 27
@@ -32,6 +32,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
32 32
33#define MASTER_LEFT 33#define MASTER_LEFT
34 34
35// #define AUDIO_CLICKY
36// #define AUDIO_CLICKY_ON
37// #define C6_AUDIO
38// #define AUDIO_CLICKY_FREQ_RANDOMNESS 0.1f
39// #define AUDIO_CLICKY_FREQ_MAX 100.0f
40
35// #define MASTER_RIGHT 41// #define MASTER_RIGHT
36// #define EE_HANDS 42// #define EE_HANDS
37 43
diff --git a/keyboards/iris/keymaps/mtdjr/rules.mk b/keyboards/iris/keymaps/mtdjr/rules.mk
index c5e16f136..a1b884e4d 100644
--- a/keyboards/iris/keymaps/mtdjr/rules.mk
+++ b/keyboards/iris/keymaps/mtdjr/rules.mk
@@ -1,6 +1,6 @@
1RGBLIGHT_ENABLE = no 1RGBLIGHT_ENABLE = no
2BACKLIGHT_ENABLE = no 2BACKLIGHT_ENABLE = no
3 3#AUDIO_ENABLE = yes
4ifndef QUANTUM_DIR 4ifndef QUANTUM_DIR
5 include ../../../../Makefile 5 include ../../../../Makefile
6endif 6endif
diff --git a/keyboards/lets_split/keymaps/mtdjr/config.h b/keyboards/lets_split/keymaps/mtdjr/config.h
index 2b5a19365..afbf73569 100644
--- a/keyboards/lets_split/keymaps/mtdjr/config.h
+++ b/keyboards/lets_split/keymaps/mtdjr/config.h
@@ -26,14 +26,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
26#define SOLENOID_ENABLE 26#define SOLENOID_ENABLE
27#define SOLENOID_PIN F4 27#define SOLENOID_PIN F4
28 28
29#undef RGBLED_NUM
30#define RGBLIGHT_ANIMATIONS
31#define RGBLED_NUM 8
32
29/* Use I2C or Serial, not both */ 33/* Use I2C or Serial, not both */
30 34
31// #define USE_SERIAL 35#define USE_SERIAL
32 #define USE_I2C 36// #define USE_I2C
33/* Select hand configuration */ 37/* Select hand configuration */
34 38
35// #define MASTER_LEFT 39 #define MASTER_LEFT
36// #define _MASTER_RIGHT 40// #define _MASTER_RIGHT
37#define EE_HANDS 41// #define EE_HANDS
38 42
39#endif 43#endif
diff --git a/keyboards/lets_split/keymaps/mtdjr/keymap.c b/keyboards/lets_split/keymaps/mtdjr/keymap.c
index 72476c700..47972fcd3 100644
--- a/keyboards/lets_split/keymaps/mtdjr/keymap.c
+++ b/keyboards/lets_split/keymaps/mtdjr/keymap.c
@@ -3,79 +3,53 @@
3 3
4extern keymap_config_t keymap_config; 4extern keymap_config_t keymap_config;
5 5
6
7const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
8 7
9 /* Qwerty 8 [_QWERTY] = LAYOUT_kc(
10 * ,-----------------------------------------. ,-----------------------------------------. 9// ,-----------------------------. .-----------------------------.
11 * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp | 10 TAB, Q , W , E , R , T , Y , U , I , O , P ,BSPC,
12 * |------+------+------+------+------+------| |------+------+------+------+------+------| 11// |----+----+----+----+----+----| |----+----+----+----+----+----|
13 * |Esc/~ | A | S | D | F | G | | H | J | K | L | ; | '/" | 12 EXC, A , S , D , F , G , H , J , K , L ,SCLN,QUOT,
14 * |------+------+------+------+------+------| |------+------+------+------+------+------| 13// |----+----+----+----+----+----| |----+----+----+----+----+----|
15 * | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter | 14 LSFT, Z , X , C , V , B , N , M ,COMM, DOT,SLSH, ENT,
16 * |------+------+------+------+------+------| |------+------+------+------+------+------| 15// |----+----+----+----+----+----| |----+----+----+----+----+----|
17 * |Adjust| Ctrl | Alt | GUI |Lower |Space | |Space |Raise | Left | Up | Down |Right | 16 LOWR,LCTL,LALT,LGUI,LOWR, SPC, SPC,RASE,LEFT,DOWN, UP ,RGHT
18 * `-----------------------------------------' '-----------------------------------------' 17// '-----------------------------' '-----------------------------'
19 */
20 [_QWERTY] = LAYOUT( \
21 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
22 KC_EXC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
23 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
24 ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT \
25 ), 18 ),
26 19
27 /* Lower 20 [_LOWER] = LAYOUT_kc(
28 * ,-----------------------------------------. ,-----------------------------------------. 21// ,-----------------------------. .-----------------------------.
29 * | ~ | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | 22 TILD, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , DEL,
30 * |------+------+------+------+------+------| |------+------+------+------+------+------| 23// |----+----+----+----+----+----| |----+----+----+----+----+----|
31 * | | | [ | ] | { | } | | | 4 | 5 | 6 | * | \ | 24 xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,LBRC,RBRC,BSLS,
32 * |------+------+------+------+------+------| |------+------+------+------+------+------| 25// |----+----+----+----+----+----| |----+----+----+----+----+----|
33 * |Shift | | | copy |insert| | | | 1 | 2 | 3 | + | - | 26 ,UNDO, CUT,XCPY,XINS,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx, ,
34 * |------+------+------+------+------+------| |------+------+------+------+------+------| 27// |----+----+----+----+----+----| |----+----+----+----+----+----|
35 * |Adjust| Ctrl | Alt | GUI |Lower |Space | |Space |Raise | 0 | . | = | _ | 28 , , , , , , , , , , ,
36 * `-----------------------------------------' '-----------------------------------------' 29// '-----------------------------' '-----------------------------'
37 */
38 [_LOWER] = LAYOUT( \
39 KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
40 XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, XXXXXXX, KC_4, KC_5, KC_6, KC_ASTR, KC_BSLS, \
41 _______, XXXXXXX, XXXXXXX, KC_XCPY, KC_XINS, XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, KC_PLUS, KC_MINS, \
42 _______, _______, _______, _______, _______, _______, _______, _______, KC_0, KC_DOT, KC_EQL, KC_UNDS \
43 ), 30 ),
44 31
45 32 [_RAISE] = LAYOUT_kc(
46 /* Raise 33// ,-----------------------------. .-----------------------------.
47 * ,-----------------------------------------. ,-----------------------------------------. 34 GRV,EXLM, AT ,HASH, DLR,PERC, CIRC,AMPR,ASTR,LPRN,RPRN, ,
48 * | ` | ! | @ | # | $ | % | | ^ | & | * | ( | ) | Bksp | 35// |----+----+----+----+----+----| |----+----+----+----+----+----|
49 * |------+------+------+------+------+------| |------+------+------+------+------+------| 36 xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, MINS, EQL,xxxx,LCBR,RCBR,PIPE,
50 * | | | | | | | | | | | | \ | | | 37// |----+----+----+----+----+----| |----+----+----+----+----+----|
51 * |------+------+------+------+------+------| |------+------+------+------+------+------| 38 ,xxxx,xxxx,xxxx,xxxx,xxxx, UNDS,PLUS,xxxx,xxxx,xxxx, ,
52 * |Shift | | | | | | | | | | | | | 39// |----+----+----+----+----+----| |----+----+----+----+----+----|
53 * |------+------+------+------+------+------| |------+------+------+------+------+------| 40 , , , , , , , ,MNXT,VOLD,VOLU,MPLY
54 * |Adjust| Ctrl | Alt | GUI |Lower |Space | |Space |Raise | Next | Vol- | Vol+ | Play | 41// '-----------------------------' '-----------------------------'
55 * `-----------------------------------------' '-----------------------------------------'
56 */
57 [_RAISE] = LAYOUT( \
58 KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
59 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_PIPE,\
60 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
61 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
62 ), 42 ),
63 43
64 /* Adjust (Lower + Raise) 44 [_ADJUST] = LAYOUT_kc( \
65 * ,-----------------------------------------. ,-----------------------------------------. 45// ,-----------------------------. .-----------------------------.
66 * | | Reset| | | | | | ROOT | PPLY | PSEF | | | Del | 46 xxxx,ROOT,PPLY,PSEF,xxxx,xxxx, RST,STOG,xxxx,xxxx,xxxx, DEL,
67 * |------+------+------+------+------+------| |------+------+------+------+------+------| 47// |----+----+----+----+----+----| |----+----+----+----+----+----|
68 * | | | |Aud on|Audoff| | | F1 | F2 | F3 | F4 | F5 | F6 | 48 RGB,RHUI,RSAI,RVAI, MOD,xxxx, F1 , F2 , F3 , F4 , F5 , F6 ,
69 * |------+------+------+------+------+------| |------+------+------+------+------+------| 49// |----+----+----+----+----+----| |----+----+----+----+----+----|
70 * | | UNDO | CUT | COPY |PASTE | | | F7 | F8 | F9 | F10 | F11 | F12 | 50 RBTH,RHUD,RSAD,RVAD,RMOD,xxxx, F7 , F8 , F9 , F10, F11, F12,
71 * |------+------+------+------+------+------| |------+------+------+------+------+------| 51// |----+----+----+----+----+----| |----+----+----+----+----+----|
72 * | | | | | | | | | | Home | | | End | 52 ,xxxx,xxxx,xxxx, ,xxxx, xxxx, ,xxxx,xxxx,xxxx,xxxx
73 * `-----------------------------------------' '-----------------------------------------' 53// '-----------------------------' '-----------------------------'
74 */
75 [_ADJUST] = LAYOUT( \
76 KC_STOG, KC_ROOT, KC_PPLY, KC_PSEF, _______, _______, RESET, _______, _______, _______, _______, KC_DEL, \
77 _______, _______, _______, AU_ON, AU_OFF, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, \
78 _______, KC_UNDO, KC_CUT, KC_XCPY, KC_XINS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \
79 _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, KC_END \
80 ) 54 )
81}; \ No newline at end of file 55};
diff --git a/keyboards/lets_split/keymaps/mtdjr/rules.mk b/keyboards/lets_split/keymaps/mtdjr/rules.mk
index 457a3d01d..75e9c6503 100644
--- a/keyboards/lets_split/keymaps/mtdjr/rules.mk
+++ b/keyboards/lets_split/keymaps/mtdjr/rules.mk
@@ -1,3 +1,5 @@
1ifndef QUANTUM_DIR 1ifndef QUANTUM_DIR
2 include ../../../../Makefile 2 include ../../../../Makefile
3endif 3endif
4
5RGBLIGHT_ENABLE = yes
diff --git a/keyboards/xd75/keymaps/mtdjr/keymap.c b/keyboards/xd75/keymaps/mtdjr/keymap.c
index 28d4b4961..074cf7335 100644
--- a/keyboards/xd75/keymaps/mtdjr/keymap.c
+++ b/keyboards/xd75/keymaps/mtdjr/keymap.c
@@ -1,35 +1,33 @@
1#include QMK_KEYBOARD_H 1#include QMK_KEYBOARD_H
2#include "mtdjr.h" 2#include "mtdjr.h"
3 3
4#define KC_LOCK TD(TD_ENDLOCK)
5
6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 4const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7 5
8 [_QWERTY] = KC_KEYMAP( 6 [_QWERTY] = KC_KEYMAP(
9// .--------------------------------------------------------------------------. 7// .--------------------------------------------------------------------------.
10 EXC, 1 , 2 , 3 , 4 , 5 ,PGUP,xxxx,PGDN, 6 , 7 , 8 , 9 , 0 ,BSPC, 8 EXC, 1 , 2 , 3 , 4 , 5 ,PGUP,MPNT,PGDN, 6 , 7 , 8 , 9 , 0 ,BSPC,
11// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 9// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
12 TAB, Q , W , E , R , T , INS,BSLS, DEL, Y , U , I , O , P ,QUOT, 10 TAB, Q , W , E , R , T , INS,HOME, DEL, Y , U , I , O , P ,QUOT,
13// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 11// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
14 LCTL, A , S , D , F , G ,HOME,PLUS,LOCK, H , J , K , L ,SCLN, ENT, 12 LCTL, A , S , D , F , G , EQL,ELCK,MINS, H , J , K , L ,SCLN, ENT,
15// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 13// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
16 LSFT, Z , X , C , V , B ,LBRC,MINS,RBRC, N , M ,COMM, DOT,SLSH,RSFT, 14 LSFT, Z , X , C , V , B ,LBRC,BSLS,RBRC, N , M ,COMM, DOT,SLSH,ELCK,
17// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 15// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
18 LOWR,LCTL,LALT,LGUI,xxxx, SPC, SPC,RASE,SPC, SPC,xxxx,LEFT,DOWN,UP ,RGHT 16 LOWR,LCTL,LALT,LGUI,xxxx, SPC,LOWR,RASE,xxxx, SPC, APP,LEFT,DOWN, UP,RGHT
19// '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----' 17// '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
20), 18),
21 19
22 [_LOWER] = KC_KEYMAP( 20 [_LOWER] = KC_KEYMAP(
23// .--------------------------------------------------------------------------. 21// .--------------------------------------------------------------------------.
24 xxxx, F1, F2, F3, F4, F5, F6,xxxx, F7, F8, F9, F10, F11, F12, DEL, 22 xxxx, F1 , F2 , F3 , F4 , F5 , F6 ,xxxx, F7 , F8 , F9 , F10, F11, F12, DEL,
25// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 23// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
26 xxxx,ROOT,PPLY,PSEF,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, 24 xxxx,ROOT,PPLY,PSEF,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
27// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 25// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
28 xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, 26 xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,CALC,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
29// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 27// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
30 xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,MUTE, 28 xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,MUTE,
31// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 29// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
32 ,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, ,xxxx,MPLY,xxxx,MPRV,VOLD,VOLU,MNXT 30 ,xxxx,xxxx,xxxx,xxxx,xxxx, , ,xxxx,MPLY,xxxx,MNXT,VOLD,VOLU,MNXT
33// '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----' 31// '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
34), 32),
35 33
@@ -39,11 +37,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 37// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
40 xxxx,xxxx,xxxx,xxxx, RST,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, 38 xxxx,xxxx,xxxx,xxxx, RST,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
41// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 39// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
42 CAPS,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, BLI,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, 40 CAPS,xxxx,xxxx,xxxx,xxxx,xxxx, BLI,xxxx, BLD,xxxx,xxxx,xxxx,XLCK,xxxx,xxxx,
43// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 41// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
44 RGB,RHUI,RHUD,RSAI,RSAD,RVAI,RVAD, BLD,xxxx,xxxx,xxxx,xxxx,BTN1,BTN2,xxxx, 42 RGB,RHUI,RHUD,RSAI,RSAD,RVAI,RVAD,xxxx,xxxx,xxxx,xxxx,xxxx,BTN1,MS_U,BTN2,
45// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| 43// |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
46 ,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, ,xxxx,xxxx,xxxx,MS_L,MS_D,MS_U,MS_R 44 ,xxxx,xxxx,xxxx,xxxx,xxxx, , ,xxxx,xxxx,xxxx,xxxx,MS_L,MS_D,MS_R
47// '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----' 45// '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
48) 46)
49}; 47};
diff --git a/users/mtdjr/mtdjr.c b/users/mtdjr/mtdjr.c
index da4f57047..1d47d88ee 100644
--- a/users/mtdjr/mtdjr.c
+++ b/users/mtdjr/mtdjr.c
@@ -2,20 +2,58 @@
2 2
3#ifdef SOLENOID_ENABLE 3#ifdef SOLENOID_ENABLE
4 #include "solenoid.h" 4 #include "solenoid.h"
5#endif
5 6
6 void solenoid_buzz_on(void); 7#ifndef RGB_MODE
7 void solenoid_buzz_off(void); 8 #define RGB_MODE 16
8 void solenoid_dwell_minus(void); 9#endif
9 void solenoid_dwell_plus(void); 10#ifndef RGB_HUE
10 void solenoid_toggle(void); 11 #define RGB_HUE 285
11 void solenoid_stop(void);
12 void solenoid_fire(void);
13 void solenoid_check(void);
14 void solenoid_setup(void);
15 void matrix_init_user(void);
16 void matrix_scan_user(void);
17#endif 12#endif
18 13
14// Tap Dance Definitions
15qk_tap_dance_action_t tap_dance_actions[] = {
16 [TD_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_ESC),
17 [TD_ALTLOCK] = ACTION_TAP_DANCE_DOUBLE(KC_RALT, LGUI(KC_L)),
18 [TD_ENDLOCK] = ACTION_TAP_DANCE_DOUBLE(KC_END, LGUI(KC_L)),
19 [TD_PRINT] = ACTION_TAP_DANCE_DOUBLE(LGUI(LSFT(KC_3)), LGUI(LSFT(KC_4))),
20};
21
22// Macros
23const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
24 if (record->event.pressed) {
25 switch(id) {
26 case ROOT:
27 SEND_STRING("sudo su -\n");
28 return false; break;
29 case PPLY:
30 SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n");
31 return false; break;
32 case PSEF:
33 SEND_STRING("ps -ef | grep ");
34 return false; break;
35 }
36 }
37 return MACRO_NONE;
38};
39
40void matrix_init_user(void) {
41 #ifdef RGBLIGHT_ENABLE
42 rgblight_enable_noeeprom();
43 rgblight_mode_noeeprom(RGB_MODE);
44 rgblight_sethsv (RGB_HUE, 255, 255);
45 #endif
46 #ifdef SOLENOID_ENABLE
47 solenoid_setup();
48 #endif
49}
50
51void matrix_scan_user(void) {
52 #ifdef SOLENOID_ENABLE
53 solenoid_check();
54 #endif
55}
56
19bool process_record_user(uint16_t keycode, keyrecord_t *record) { 57bool process_record_user(uint16_t keycode, keyrecord_t *record) {
20 #ifdef SOLENOID_ENABLE 58 #ifdef SOLENOID_ENABLE
21 if (record->event.pressed) { 59 if (record->event.pressed) {
@@ -71,7 +109,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
71 if (record->event.pressed) { 109 if (record->event.pressed) {
72 solenoid_dwell_minus(); 110 solenoid_dwell_minus();
73 } 111 }
74 #endif 112 #endif
75 break; 113 break;
76 case SOLENOID_DWELL_PLUS: 114 case SOLENOID_DWELL_PLUS:
77 #ifdef SOLENOID_ENABLE 115 #ifdef SOLENOID_ENABLE
@@ -85,53 +123,35 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
85 if (record->event.pressed) { 123 if (record->event.pressed) {
86 solenoid_buzz_on(); 124 solenoid_buzz_on();
87 } 125 }
88 #endif 126 #endif
89 break; 127 break;
90 case SOLENOID_BUZZ_OFF: 128 case SOLENOID_BUZZ_OFF:
91 #ifdef SOLENOID_ENABLE 129 #ifdef SOLENOID_ENABLE
92 if (record->event.pressed) { 130 if (record->event.pressed) {
93 solenoid_buzz_off(); 131 solenoid_buzz_off();
94 } 132 }
95 #endif 133 #endif
96 break; 134 break;
97 } 135 }
98 return true; 136 return true;
99}; 137};
100 138
101 139uint32_t layer_state_set_user(uint32_t state) {
102//Tap Dance Definitions 140#ifdef RGBLIGHT_ENABLE
103qk_tap_dance_action_t tap_dance_actions[] = { 141 switch (biton32(state)) {
104 [TD_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_ESC), 142 case _RAISE:
105 [TD_ALTLOCK] = ACTION_TAP_DANCE_DOUBLE(KC_RALT, LGUI(KC_L)), 143 rgblight_sethsv_noeeprom (240, 255, 255);
106 [TD_ENDLOCK] = ACTION_TAP_DANCE_DOUBLE(KC_END, LGUI(KC_L)), 144 break;
107 //[TD_PRNT] = ACTION_TAP_DANCE_DOUBLE(PRINT, PRINT_SEL) 145 case _LOWER:
108}; 146 rgblight_sethsv_noeeprom (0, 255, 255);
109 147 break;
110const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { 148 case _ADJUST:
111 if (record->event.pressed) { 149 rgblight_sethsv_noeeprom (0, 0, 255);
112 switch(id) { 150 break;
113 case 0: 151 default:
114 SEND_STRING("sudo su -\n"); 152 rgblight_sethsv_noeeprom (RGB_HUE, 255, 255);
115 return false; break; 153 break;
116 case 1: 154 }
117 SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n"); 155 return state;
118 return false; break; 156}
119 case 2: 157#endif
120 SEND_STRING("ps -ef | grep ");
121 return false; break;
122 case 3: // control + insert
123 return MACRO(D(LCTL), T(INS), U(LCTL), END);
124 break;
125 case 4: // shift + insert
126 return MACRO(D(LSFT), T(INS), U(LSFT), END);
127 break;
128 case 5: // control + alt + delete
129 return MACRO(D(LCTL), D(RALT), T(DEL), U(LCTL), U(LALT), END);
130 break;
131 case 6: // lgui + L
132 return MACRO(D(LGUI), T(L), U(LGUI), END);
133 break;
134 }
135 }
136 return MACRO_NONE;
137};
diff --git a/users/mtdjr/mtdjr.h b/users/mtdjr/mtdjr.h
index 012a35610..3efcb45ec 100644
--- a/users/mtdjr/mtdjr.h
+++ b/users/mtdjr/mtdjr.h
@@ -3,61 +3,79 @@
3 3
4#include "quantum.h" 4#include "quantum.h"
5 5
6#define _QWERTY 0 6// Layers
7#define _LOWER 1 7enum user_enum {
8#define _RAISE 2 8 // Layers
9#define _SUPER 3
10#define _ADJUST 16
11
12enum user_layers {
13 QWERTY = SAFE_RANGE, 9 QWERTY = SAFE_RANGE,
14 LOWER, 10 LOWER,
15 RAISE, 11 RAISE,
16 SUPER, 12 SUPER,
17 ADJUST, 13 ADJUST,
14 // Solenoid
15 SOLENOID_TOG,
16 SOLENOID_DWELL_MINUS,
17 SOLENOID_DWELL_PLUS,
18 SOLENOID_BUZZ_ON,
19 SOLENOID_BUZZ_OFF,
18}; 20};
19 21
22// Macro / Send String
23enum user_macros {
24 ROOT,
25 PPLY,
26 PSEF,
27};
28
29// TapDance
20enum user_tapdance { 30enum user_tapdance {
21 TD_ENDLOCK, 31 TD_ENDLOCK,
22 TD_ALTLOCK, 32 TD_ALTLOCK,
33 TD_PRINT,
23 TD_ESC, 34 TD_ESC,
24}; 35};
25 36
26enum user_solenoid {
27 SOLENOID_TOG,
28 SOLENOID_DWELL_MINUS,
29 SOLENOID_DWELL_PLUS,
30 SOLENOID_BUZZ_ON,
31 SOLENOID_BUZZ_OFF,
32};
33 37
34#define KC_STOG SOLENOID_TOG 38// Layers
35#define KC_SDM SOLENOID_DWELL_MINUS 39#define _QWERTY 0
36#define KC_SDP SOLENOID_DWELL_PLUS 40#define _LOWER 1
37#define KC_SBON SOLENOID_BUZZ_ON 41#define _RAISE 2
38#define KC_SBOF SOLENOID_BUZZ_OFF 42#define _SUPER 3
43#define _ADJUST 16
44
45// Macros
46#define KC_ROOT M(ROOT)
47#define KC_PPLY M(PPLY)
48#define KC_PSEF M(PSEF)
39 49
50// Tapdance
51#define KC_EXC TD(TD_ESC)
52#define KC_ELCK TD(TD_ENDLOCK)
53#define KC_ALCK TD(TD_ALTLOCK)
54#define KC_MPNT TD(TD_PRINT)
55
56// Custom Keycodes
40#define KC_ KC_TRNS 57#define KC_ KC_TRNS
41#define _______ KC_TRNS 58#define _______ KC_TRNS
42#define XXXXXXX KC_NO 59#define XXXXXXX KC_NO
43#define KC_xxxx KC_NO 60#define KC_xxxx KC_NO
44
45#define KC_LOWR LOWER 61#define KC_LOWR LOWER
46#define KC_RASE RAISE 62#define KC_RASE RAISE
47#define KC_SUPR SUPER 63#define KC_SUPR SUPER
48#define KC_RST RESET 64#define KC_RST RESET
49 65
50// TapDance Keycodes 66// Key Combos
51#define KC_EXC TD_ESC 67#define KC_XCPY LCTL(KC_INS)
68#define KC_XINS LSFT(KC_INS)
69#define KC_CAD LCTL(LALT(KC_DEL))
70#define KC_XCAD LCTL(LALT(KC_DEL))
71#define KC_XLCK LGUI(KC_L)
52 72
53// Macro Declarations 73// Solenoid
54#define KC_ROOT M(0) 74#define KC_STOG SOLENOID_TOG
55#define KC_PPLY M(1) 75#define KC_SDM SOLENOID_DWELL_MINUS
56#define KC_PSEF M(2) 76#define KC_SDP SOLENOID_DWELL_PLUS
57#define KC_XCPY M(3) 77#define KC_SBON SOLENOID_BUZZ_ON
58#define KC_XINS M(4) 78#define KC_SBOF SOLENOID_BUZZ_OFF
59#define KC_CAD M(5)
60#define UM_LOCK M(6)
61 79
62// RGB and Backlighting 80// RGB and Backlighting
63#define KC_RGB RGB_TOG 81#define KC_RGB RGB_TOG
@@ -67,10 +85,17 @@ enum user_solenoid {
67#define KC_RSAD RGB_SAD 85#define KC_RSAD RGB_SAD
68#define KC_RVAI RGB_VAI 86#define KC_RVAI RGB_VAI
69#define KC_RVAD RGB_VAD 87#define KC_RVAD RGB_VAD
88#define KC_MOD RGB_MOD
89#define KC_RMOD RGB_RMOD
90#define KC_RPLN RGB_M_P
91#define KC_RBTH RGB_M_B
70#define KC_BLT BL_TOGG 92#define KC_BLT BL_TOGG
71#define KC_BLS BL_STEP 93#define KC_BLS BL_STEP
72#define KC_BLI BL_INC 94#define KC_BLI BL_INC
73#define KC_BLD BL_DEC 95#define KC_BLD BL_DEC
96#define KC_BLB BL_BRTG
97#define KC_BLON BL_ON
98#define KB_BLOF BL_OFF
74 99
75 100
76#endif 101#endif
diff --git a/users/mtdjr/solenoid.h b/users/mtdjr/solenoid.h
index 38066f4c3..a911bf794 100644
--- a/users/mtdjr/solenoid.h
+++ b/users/mtdjr/solenoid.h
@@ -4,13 +4,17 @@
4#include <timer.h> 4#include <timer.h>
5#include "pincontrol.h" 5#include "pincontrol.h"
6 6
7
7#define SOLENOID_DEFAULT_DWELL 12 8#define SOLENOID_DEFAULT_DWELL 12
8#define SOLENOID_MAX_DWELL 100 9#define SOLENOID_MAX_DWELL 100
9#define SOLENOID_MIN_DWELL 4 10#define SOLENOID_MIN_DWELL 4
10#ifndef SOLENOID_ACTIVE 11#ifndef SOLENOID_ACTIVE
11 #define SOLENOID_ACTIVE false 12 #define SOLENOID_ACTIVE false
12#endif 13#endif
13//#define SOLENOID_PIN F6 14#ifndef SOLENOID_PIN
15 #define SOLENOID_PIN F6
16#endif
17
14 18
15bool solenoid_enabled = SOLENOID_ACTIVE; 19bool solenoid_enabled = SOLENOID_ACTIVE;
16bool solenoid_on = false; 20bool solenoid_on = false;
@@ -92,12 +96,4 @@ void solenoid_setup(void) {
92 pinMode(SOLENOID_PIN, PinDirectionOutput); 96 pinMode(SOLENOID_PIN, PinDirectionOutput);
93} 97}
94 98
95void matrix_init_user(void) {
96 solenoid_setup();
97}
98
99void matrix_scan_user(void) {
100 solenoid_check();
101}
102
103#endif 99#endif