From ffc82ebdb2ee00c14dd225eb057d209d4584a623 Mon Sep 17 00:00:00 2001 From: XScorpion2 Date: Mon, 15 Apr 2019 00:29:50 -0400 Subject: [Keyboard] Zen keyboard update for Rev2 (#5522) * Updated Zen keyboard for rev2 support * Fixing r1 compile errors * PR feedback and changes for Proton-C compile errors --- keyboards/zen/keymaps/333fred/config.h | 38 --------- keyboards/zen/keymaps/333fred/keymap.c | 150 --------------------------------- keyboards/zen/keymaps/333fred/rules.mk | 7 -- 3 files changed, 195 deletions(-) delete mode 100644 keyboards/zen/keymaps/333fred/config.h delete mode 100644 keyboards/zen/keymaps/333fred/keymap.c delete mode 100644 keyboards/zen/keymaps/333fred/rules.mk (limited to 'keyboards/zen/keymaps/333fred') diff --git a/keyboards/zen/keymaps/333fred/config.h b/keyboards/zen/keymaps/333fred/config.h deleted file mode 100644 index 1634f368cc..0000000000 --- a/keyboards/zen/keymaps/333fred/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2018 Fredric Silberberg - -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 . -*/ - -#pragma once - -#include "config_common.h" - -/* Use I2C or Serial, not both */ - -#define USE_SERIAL - -/* Select hand configuration */ -//#define MASTER_LEFT -#define EE_HANDS - -#undef RGBLED_NUM -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 16 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 - -#undef TAPPING_TERM -#define TAPPING_TERM 150 diff --git a/keyboards/zen/keymaps/333fred/keymap.c b/keyboards/zen/keymaps/333fred/keymap.c deleted file mode 100644 index 3dd7698039..0000000000 --- a/keyboards/zen/keymaps/333fred/keymap.c +++ /dev/null @@ -1,150 +0,0 @@ -#include QMK_KEYBOARD_H -#include "333fred.h" - -extern keymap_config_t keymap_config; - -enum custom_macros { - DLEFT, - DRIGHT, - PSCREEN_APP -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Qwerty - * ,-----------------------------------------. .-----------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Esc | A | S | D | F | G | | H | J | K | L | ; | " | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | | N | M | , | . | / |SHIFT | - * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------| - * | Ctrl | F4 | F5 | GUI | Alt | Bksp |Lwr/VM||Enter|Space | NAV | - | = | Alt | Del | - * `------------------------------------------------''-----------------------------------------------' - */ -[BASE] = LAYOUT( \ - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \ - KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT) , \ - KC_LCTL, KC_F4, KC_F5, KC_LGUI, KC_LALT, KC_BSPC, TD(TD_SYM_VIM), KC_ENT, KC_SPACE, OSL(VIM), KC_MINS, KC_EQL, KC_RALT, KC_DEL \ -), - -/* Symbols - * ,-----------------------------------------. .-----------------------------------------. - * | Caps | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | ! | @ | ( | ) | | | | 7 | 8 | 9 | * | ) | F12 | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | # | $ | { | } | ` | | 4 | 5 | 6 | + | } | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | APscr| % | ^ | [ | ] | ~ | | 1 | 2 | 3 | \ | Vol- | Vol+ | - * |------+------+------+------+------+------+------..------+------+------+------+------+------+------| - * | Pscr | | RESET| | | GAME | || | 0 | . | = | Prev | Next | Play | - * `------------------------------------------------- -------------------------------------------------' - */ -[SYMB] = LAYOUT( \ - KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, \ - _______, KC_EXLM, KC_AT, KC_LPRN, KC_RPRN, KC_PIPE, KC_7, KC_8, KC_9, KC_ASTR, KC_RPRN, KC_F12, \ - _______, KC_HASH, KC_DLR, KC_LCBR, KC_RCBR, KC_GRV, KC_4, KC_5, KC_6, KC_PLUS, KC_RCBR, KC_PIPE, \ - M(PSCREEN_APP), KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_1, KC_2, KC_3, KC_BSLS, KC_VOLD, KC_VOLU, \ - KC_PSCR, _______, RESET, _______, _______, TO(GAME), _______, _______, KC_0, KC_DOT, KC_EQL, KC_MPRV, KC_MNXT, KC_MPLY \ -), - -/* Vim Movement - * ,-----------------------------------------. .-----------------------------------------. - * | | | | | | | | | | | | RESET| | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | |RGBSAI|RGBVAI|RGBSAD| LSFT | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | DLeft|DRight| LCTRL| LGUI | | | Left | Down | Up | Right| | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | |RGBHUD|RGBVAD|RGBHUI| | | | | | | | | | - * |------+------+------+------+------+------+------..------+------+------+------+------+------+------| - * | | | | | | | || | | | | | | | - * `------------------------------------------------..------------------------------------------------' - */ -[VIM] = LAYOUT( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, \ - _______, RGB_SAI, RGB_VAI, RGB_SAD, KC_LSFT, _______, _______, _______, _______, _______, _______, _______, \ - _______, M(DLEFT), M(DRIGHT), KC_LCTL, KC_LGUI, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, \ - _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ -), - -/* Gaming mode (Raise) - * All one-shot mods are disabled on this layer - * ,-----------------------------------------. .-----------------------------------------. - * | ESC | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | CTRL | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Shift| Z | | | | | | | | | | | GUI | - * |------+------+------+------+------+------+------..------+------+------+------+------+------+------| - * | Enter| | Lock | Bksp | Alt | Spc | RESET|| | Lower| Left | Up | Down | Right|QWERTY| - * `------------------------------------------------..-----------------------------------------------' - */ -[GAME] = LAYOUT( \ - KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_LSFT, KC_Z, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LGUI, \ - KC_ENT, TG(GAME_ARROW), KC_LOCK, KC_BSPC, KC_F5, KC_LALT, KC_SPC, OSL(SYMB), KC_F6, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TO(BASE) \ -), -/* Gaming Arrow mode (Raise) - * Turns wasd into arrows - * ,-----------------------------------------. .-----------------------------------------. - * | ESC | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | Up | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | CTRL | Left | Down | Right| | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Shift| Z | | | | | | | | | | | GUI | - * |------+------+------+------+------+------+------..------+------+------+------+------+------+------| - * | Enter| | Lock | Bksp | Alt | Spc | RESET|| | Lower| Left | Up | Down | Right|QWERTY| - * `------------------------------------------------..-----------------------------------------------' - */ -[GAME_ARROW] = LAYOUT( \ - KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_LSFT, KC_Z, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LGUI, \ - KC_ENT, _______, KC_LOCK, KC_BSPC, KC_F5, KC_LALT, KC_SPC, OSL(SYMB), KC_F6, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TO(BASE) \ -) -}; - -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { - switch(id) { - case DLEFT: - if (record->event.pressed) { // Windows move desktop left - return MACRO(D(LCTL), D(LGUI), T(LEFT), U(LGUI), U(LCTL), END); - } - break; - case DRIGHT: - if (record->event.pressed) { // Windows move desktop right - return MACRO(D(LCTL), D(LGUI), T(RIGHT), U(LGUI), U(LCTL), END); - } - break; - case PSCREEN_APP: - if (record->event.pressed) { - return MACRO(D(LALT), T(PSCR), U(LALT), END); - } - break; - } - return MACRO_NONE; -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - tap_dance_process_record(keycode); - return true; -} diff --git a/keyboards/zen/keymaps/333fred/rules.mk b/keyboards/zen/keymaps/333fred/rules.mk deleted file mode 100644 index 38b7155504..0000000000 --- a/keyboards/zen/keymaps/333fred/rules.mk +++ /dev/null @@ -1,7 +0,0 @@ -RGBLIGHT_ENABLE = yes -BACKLIGHT_ENABLE = no -NKRO_ENABLE = yes -KEY_LOCK_ENABLE = yes -TAP_DANCE_ENABLE = yes -CONSOLE_ENABLE = no -EXTRAFLAGS += -flto -- cgit v1.2.3