Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 20, 2020
+82 −29
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion keyboards/ergodash/rev1/keymaps/333fred/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include QMK_KEYBOARD_CONFIG_H
#include "333fred_config.h"

#define USE_SERIAL
#define MASTER_LEFT
Expand Down
2 changes: 0 additions & 2 deletions keyboards/ergodash/rev1/keymaps/333fred/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#pragma once

#include "333fred_config.h"

#define USE_SERIAL
#define EE_HANDS

Expand Down
6 changes: 0 additions & 6 deletions keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
4 changes: 0 additions & 4 deletions keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@

NKRO_ENABLE = yes
KEY_LOCK_ENABLE = yes
TAP_DANCE_ENABLE = yes
CONSOLE_ENABLE = no
PERMISSIVE_HOLD = yes
EXTRAFLAGS += -flto
2 changes: 0 additions & 2 deletions keyboards/keebio/iris/keymaps/333fred/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#pragma once

#include "333fred_config.h"

#define USE_SERIAL
#define EE_HANDS
#define NO_ACTION_MACRO
Expand Down
3 changes: 0 additions & 3 deletions keyboards/keebio/iris/keymaps/333fred/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
NKRO_ENABLE = yes
KEY_LOCK_ENABLE = yes
TAP_DANCE_ENABLE = yes
CONSOLE_ENABLE = no
PERMISSIVE_HOLD = yes
EXTRAFLAGS += -flto

24 changes: 24 additions & 0 deletions keyboards/naked60/keymaps/333fred/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
53 changes: 53 additions & 0 deletions keyboards/naked60/keymaps/333fred/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
2 changes: 0 additions & 2 deletions keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
RGBLIGHT_ENABLE = yes
NKRO_ENABLE = yes
KEY_LOCK_ENABLE = yes
TAP_DANCE_ENABLE = yes
CONSOLE_ENABLE = no
EXTRAFLAGS += -flto
1 change: 0 additions & 1 deletion layouts/community/ergodox/333fred/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include QMK_KEYBOARD_CONFIG_H
#include "333fred_config.h"

#undef TAPPING_TERM
#define TAPPING_TERM 200
2 changes: 0 additions & 2 deletions layouts/community/ergodox/333fred/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions layouts/community/ortho_5x12/333fred/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#pragma once

#include "333fred_config.h"

#define USE_SERIAL
#define MASTER_LEFT

Expand Down
2 changes: 0 additions & 2 deletions layouts/community/ortho_5x12/333fred/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
KEY_LOCK_ENABLE = yes
NKRO_ENABLE = yes
CONSOLE_ENABLE = no
TAP_DANCE_ENABLE = yes
1 change: 1 addition & 0 deletions users/333fred/333fred_config.h → users/333fred/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

#define PERMISSIVE_HOLD
#define NO_ACTION_MACRO
#undef ONESHOT_TAP_TOGGLE
4 changes: 4 additions & 0 deletions users/333fred/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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