From b2ee290c9f506e42dd9c4577c8147646c405aeb0 Mon Sep 17 00:00:00 2001 From: Danny Date: Tue, 12 Feb 2019 19:57:24 -0500 Subject: [Keyboard] Move Keebio boards to own folder (#5109) * Move boards into keebio folder * Rename keymap * Update BDN9 files * Update BFO-9000 files * Update Chocopad files * Update Dilly files * Update Fourier files, collapse rev1 into main * Update Iris files * Update Laplace files * Update Levinson files, fix buswerks keymap * Update Nyquist files * Fix keymap issues * Update Quefrency files * Update Rorschach files * Update TF68 files * Update Viterbi files * Update Viterbi files * Update Wavelet files * Reformat default layout * Fix up default folder for Iris * Remove already defined aliases --- keyboards/dilly/keymaps/default/config.h | 6 -- keyboards/dilly/keymaps/default/keymap.c | 69 ------------------- keyboards/dilly/keymaps/default/rules.mk | 1 - keyboards/dilly/keymaps/delmo/config.h | 10 --- keyboards/dilly/keymaps/delmo/keymap.c | 106 ------------------------------ keyboards/dilly/keymaps/delmo/rules.mk | 1 - keyboards/dilly/keymaps/pletcher/config.h | 11 ---- keyboards/dilly/keymaps/pletcher/keymap.c | 96 --------------------------- keyboards/dilly/keymaps/pletcher/rules.mk | 2 - 9 files changed, 302 deletions(-) delete mode 100644 keyboards/dilly/keymaps/default/config.h delete mode 100644 keyboards/dilly/keymaps/default/keymap.c delete mode 100644 keyboards/dilly/keymaps/default/rules.mk delete mode 100644 keyboards/dilly/keymaps/delmo/config.h delete mode 100644 keyboards/dilly/keymaps/delmo/keymap.c delete mode 100644 keyboards/dilly/keymaps/delmo/rules.mk delete mode 100644 keyboards/dilly/keymaps/pletcher/config.h delete mode 100644 keyboards/dilly/keymaps/pletcher/keymap.c delete mode 100644 keyboards/dilly/keymaps/pletcher/rules.mk (limited to 'keyboards/dilly/keymaps') diff --git a/keyboards/dilly/keymaps/default/config.h b/keyboards/dilly/keymaps/default/config.h deleted file mode 100644 index 7fa3bf328e..0000000000 --- a/keyboards/dilly/keymaps/default/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" - -#endif diff --git a/keyboards/dilly/keymaps/default/keymap.c b/keyboards/dilly/keymaps/default/keymap.c deleted file mode 100644 index 03b539e3d8..0000000000 --- a/keyboards/dilly/keymaps/default/keymap.c +++ /dev/null @@ -1,69 +0,0 @@ -#include QMK_KEYBOARD_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_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_ESCS MT(MOD_RSFT, KC_ESC) - -#define KC_GUIC LGUI(KC_C) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_BASE] = LAYOUT_ortho_3x10( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_ASFT, KC_S, KC_D, KC_F_L3, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESCS, - KC_ZCTL, KC_XALT, KC_CGUI, KC_V_L4, KC_SPL2, KC_B_L1, KC_N_L5, KC_MALT, KC_BSCT, KC_ENTS - ), - - [_FN1] = LAYOUT_ortho_3x10( - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - _______, _______, _______, _______, KC_BSPC, _______, _______, _______, _______, _______ - ), - - [_FN2] = LAYOUT_ortho_3x10( - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, - KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, KC_GRV, - _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______ - ), - - [_FN3] = LAYOUT_ortho_3x10( - _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - KC_TAB, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, KC_QUOT, - _______, _______, _______, _______, KC_BSPC, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - ), - - [_FN4] = LAYOUT_ortho_3x10( - _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - KC_TAB, _______, _______, _______, _______, KC_LT, KC_GT, KC_QUES, KC_COLN, KC_DQUO, - _______, _______, KC_GUIC, _______, KC_BSPC, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END - ), - - [_FN5] = LAYOUT_ortho_3x10( - RGB_TOG, RGB_MOD, _______, RESET, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, - _______, _______, DEBUG, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, - BL_STEP, _______, KC_GUIC, _______, _______, _______, _______, _______, _______, _______ - ) - -}; diff --git a/keyboards/dilly/keymaps/default/rules.mk b/keyboards/dilly/keymaps/default/rules.mk deleted file mode 100644 index 1e3cebb145..0000000000 --- a/keyboards/dilly/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/dilly/keymaps/delmo/config.h b/keyboards/dilly/keymaps/delmo/config.h deleted file mode 100644 index 4d704c17ef..0000000000 --- a/keyboards/dilly/keymaps/delmo/config.h +++ /dev/null @@ -1,10 +0,0 @@ -#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 deleted file mode 100644 index d3e8c5daf2..0000000000 --- a/keyboards/dilly/keymaps/delmo/keymap.c +++ /dev/null @@ -1,106 +0,0 @@ -#include QMK_KEYBOARD_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] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - 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] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , - //|----+----+----+----+----+----+----+----+----+----| - F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 , - //|----+----+----+----+----+----+----+----+----+----| - , , , , ,BSPC, , , ,CAPS - //`----+----+----+----+----+----+----+----+----+----' - ), - - [_FN2] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN, - //|----+----+----+----+----+----+----+----+----+----| - F11 ,F12 , , , , , , , ,GRV , - //|----+----+----+----+----+----+----+----+----+----| - , , , ,DEL , , , , , - //`----+----+----+----+----+----+----+----+----+----' - ), - - [_FN3] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - ESC , , , , ,MINS,EQL ,LBRC,RBRC,BSLS, - //|----+----+----+----+----+----+----+----+----+----| - TAB , , , , ,COMM,DOT ,SLSH,SCLN,QUOT, - //|----+----+----+----+----+----+----+----+----+----| - , , , ,BSPC, ,LEFT,DOWN, UP ,RGHT - //`----+----+----+----+----+----+----+----+----+----' - ), - - [_FN4] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - , , , , ,UNDS,PLUS,LCBR,RCBR,PIPE, - //|----+----+----+----+----+----+----+----+----+----| - TAB , , , , , LT , GT ,QUES,COLN,DQUO, - //|----+----+----+----+----+----+----+----+----+----| - , ,GUIC, ,BSPC, ,HOME,PGDN,PGUP,END - //`----+----+----+----+----+----+----+----+----+----' - ), - - [_FN5] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - 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 deleted file mode 100644 index 1e3cebb145..0000000000 --- a/keyboards/dilly/keymaps/delmo/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/dilly/keymaps/pletcher/config.h b/keyboards/dilly/keymaps/pletcher/config.h deleted file mode 100644 index 805bef4188..0000000000 --- a/keyboards/dilly/keymaps/pletcher/config.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" - -#define AUTO_SHIFT_TIMEOUT 150 -#define NO_AUTO_SHIFT_SPECIAL -#define NO_AUTO_SHIFT_NUMERIC -#define USB_MAX_POWER_CONSUMPTION 50 - -#endif diff --git a/keyboards/dilly/keymaps/pletcher/keymap.c b/keyboards/dilly/keymaps/pletcher/keymap.c deleted file mode 100644 index 4e7a5c89d2..0000000000 --- a/keyboards/dilly/keymaps/pletcher/keymap.c +++ /dev/null @@ -1,96 +0,0 @@ -#include QMK_KEYBOARD_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_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_ESCS MT(MOD_RSFT, KC_ESC) - -#define KC_GUIC LGUI(KC_C) - -#define KC_RST RESET -#define KC_DBUG DEBUG - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_BASE] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - Q , W , E , R , T , Y , U , I , O , P , - //|----+----+----+----+----+----+----+----+----+----| - A , S , D ,F_L3, G , H , J , K , L ,ESCS, - //|----+----+----+----+----+----+----+----+----+----| - ZCTL,XALT,CGUI,V_L4,SPL2,B_L1,N_L5,MALT,BSCT,ENTS - //`----+----+----+----+----+----+----+----+----+----' - ), - - [_FN1] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , - //|----+----+----+----+----+----+----+----+----+----| - F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 , - //|----+----+----+----+----+----+----+----+----+----| - , , , ,BSPC, , , , , - //`----+----+----+----+----+----+----+----+----+----' - ), - - [_FN2] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN, - //|----+----+----+----+----+----+----+----+----+----| - F11 ,F12 , , , , , , , ,GRV , - //|----+----+----+----+----+----+----+----+----+----| - , , , ,TAB , DEL, , , , - //`----+----+----+----+----+----+----+----+----+----' - ), - - [_FN3] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - , , , , ,MINS,EQL ,LBRC,RBRC,BSLS, - //|----+----+----+----+----+----+----+----+----+----| - TAB , , , , ,COMM,DOT ,SLSH,SCLN,QUOT, - //|----+----+----+----+----+----+----+----+----+----| - , , , ,BSPC, ,LEFT,DOWN, UP ,RGHT - //`----+----+----+----+----+----+----+----+----+----' - ), - - [_FN4] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - , , , , ,UNDS,PLUS,LCBR,RCBR,PIPE, - //|----+----+----+----+----+----+----+----+----+----| - TAB , , , , , LT , GT ,QUES,COLN,DQUO, - //|----+----+----+----+----+----+----+----+----+----| - , ,GUIC, ,BSPC, ,HOME,PGDN,PGUP,END - //`----+----+----+----+----+----+----+----+----+----' - ), - - [_FN5] = LAYOUT_kc( - //,----+----+----+----+----+----+----+----+----+----. - , , ,RST , , ,MSTP,VOLD,VOLU,MPLY, - //|----+----+----+----+----+----+----+----+----+----| - , ,DBUG, , , , ,ASDN,ASUP,ASRP, - //|----+----+----+----+----+----+----+----+----+----| - , ,GUIC, , , , , , ,ASTG - //`----+----+----+----+----+----+----+----+----+----' - ) - -}; diff --git a/keyboards/dilly/keymaps/pletcher/rules.mk b/keyboards/dilly/keymaps/pletcher/rules.mk deleted file mode 100644 index 9b9dd8341b..0000000000 --- a/keyboards/dilly/keymaps/pletcher/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -AUTO_SHIFT_ENABLE = yes -RGBLIGHT_ENABLE = no -- cgit v1.2.1