1
0
Fork 0

Add naked60 layout, clean up my userspace files and rules.mk. (#8848)

This commit is contained in:
Fred Silberberg 2020-04-20 03:00:14 -07:00 committed by GitHub
parent 7e4cf9ace2
commit 2dca087b04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 82 additions and 29 deletions

View file

@ -1,7 +1,6 @@
#pragma once
#include QMK_KEYBOARD_CONFIG_H
#include "333fred_config.h"
#define USE_SERIAL
#define MASTER_LEFT

View file

@ -1,7 +1,5 @@
BACKLIGHT_ENABLE = no
RGBLIGHT_ENABLE = yes
AUDIO_ENABLE = no
NKRO_ENABLE = yes
KEY_LOCK_ENABLE = yes
TAP_DANCE_ENABLE = yes
CONSOLE_ENABLE = no

View file

@ -1,7 +1,5 @@
#pragma once
#include "333fred_config.h"
#define USE_SERIAL
#define EE_HANDS

View file

@ -1,12 +1,6 @@
#include QMK_KEYBOARD_H
#include "333fred.h"
enum custom_macros {
DLEFT,
DRIGHT,
PSCREEN_APP
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT_5x6(

View file

@ -1,7 +1,3 @@
NKRO_ENABLE = yes
KEY_LOCK_ENABLE = yes
TAP_DANCE_ENABLE = yes
CONSOLE_ENABLE = no
PERMISSIVE_HOLD = yes
EXTRAFLAGS += -flto

View file

@ -1,7 +1,5 @@
#pragma once
#include "333fred_config.h"
#define USE_SERIAL
#define EE_HANDS
#define NO_ACTION_MACRO

View file

@ -1,7 +1,4 @@
NKRO_ENABLE = yes
KEY_LOCK_ENABLE = yes
TAP_DANCE_ENABLE = yes
CONSOLE_ENABLE = no
PERMISSIVE_HOLD = yes
EXTRAFLAGS += -flto

View file

@ -0,0 +1,24 @@
/* Copyright 2018 Salicylic_acid3
*
* 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 <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Select hand configuration */
#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 200

View file

@ -0,0 +1,53 @@
#include QMK_KEYBOARD_H
#include "333fred.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[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_MINS,
//|--------------+------------+------+--------+--------+---------------| |-------+--------+--------+-------+--------+--------------|
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), CTL_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_F4, KC_F5, KC_LALT, KC_BSPC, TD(TD_SYM_VIM), KC_DEL, KC_ENT, KC_SPC, KC_DOWN, KC_UP, KC_EQL, KC_LGUI
//`----------------------------------------------------------------------------------------------------------------'
),
[SYMB] = LAYOUT(
//,-----------------------------------------------------| |-----------------------------------------------------.
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, 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_F12,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+-------+--------+--------|
_______, KC_HASH, KC_DLR, KC_LCBR, KC_RCBR, KC_GRV, KC_VOLU, KC_4, KC_5, KC_6, _______, _______,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+-------+--------+--------|
_______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_VOLD, KC_1, KC_2, KC_3, _______, _______,
//|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------+--------|
_______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_0, KC_ENT, _______
//`------------------------------------------------------------------------------------------------------------'
),
[VIM] = LAYOUT( /* Base */
//,-----------------------------------------------------| |-----------------------------------------------------.
_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
_______, _______, _______, _______, KC_LSFT, _______, _______, _______, _______, _______, _______, _______,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
_______, DLEFT, DRIGHT, KC_LCTL, KC_LGUI, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
//|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
//`------------------------------------------------------------------------------------------------------------'
)
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
tap_dance_process_keycode(keycode);
return !try_handle_macro(keycode, record);
}

View file

@ -1,6 +1,4 @@
RGBLIGHT_ENABLE = yes
NKRO_ENABLE = yes
KEY_LOCK_ENABLE = yes
TAP_DANCE_ENABLE = yes
CONSOLE_ENABLE = no
EXTRAFLAGS += -flto

View file

@ -1,7 +1,6 @@
#pragma once
#include QMK_KEYBOARD_CONFIG_H
#include "333fred_config.h"
#undef TAPPING_TERM
#define TAPPING_TERM 200

View file

@ -1,7 +1,5 @@
LCD_BACKLIGHT_ENABLE = yes
LCD_ENABLE = yes
BACKLIGHT_ENABLE = yes
NKRO_ENABLE = yes
KEY_LOCK_ENABLE = yes
TAP_DANCE_ENABLE = yes
CONSOLE_ENABLE = no

View file

@ -1,7 +1,5 @@
#pragma once
#include "333fred_config.h"
#define USE_SERIAL
#define MASTER_LEFT

View file

@ -1,4 +1,2 @@
KEY_LOCK_ENABLE = yes
NKRO_ENABLE = yes
CONSOLE_ENABLE = no
TAP_DANCE_ENABLE = yes

View file

@ -2,3 +2,4 @@
#define PERMISSIVE_HOLD
#define NO_ACTION_MACRO
#undef ONESHOT_TAP_TOGGLE

View file

@ -3,3 +3,7 @@ SRC += 333fred.c
ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
SRC += rgb.c
endif
TAP_DANCE_ENABLE=yes
NKRO_ENABLE = yes
PERMISSIVE_HOLD = yes