From 1b711453cafc335cf352808199416e0e57e62f2c Mon Sep 17 00:00:00 2001 From: Spencer Date: Sun, 15 Apr 2018 11:51:38 -0500 Subject: [PATCH] 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 --- keyboards/dilly/keymaps/delmo/config.h | 10 ++ keyboards/dilly/keymaps/delmo/keymap.c | 107 +++++++++++++++++++ keyboards/dilly/keymaps/delmo/rules.mk | 1 + keyboards/fourier/keymaps/valgrahf/config.h | 31 ++++++ keyboards/fourier/keymaps/valgrahf/keymap.c | 73 +++++++++++++ keyboards/fourier/keymaps/valgrahf/rules.mk | 3 + keyboards/levinson/keymaps/valgrahf/config.h | 25 +++++ keyboards/levinson/keymaps/valgrahf/keymap.c | 67 ++++++++++++ keyboards/levinson/keymaps/valgrahf/rules.mk | 8 ++ 9 files changed, 325 insertions(+) create mode 100644 keyboards/dilly/keymaps/delmo/config.h create mode 100644 keyboards/dilly/keymaps/delmo/keymap.c create mode 100644 keyboards/dilly/keymaps/delmo/rules.mk create mode 100644 keyboards/fourier/keymaps/valgrahf/config.h create mode 100644 keyboards/fourier/keymaps/valgrahf/keymap.c create mode 100644 keyboards/fourier/keymaps/valgrahf/rules.mk create mode 100644 keyboards/levinson/keymaps/valgrahf/config.h create mode 100644 keyboards/levinson/keymaps/valgrahf/keymap.c create mode 100644 keyboards/levinson/keymaps/valgrahf/rules.mk diff --git a/keyboards/dilly/keymaps/delmo/config.h b/keyboards/dilly/keymaps/delmo/config.h new file mode 100644 index 0000000000..4d704c17ef --- /dev/null +++ b/keyboards/dilly/keymaps/delmo/config.h @@ -0,0 +1,10 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +#define TAPPING_TERM 200 +#define RETRO_TAPPING +#define PERMISSIVE_HOLD + +#endif diff --git a/keyboards/dilly/keymaps/delmo/keymap.c b/keyboards/dilly/keymaps/delmo/keymap.c new file mode 100644 index 0000000000..c0441ab674 --- /dev/null +++ b/keyboards/dilly/keymaps/delmo/keymap.c @@ -0,0 +1,107 @@ +#include "dilly.h" +#include "action_layer.h" + +extern keymap_config_t keymap_config; + +#define _BASE 0 +#define _FN1 1 +#define _FN2 2 +#define _FN3 3 +#define _FN4 4 +#define _FN5 5 + +#define KC_ KC_TRNS +#define _______ KC_TRNS + +// Tap-Hold keys +//#define KC_ASFT MT(MOD_LSFT, KC_A) +#define KC_F_L3 LT(_FN3, KC_F) +#define KC_ZCTL MT(MOD_LCTL, KC_Z) +#define KC_XALT MT(MOD_LALT, KC_X) +//#define KC_CGUI MT(MOD_LGUI, KC_C) +#define KC_V_L4 LT(_FN4, KC_V) +#define KC_SPL2 LT(_FN2, KC_SPC) +#define KC_B_L1 LT(_FN1, KC_B) +#define KC_N_L5 LT(_FN5, KC_N) +//#define KC_MALT MT(MOD_RALT, KC_M) +//#define KC_BSCT MT(MOD_RCTL, KC_BSPC) +#define KC_ENTS MT(MOD_RSFT, KC_ENT) +#define KC_BSCS MT(MOD_RSFT, KC_BSPC) + +#define KC_GUIC LGUI(KC_C) + +#define KC_RST RESET +#define KC_BL_S BL_STEP +#define KC_DBUG DEBUG +#define KC_RTOG RGB_TOG +#define KC_RMOD RGB_MOD +#define KC_RHUI RGB_HUI +#define KC_RHUD RGB_HUD +#define KC_RSAI RGB_SAI +#define KC_RSAD RGB_SAD +#define KC_RVAI RGB_VAI +#define KC_RVAD RGB_VAD + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_BASE] = KC_KEYMAP( + //,----+----+----+----+----+----+----+----+----+----. + Q , W , E , R , T , Y , U , I , O , P , + //|----+----+----+----+----+----+----+----+----+----| + A , S , D ,F_L3, G , H , J , K , L ,BSCS, + //|----+----+----+----+----+----+----+----+----+----| + ZCTL,XALT,C ,V_L4,B_L1,SPL2,N_L5,M ,DOT ,ENTS + //`----+----+----+----+----+----+----+----+----+----' + ), + + [_FN1] = KC_KEYMAP( + //,----+----+----+----+----+----+----+----+----+----. + 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , + //|----+----+----+----+----+----+----+----+----+----| + F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 , + //|----+----+----+----+----+----+----+----+----+----| + , , , , ,BSPC, , , ,CAPS + //`----+----+----+----+----+----+----+----+----+----' + ), + + [_FN2] = KC_KEYMAP( + //,----+----+----+----+----+----+----+----+----+----. + EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN, + //|----+----+----+----+----+----+----+----+----+----| + F11 ,F12 , , , , , , , ,GRV , + //|----+----+----+----+----+----+----+----+----+----| + , , , ,DEL , , , , , + //`----+----+----+----+----+----+----+----+----+----' + ), + + [_FN3] = KC_KEYMAP( + //,----+----+----+----+----+----+----+----+----+----. + ESC , , , , ,MINS,EQL ,LBRC,RBRC,BSLS, + //|----+----+----+----+----+----+----+----+----+----| + TAB , , , , ,COMM,DOT ,SLSH,SCLN,QUOT, + //|----+----+----+----+----+----+----+----+----+----| + , , , ,BSPC, ,LEFT,DOWN, UP ,RGHT + //`----+----+----+----+----+----+----+----+----+----' + ), + + [_FN4] = KC_KEYMAP( + //,----+----+----+----+----+----+----+----+----+----. + , , , , ,UNDS,PLUS,LCBR,RCBR,PIPE, + //|----+----+----+----+----+----+----+----+----+----| + TAB , , , , , LT , GT ,QUES,COLN,DQUO, + //|----+----+----+----+----+----+----+----+----+----| + , ,GUIC, ,BSPC, ,HOME,PGDN,PGUP,END + //`----+----+----+----+----+----+----+----+----+----' + ), + + [_FN5] = KC_KEYMAP( + //,----+----+----+----+----+----+----+----+----+----. + RTOG,RMOD, ,RST ,RHUI,RSAI,RVAI, , , , + //|----+----+----+----+----+----+----+----+----+----| + , ,DBUG, ,RHUD,RSAD,RVAD, , , , + //|----+----+----+----+----+----+----+----+----+----| + BL_S, ,GUIC, , , , , , , + //`----+----+----+----+----+----+----+----+----+----' + ) + +}; \ 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 0000000000..1e3cebb145 --- /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 0000000000..20e49c4219 --- /dev/null +++ b/keyboards/fourier/keymaps/valgrahf/config.h @@ -0,0 +1,31 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "config_common.h" + +/* Use I2C or Serial, not both */ + +#define USE_SERIAL +// #define USE_I2C + +#endif diff --git a/keyboards/fourier/keymaps/valgrahf/keymap.c b/keyboards/fourier/keymaps/valgrahf/keymap.c new file mode 100644 index 0000000000..93c92a68af --- /dev/null +++ b/keyboards/fourier/keymaps/valgrahf/keymap.c @@ -0,0 +1,73 @@ +#include "fourier.h" +#include "action_layer.h" +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _BASE 0 +#define _FN1 1 +#define _FN2 2 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, +}; + +#define KC_ KC_TRNS +#define _______ KC_TRNS +#define XXXXXXX KC_NO +#define KC_FN1 LT(_FN1, KC_NO) +#define KC_FN2 LT(_FN2, KC_NO) +#define KC_SPFN LT(_FN1, KC_SPACE) +#define KC_RST RESET +#define KC_DBUG DEBUG +#define KC_RTOG RGB_TOG +#define KC_RMOD RGB_MOD +#define KC_RHUI RGB_HUI +#define KC_RHUD RGB_HUD +#define KC_RSAI RGB_SAI +#define KC_RSAD RGB_SAD +#define KC_RVAI RGB_VAI +#define KC_RVAD RGB_VAD + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = KC_KEYMAP( + //,----+----+----+----+----+----|----+----+----+----+----+----+----. + TAB , Q , W , E , R , T , Y , U , I , O , P , DEL,BSPC, + //|----`----`----`----`----`----|----`----`----`----`----`----`----| + ESC , A , S , D , F , G , H , J , K , L ,QUOT, SCLN , + //|-----`----`----`----`----`----|----`----`----`----`----`--------| + LSFT , Z , X , C , V , B , N , M ,COMM,DOT ,SLSH, PGUP , + //|-------`----`----`----`----`----|----`----`----`----`----`------| + LCTL ,LALT, FN1, ,ENTER , SPACE , FN2 , HOME, END , PGDN + //`-----+----+-----+-------------|--------+-----+-----+-----+------' + ), + + [_FN1] = KC_KEYMAP( + //,----+----+----+----+----+----|----+----+----+----+----+----+----. + GRV , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , , , + //|----`----`----`----`----`----|----`----`----`----`----`----`----| + DEL , F1 ,F2 , F3 , F4 , F5 , F6 ,MINS, EQL,LBRC,RBRC, BSLS , + //|-----`----`----`----`----`----|----`----`----`----`----`--------| + , F7 , F8 , F9 , F10, F11, F12, , , , UP , , + //|-------`----`----`----`----`----|----`----`----`----`----`------| + , , , , , ,RGUI,LEFT ,DOWN ,RIGHT + //`-----+----+-----+-------------|--------+-----+-----+-----+------' + ), + + [_FN2] = KC_KEYMAP( + //,----+----+----+----+----+----|----+----+----+----+----+----+----. + TILD,EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN, , , + //|----`----`----`----`----`----|----`----`----`----`----`----`----| + DEL ,RHUI,RSAI,RVAI, , , ,UNDS,PLUS,LCBR,RCBR, PIPE , + //|-----`----`----`----`----`----|----`----`----`----`----`--------| + ,RHUD,RSAD,RVAD, , ,VOLU,VOLD, , , UP , , + //|-------`----`----`----`----`----|----`----`----`----`----`------| + ,RTOG,RMOD , , , , , LEFT, DOWN, RIGHT + //`-----+----+-----+-------------|--------+-----+-----+-----+------' + ) + +}; diff --git a/keyboards/fourier/keymaps/valgrahf/rules.mk b/keyboards/fourier/keymaps/valgrahf/rules.mk new file mode 100644 index 0000000000..457a3d01d4 --- /dev/null +++ b/keyboards/fourier/keymaps/valgrahf/rules.mk @@ -0,0 +1,3 @@ +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/levinson/keymaps/valgrahf/config.h b/keyboards/levinson/keymaps/valgrahf/config.h new file mode 100644 index 0000000000..b7c6b0a7f5 --- /dev/null +++ b/keyboards/levinson/keymaps/valgrahf/config.h @@ -0,0 +1,25 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "config_common.h" + +/* Use I2C or Serial, not both */ + +#define USE_SERIAL +// #define USE_I2C + +/* Select hand configuration */ + +#define MASTER_LEFT +// #define MASTER_RIGHT +// #define EE_HANDS + +#define RGB_DI_PIN D3 +#define RGBLED_NUM 12 +#define RGBLIGHT_ANIMATIONS +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +#define RGBLIGHT_SLEEP + +#endif diff --git a/keyboards/levinson/keymaps/valgrahf/keymap.c b/keyboards/levinson/keymaps/valgrahf/keymap.c new file mode 100644 index 0000000000..5956ad27b0 --- /dev/null +++ b/keyboards/levinson/keymaps/valgrahf/keymap.c @@ -0,0 +1,67 @@ +#include "levinson.h" +#include "action_layer.h" +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +#define _BASE 0 +#define _FN1 1 +#define _FN2 2 + +#define KC_ KC_TRNS +#define _______ KC_TRNS +#define XXXXXXX KC_NO +#define KC_FN1 LT(_FN1, KC_NO) +#define KC_FN2 LT(_FN2, KC_NO) +#define KC_SPFN LT(_FN1, KC_SPACE) +#define KC_RST RESET +#define KC_DBUG DEBUG +#define KC_RTOG RGB_TOG +#define KC_RMOD RGB_MOD +#define KC_RHUI RGB_HUI +#define KC_RHUD RGB_HUD +#define KC_RSAI RGB_SAI +#define KC_RSAD RGB_SAD +#define KC_RVAI RGB_VAI +#define KC_RVAD RGB_VAD + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_BASE] = KC_KEYMAP( + //,----+----+----+----+----+----. ,----+----+----+----+----+----. + TAB, Q , W , E , R , T , Y , U , I , O , P ,BSPC, + //|----+----+----+----+----+----| |----+----+----+----+----+----| + ESC, A , S , D , F , G , H , J , K , L ,SCLN,QUOT, + //|----+----+----+----+----+----| |----+----+----+----+----+----| + LSFT, Z , X , C , V , B , N , M ,COMM, DOT,SLSH,PGUP, + //|----+----+----+----+----+----| |----+----+----+----+----+----| + LCTL,LGUI,LALT, FN1, ENT, ENT, SPC, SPC, FN2,HOME, END,PGDN + //`----+----+----+----+----+----' `----+----+----+----+----+----' + ), + + [_FN1] = KC_KEYMAP( + //,----+----+----+----+----+----. ,----+----+----+----+----+----. + GRV, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , , + //|----+----+----+----+----+----| |----+----+----+----+----+----| + DEL, F1, F2, F3, F4, F5, F6,MINS, EQL,LBRC,RBRC,BSLS, + //|----+----+----+----+----+----| |----+----+----+----+----+----| + , F7, F8, F9, F10, F11, F12, , , , UP, , + //|----+----+----+----+----+----| |----+----+----+----+----+----| + , , , , , , , , ,LEFT,DOWN,RIGHT + //`----+----+----+----+----+----' `----+----+----+----+----+----' + ), + + [_FN2] = KC_KEYMAP( + //,----+----+----+----+----+----. ,----+----+----+----+----+----. + TILD,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN, , + //|----+----+----+----+----+----| |----+----+----+----+----+----| + DEL,RHUI,RSAI,RVAI, , , ,UNDS,PLUS,LCBR,RCBR,PIPE, + //|----+----+----+----+----+----| |----+----+----+----+----+----| + ,RHUD,RSAD,RVAD, , , , , , , , , + //|----+----+----+----+----+----| |----+----+----+----+----+----| + ,RTOG,RMOD, , , , , , , , , + //`----+----+----+----+----+----' `----+----+----+----+----+----' + ), + +}; diff --git a/keyboards/levinson/keymaps/valgrahf/rules.mk b/keyboards/levinson/keymaps/valgrahf/rules.mk new file mode 100644 index 0000000000..0db809fe4b --- /dev/null +++ b/keyboards/levinson/keymaps/valgrahf/rules.mk @@ -0,0 +1,8 @@ +RGBLIGHT_ENABLE = yes +BACKLIGHT_ENABLE = yes +AUDIO_ENABLE = no +USE_I2C = no + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif