aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpencer <bjerke.dev@gmail.com>2018-04-15 11:51:38 -0500
committerDrashna Jaelre <drashna@live.com>2018-04-15 09:51:38 -0700
commit1b711453cafc335cf352808199416e0e57e62f2c (patch)
tree41990cd6ef395a2e1d0fe3644e74810cfe079424
parent5d36118eaa2b7573090f4e1f42b6715f432bc7bb (diff)
downloadqmk_firmware-1b711453cafc335cf352808199416e0e57e62f2c.tar.gz
qmk_firmware-1b711453cafc335cf352808199416e0e57e62f2c.zip
Updated Levinson and Fourier keymaps (#2685)
* new file: keyboards/dilly/keymaps/delmo/config.h new file: keyboards/dilly/keymaps/delmo/keymap.c new file: keyboards/dilly/keymaps/delmo/rules.mk new file: keyboards/fourier/config.h new file: keyboards/fourier/fourier.c new file: keyboards/fourier/fourier.h new file: keyboards/fourier/i2c.c new file: keyboards/fourier/i2c.h new file: keyboards/fourier/keymaps/default/config.h new file: keyboards/fourier/keymaps/default/keymap.c new file: keyboards/fourier/keymaps/default/rules.mk new file: keyboards/fourier/keymaps/valgrahf/config.h new file: keyboards/fourier/keymaps/valgrahf/keymap.c new file: keyboards/fourier/keymaps/valgrahf/rules.mk new file: keyboards/fourier/matrix.c new file: keyboards/fourier/readme.md new file: keyboards/fourier/rev1/config.h new file: keyboards/fourier/rev1/rev1.c new file: keyboards/fourier/rev1/rev1.h new file: keyboards/fourier/rev1/rules.mk new file: keyboards/fourier/rules.mk new file: keyboards/fourier/serial.c new file: keyboards/fourier/serial.h new file: keyboards/fourier/split_util.c new file: keyboards/fourier/split_util.h * new file: keyboards/levinson/keymaps/valgrahf/config.h new file: keyboards/levinson/keymaps/valgrahf/keymap.c new file: keyboards/levinson/keymaps/valgrahf/rules.mk * modified: keyboards/levinson/keymaps/valgrahf/keymap.c * deleted: keyboards/dilly/keymaps/delmo/config.h deleted: keyboards/dilly/keymaps/delmo/keymap.c deleted: keyboards/dilly/keymaps/delmo/rules.mk * modified: keyboards/fourier/keymaps/valgrahf/keymap.c * deleted: keyboards/fourier/config.h deleted: keyboards/fourier/fourier.c deleted: keyboards/fourier/fourier.h deleted: keyboards/fourier/i2c.c deleted: keyboards/fourier/i2c.h deleted: keyboards/fourier/keymaps/default/config.h deleted: keyboards/fourier/keymaps/default/keymap.c deleted: keyboards/fourier/keymaps/default/rules.mk deleted: keyboards/fourier/keymaps/valgrahf/config.h deleted: keyboards/fourier/keymaps/valgrahf/keymap.c deleted: keyboards/fourier/keymaps/valgrahf/rules.mk deleted: keyboards/fourier/matrix.c deleted: keyboards/fourier/readme.md deleted: keyboards/fourier/rev1/config.h deleted: keyboards/fourier/rev1/rev1.c deleted: keyboards/fourier/rev1/rev1.h deleted: keyboards/fourier/rev1/rules.mk deleted: keyboards/fourier/rules.mk deleted: keyboards/fourier/serial.c deleted: keyboards/fourier/serial.h deleted: keyboards/fourier/split_util.c deleted: keyboards/fourier/split_util.h * deleted: keyboards/fourier/config.h deleted: keyboards/fourier/fourier.c deleted: keyboards/fourier/fourier.h deleted: keyboards/fourier/i2c.c deleted: keyboards/fourier/i2c.h deleted: keyboards/fourier/keymaps/default/config.h deleted: keyboards/fourier/keymaps/default/keymap.c deleted: keyboards/fourier/keymaps/default/rules.mk deleted: keyboards/fourier/keymaps/valgrahf/config.h deleted: keyboards/fourier/keymaps/valgrahf/keymap.c deleted: keyboards/fourier/keymaps/valgrahf/rules.mk deleted: keyboards/fourier/matrix.c deleted: keyboards/fourier/readme.md deleted: keyboards/fourier/rev1/config.h deleted: keyboards/fourier/rev1/rev1.c deleted: keyboards/fourier/rev1/rev1.h deleted: keyboards/fourier/rev1/rules.mk deleted: keyboards/fourier/rules.mk deleted: keyboards/fourier/serial.c deleted: keyboards/fourier/serial.h deleted: keyboards/fourier/split_util.c deleted: keyboards/fourier/split_util.h keyboards/fourier/ * new file: keyboards/fourier/config.h new file: keyboards/fourier/fourier.c new file: keyboards/fourier/fourier.h new file: keyboards/fourier/i2c.c new file: keyboards/fourier/i2c.h new file: keyboards/fourier/keymaps/default/config.h new file: keyboards/fourier/keymaps/default/keymap.c new file: keyboards/fourier/keymaps/default/rules.mk new file: keyboards/fourier/keymaps/valgrahf/config.h new file: keyboards/fourier/keymaps/valgrahf/keymap.c new file: keyboards/fourier/keymaps/valgrahf/rules.mk new file: keyboards/fourier/matrix.c new file: keyboards/fourier/readme.md new file: keyboards/fourier/rev1/config.h new file: keyboards/fourier/rev1/rev1.c new file: keyboards/fourier/rev1/rev1.h new file: keyboards/fourier/rev1/rules.mk new file: keyboards/fourier/rules.mk new file: keyboards/fourier/serial.c new file: keyboards/fourier/serial.h new file: keyboards/fourier/split_util.c new file: keyboards/fourier/split_util.h * modified: keyboards/fourier/keymaps/valgrahf/keymap.c * modified: keyboards/fourier/keymaps/valgrahf/keymap.c
-rw-r--r--keyboards/dilly/keymaps/delmo/config.h10
-rw-r--r--keyboards/dilly/keymaps/delmo/keymap.c107
-rw-r--r--keyboards/dilly/keymaps/delmo/rules.mk1
-rw-r--r--keyboards/fourier/keymaps/valgrahf/config.h31
-rw-r--r--keyboards/fourier/keymaps/valgrahf/keymap.c73
-rw-r--r--keyboards/fourier/keymaps/valgrahf/rules.mk3
-rw-r--r--keyboards/levinson/keymaps/valgrahf/config.h25
-rw-r--r--keyboards/levinson/keymaps/valgrahf/keymap.c67
-rw-r--r--keyboards/levinson/keymaps/valgrahf/rules.mk8
9 files changed, 325 insertions, 0 deletions
diff --git a/keyboards/dilly/keymaps/delmo/config.h b/keyboards/dilly/keymaps/delmo/config.h
new file mode 100644
index 000000000..4d704c17e
--- /dev/null
+++ b/keyboards/dilly/keymaps/delmo/config.h
@@ -0,0 +1,10 @@
1#ifndef CONFIG_USER_H
2#define CONFIG_USER_H
3
4#include "../../config.h"
5
6#define TAPPING_TERM 200
7#define RETRO_TAPPING
8#define PERMISSIVE_HOLD
9
10#endif
diff --git a/keyboards/dilly/keymaps/delmo/keymap.c b/keyboards/dilly/keymaps/delmo/keymap.c
new file mode 100644
index 000000000..c0441ab67
--- /dev/null
+++ b/keyboards/dilly/keymaps/delmo/keymap.c
@@ -0,0 +1,107 @@
1#include "dilly.h"
2#include "action_layer.h"
3
4extern keymap_config_t keymap_config;
5
6#define _BASE 0
7#define _FN1 1
8#define _FN2 2
9#define _FN3 3
10#define _FN4 4
11#define _FN5 5
12
13#define KC_ KC_TRNS
14#define _______ KC_TRNS
15
16// Tap-Hold keys
17//#define KC_ASFT MT(MOD_LSFT, KC_A)
18#define KC_F_L3 LT(_FN3, KC_F)
19#define KC_ZCTL MT(MOD_LCTL, KC_Z)
20#define KC_XALT MT(MOD_LALT, KC_X)
21//#define KC_CGUI MT(MOD_LGUI, KC_C)
22#define KC_V_L4 LT(_FN4, KC_V)
23#define KC_SPL2 LT(_FN2, KC_SPC)
24#define KC_B_L1 LT(_FN1, KC_B)
25#define KC_N_L5 LT(_FN5, KC_N)
26//#define KC_MALT MT(MOD_RALT, KC_M)
27//#define KC_BSCT MT(MOD_RCTL, KC_BSPC)
28#define KC_ENTS MT(MOD_RSFT, KC_ENT)
29#define KC_BSCS MT(MOD_RSFT, KC_BSPC)
30
31#define KC_GUIC LGUI(KC_C)
32
33#define KC_RST RESET
34#define KC_BL_S BL_STEP
35#define KC_DBUG DEBUG
36#define KC_RTOG RGB_TOG
37#define KC_RMOD RGB_MOD
38#define KC_RHUI RGB_HUI
39#define KC_RHUD RGB_HUD
40#define KC_RSAI RGB_SAI
41#define KC_RSAD RGB_SAD
42#define KC_RVAI RGB_VAI
43#define KC_RVAD RGB_VAD
44
45const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
46
47 [_BASE] = KC_KEYMAP(
48 //,----+----+----+----+----+----+----+----+----+----.
49 Q , W , E , R , T , Y , U , I , O , P ,
50 //|----+----+----+----+----+----+----+----+----+----|
51 A , S , D ,F_L3, G , H , J , K , L ,BSCS,
52 //|----+----+----+----+----+----+----+----+----+----|
53 ZCTL,XALT,C ,V_L4,B_L1,SPL2,N_L5,M ,DOT ,ENTS
54 //`----+----+----+----+----+----+----+----+----+----'
55 ),
56
57 [_FN1] = KC_KEYMAP(
58 //,----+----+----+----+----+----+----+----+----+----.
59 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,
60 //|----+----+----+----+----+----+----+----+----+----|
61 F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,
62 //|----+----+----+----+----+----+----+----+----+----|
63 , , , , ,BSPC, , , ,CAPS
64 //`----+----+----+----+----+----+----+----+----+----'
65 ),
66
67 [_FN2] = KC_KEYMAP(
68 //,----+----+----+----+----+----+----+----+----+----.
69 EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,
70 //|----+----+----+----+----+----+----+----+----+----|
71 F11 ,F12 , , , , , , , ,GRV ,
72 //|----+----+----+----+----+----+----+----+----+----|
73 , , , ,DEL , , , , ,
74 //`----+----+----+----+----+----+----+----+----+----'
75 ),
76
77 [_FN3] = KC_KEYMAP(
78 //,----+----+----+----+----+----+----+----+----+----.
79 ESC , , , , ,MINS,EQL ,LBRC,RBRC,BSLS,
80 //|----+----+----+----+----+----+----+----+----+----|
81 TAB , , , , ,COMM,DOT ,SLSH,SCLN,QUOT,
82 //|----+----+----+----+----+----+----+----+----+----|
83 , , , ,BSPC, ,LEFT,DOWN, UP ,RGHT
84 //`----+----+----+----+----+----+----+----+----+----'
85 ),
86
87 [_FN4] = KC_KEYMAP(
88 //,----+----+----+----+----+----+----+----+----+----.
89 , , , , ,UNDS,PLUS,LCBR,RCBR,PIPE,
90 //|----+----+----+----+----+----+----+----+----+----|
91 TAB , , , , , LT , GT ,QUES,COLN,DQUO,
92 //|----+----+----+----+----+----+----+----+----+----|
93 , ,GUIC, ,BSPC, ,HOME,PGDN,PGUP,END
94 //`----+----+----+----+----+----+----+----+----+----'
95 ),
96
97 [_FN5] = KC_KEYMAP(
98 //,----+----+----+----+----+----+----+----+----+----.
99 RTOG,RMOD, ,RST ,RHUI,RSAI,RVAI, , , ,
100 //|----+----+----+----+----+----+----+----+----+----|
101 , ,DBUG, ,RHUD,RSAD,RVAD, , , ,
102 //|----+----+----+----+----+----+----+----+----+----|
103 BL_S, ,GUIC, , , , , , ,
104 //`----+----+----+----+----+----+----+----+----+----'
105 )
106
107}; \ No newline at end of file
diff --git a/keyboards/dilly/keymaps/delmo/rules.mk b/keyboards/dilly/keymaps/delmo/rules.mk
new file mode 100644
index 000000000..1e3cebb14
--- /dev/null
+++ b/keyboards/dilly/keymaps/delmo/rules.mk
@@ -0,0 +1 @@
RGBLIGHT_ENABLE = yes
diff --git a/keyboards/fourier/keymaps/valgrahf/config.h b/keyboards/fourier/keymaps/valgrahf/config.h
new file mode 100644
index 000000000..20e49c421
--- /dev/null
+++ b/keyboards/fourier/keymaps/valgrahf/config.h
@@ -0,0 +1,31 @@
1/*
2This is the c configuration file for the keymap
3
4Copyright 2012 Jun Wako <wakojun@gmail.com>
5Copyright 2015 Jack Humbert
6
7This program is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 2 of the License, or
10(at your option) any later version.
11
12This program is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with this program. If not, see <http://www.gnu.org/licenses/>.
19*/
20
21#ifndef CONFIG_USER_H
22#define CONFIG_USER_H
23
24#include "config_common.h"
25
26/* Use I2C or Serial, not both */
27
28#define USE_SERIAL
29// #define USE_I2C
30
31#endif
diff --git a/keyboards/fourier/keymaps/valgrahf/keymap.c b/keyboards/fourier/keymaps/valgrahf/keymap.c
new file mode 100644
index 000000000..93c92a68a
--- /dev/null
+++ b/keyboards/fourier/keymaps/valgrahf/keymap.c
@@ -0,0 +1,73 @@
1#include "fourier.h"
2#include "action_layer.h"
3#include "eeconfig.h"
4
5extern keymap_config_t keymap_config;
6
7// Each layer gets a name for readability, which is then used in the keymap matrix below.
8// The underscores don't mean anything - you can have a layer called STUFF or any other name.
9// Layer names don't all need to be of the same length, obviously, and you can also skip them
10// entirely and just use numbers.
11#define _BASE 0
12#define _FN1 1
13#define _FN2 2
14
15enum custom_keycodes {
16 QWERTY = SAFE_RANGE,
17};
18
19#define KC_ KC_TRNS
20#define _______ KC_TRNS
21#define XXXXXXX KC_NO
22#define KC_FN1 LT(_FN1, KC_NO)
23#define KC_FN2 LT(_FN2, KC_NO)
24#define KC_SPFN LT(_FN1, KC_SPACE)
25#define KC_RST RESET
26#define KC_DBUG DEBUG
27#define KC_RTOG RGB_TOG
28#define KC_RMOD RGB_MOD
29#define KC_RHUI RGB_HUI
30#define KC_RHUD RGB_HUD
31#define KC_RSAI RGB_SAI
32#define KC_RSAD RGB_SAD
33#define KC_RVAI RGB_VAI
34#define KC_RVAD RGB_VAD
35
36const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
37 [_BASE] = KC_KEYMAP(
38 //,----+----+----+----+----+----|----+----+----+----+----+----+----.
39 TAB , Q , W , E , R , T , Y , U , I , O , P , DEL,BSPC,
40 //|----`----`----`----`----`----|----`----`----`----`----`----`----|
41 ESC , A , S , D , F , G , H , J , K , L ,QUOT, SCLN ,
42 //|-----`----`----`----`----`----|----`----`----`----`----`--------|
43 LSFT , Z , X , C , V , B , N , M ,COMM,DOT ,SLSH, PGUP ,
44 //|-------`----`----`----`----`----|----`----`----`----`----`------|
45 LCTL ,LALT, FN1, ,ENTER , SPACE , FN2 , HOME, END , PGDN
46 //`-----+----+-----+-------------|--------+-----+-----+-----+------'
47 ),
48
49 [_FN1] = KC_KEYMAP(
50 //,----+----+----+----+----+----|----+----+----+----+----+----+----.
51 GRV , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , , ,
52 //|----`----`----`----`----`----|----`----`----`----`----`----`----|
53 DEL , F1 ,F2 , F3 , F4 , F5 , F6 ,MINS, EQL,LBRC,RBRC, BSLS ,
54 //|-----`----`----`----`----`----|----`----`----`----`----`--------|
55 , F7 , F8 , F9 , F10, F11, F12, , , , UP , ,
56 //|-------`----`----`----`----`----|----`----`----`----`----`------|
57 , , , , , ,RGUI,LEFT ,DOWN ,RIGHT
58 //`-----+----+-----+-------------|--------+-----+-----+-----+------'
59 ),
60
61 [_FN2] = KC_KEYMAP(
62 //,----+----+----+----+----+----|----+----+----+----+----+----+----.
63 TILD,EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN, , ,
64 //|----`----`----`----`----`----|----`----`----`----`----`----`----|
65 DEL ,RHUI,RSAI,RVAI, , , ,UNDS,PLUS,LCBR,RCBR, PIPE ,
66 //|-----`----`----`----`----`----|----`----`----`----`----`--------|
67 ,RHUD,RSAD,RVAD, , ,VOLU,VOLD, , , UP , ,
68 //|-------`----`----`----`----`----|----`----`----`----`----`------|
69 ,RTOG,RMOD , , , , , LEFT, DOWN, RIGHT
70 //`-----+----+-----+-------------|--------+-----+-----+-----+------'
71 )
72
73};
diff --git a/keyboards/fourier/keymaps/valgrahf/rules.mk b/keyboards/fourier/keymaps/valgrahf/rules.mk
new file mode 100644
index 000000000..457a3d01d
--- /dev/null
+++ b/keyboards/fourier/keymaps/valgrahf/rules.mk
@@ -0,0 +1,3 @@
1ifndef QUANTUM_DIR
2 include ../../../../Makefile
3endif
diff --git a/keyboards/levinson/keymaps/valgrahf/config.h b/keyboards/levinson/keymaps/valgrahf/config.h
new file mode 100644
index 000000000..b7c6b0a7f
--- /dev/null
+++ b/keyboards/levinson/keymaps/valgrahf/config.h
@@ -0,0 +1,25 @@
1#ifndef CONFIG_USER_H
2#define CONFIG_USER_H
3
4#include "config_common.h"
5
6/* Use I2C or Serial, not both */
7
8#define USE_SERIAL
9// #define USE_I2C
10
11/* Select hand configuration */
12
13#define MASTER_LEFT
14// #define MASTER_RIGHT
15// #define EE_HANDS
16
17#define RGB_DI_PIN D3
18#define RGBLED_NUM 12
19#define RGBLIGHT_ANIMATIONS
20#define RGBLIGHT_HUE_STEP 8
21#define RGBLIGHT_SAT_STEP 8
22#define RGBLIGHT_VAL_STEP 8
23#define RGBLIGHT_SLEEP
24
25#endif
diff --git a/keyboards/levinson/keymaps/valgrahf/keymap.c b/keyboards/levinson/keymaps/valgrahf/keymap.c
new file mode 100644
index 000000000..5956ad27b
--- /dev/null
+++ b/keyboards/levinson/keymaps/valgrahf/keymap.c
@@ -0,0 +1,67 @@
1#include "levinson.h"
2#include "action_layer.h"
3#include "eeconfig.h"
4
5extern keymap_config_t keymap_config;
6
7#define _BASE 0
8#define _FN1 1
9#define _FN2 2
10
11#define KC_ KC_TRNS
12#define _______ KC_TRNS
13#define XXXXXXX KC_NO
14#define KC_FN1 LT(_FN1, KC_NO)
15#define KC_FN2 LT(_FN2, KC_NO)
16#define KC_SPFN LT(_FN1, KC_SPACE)
17#define KC_RST RESET
18#define KC_DBUG DEBUG
19#define KC_RTOG RGB_TOG
20#define KC_RMOD RGB_MOD
21#define KC_RHUI RGB_HUI
22#define KC_RHUD RGB_HUD
23#define KC_RSAI RGB_SAI
24#define KC_RSAD RGB_SAD
25#define KC_RVAI RGB_VAI
26#define KC_RVAD RGB_VAD
27
28
29const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
30
31 [_BASE] = KC_KEYMAP(
32 //,----+----+----+----+----+----. ,----+----+----+----+----+----.
33 TAB, Q , W , E , R , T , Y , U , I , O , P ,BSPC,
34 //|----+----+----+----+----+----| |----+----+----+----+----+----|
35 ESC, A , S , D , F , G , H , J , K , L ,SCLN,QUOT,
36 //|----+----+----+----+----+----| |----+----+----+----+----+----|
37 LSFT, Z , X , C , V , B , N , M ,COMM, DOT,SLSH,PGUP,
38 //|----+----+----+----+----+----| |----+----+----+----+----+----|
39 LCTL,LGUI,LALT, FN1, ENT, ENT, SPC, SPC, FN2,HOME, END,PGDN
40 //`----+----+----+----+----+----' `----+----+----+----+----+----'
41 ),
42
43 [_FN1] = KC_KEYMAP(
44 //,----+----+----+----+----+----. ,----+----+----+----+----+----.
45 GRV, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , ,
46 //|----+----+----+----+----+----| |----+----+----+----+----+----|
47 DEL, F1, F2, F3, F4, F5, F6,MINS, EQL,LBRC,RBRC,BSLS,
48 //|----+----+----+----+----+----| |----+----+----+----+----+----|
49 , F7, F8, F9, F10, F11, F12, , , , UP, ,
50 //|----+----+----+----+----+----| |----+----+----+----+----+----|
51 , , , , , , , , ,LEFT,DOWN,RIGHT
52 //`----+----+----+----+----+----' `----+----+----+----+----+----'
53 ),
54
55 [_FN2] = KC_KEYMAP(
56 //,----+----+----+----+----+----. ,----+----+----+----+----+----.
57 TILD,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN, ,
58 //|----+----+----+----+----+----| |----+----+----+----+----+----|
59 DEL,RHUI,RSAI,RVAI, , , ,UNDS,PLUS,LCBR,RCBR,PIPE,
60 //|----+----+----+----+----+----| |----+----+----+----+----+----|
61 ,RHUD,RSAD,RVAD, , , , , , , , ,
62 //|----+----+----+----+----+----| |----+----+----+----+----+----|
63 ,RTOG,RMOD, , , , , , , , ,
64 //`----+----+----+----+----+----' `----+----+----+----+----+----'
65 ),
66
67};
diff --git a/keyboards/levinson/keymaps/valgrahf/rules.mk b/keyboards/levinson/keymaps/valgrahf/rules.mk
new file mode 100644
index 000000000..0db809fe4
--- /dev/null
+++ b/keyboards/levinson/keymaps/valgrahf/rules.mk
@@ -0,0 +1,8 @@
1RGBLIGHT_ENABLE = yes
2BACKLIGHT_ENABLE = yes
3AUDIO_ENABLE = no
4USE_I2C = no
5
6ifndef QUANTUM_DIR
7 include ../../../../Makefile
8endif