aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Silberberg <fred@silberberg.xyz>2020-04-20 03:00:14 -0700
committerGitHub <noreply@github.com>2020-04-20 11:00:14 +0100
commit2dca087b04c14197b70ed4295139e0c4a40562d9 (patch)
treef45309e8130274dea698cd95d80a28a061734e51
parent7e4cf9ace2fd954a1a735fcbea75f719bfc3fbc2 (diff)
downloadqmk_firmware-2dca087b04c14197b70ed4295139e0c4a40562d9.tar.gz
qmk_firmware-2dca087b04c14197b70ed4295139e0c4a40562d9.zip
Add naked60 layout, clean up my userspace files and rules.mk. (#8848)
Diffstat
-rw-r--r--keyboards/ergodash/rev1/keymaps/333fred/config.h1
-rw-r--r--keyboards/ergodash/rev1/keymaps/333fred/rules.mk2
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h2
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c6
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk4
-rw-r--r--keyboards/keebio/iris/keymaps/333fred/config.h2
-rw-r--r--keyboards/keebio/iris/keymaps/333fred/rules.mk3
-rw-r--r--keyboards/naked60/keymaps/333fred/config.h24
-rw-r--r--keyboards/naked60/keymaps/333fred/keymap.c53
-rw-r--r--keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk2
-rw-r--r--layouts/community/ergodox/333fred/config.h1
-rw-r--r--layouts/community/ergodox/333fred/rules.mk2
-rw-r--r--layouts/community/ortho_5x12/333fred/config.h2
-rw-r--r--layouts/community/ortho_5x12/333fred/rules.mk2
-rw-r--r--users/333fred/config.h (renamed from users/333fred/333fred_config.h)1
-rw-r--r--users/333fred/rules.mk4
16 files changed, 82 insertions, 29 deletions
diff --git a/keyboards/ergodash/rev1/keymaps/333fred/config.h b/keyboards/ergodash/rev1/keymaps/333fred/config.h
index e48702fd6..862f306d0 100644
--- a/keyboards/ergodash/rev1/keymaps/333fred/config.h
+++ b/keyboards/ergodash/rev1/keymaps/333fred/config.h
@@ -1,7 +1,6 @@
1#pragma once 1#pragma once
2 2
3#include QMK_KEYBOARD_CONFIG_H 3#include QMK_KEYBOARD_CONFIG_H
4#include "333fred_config.h"
5 4
6#define USE_SERIAL 5#define USE_SERIAL
7#define MASTER_LEFT 6#define MASTER_LEFT
diff --git a/keyboards/ergodash/rev1/keymaps/333fred/rules.mk b/keyboards/ergodash/rev1/keymaps/333fred/rules.mk
index 9d8ff37e1..2a91ad3ba 100644
--- a/keyboards/ergodash/rev1/keymaps/333fred/rules.mk
+++ b/keyboards/ergodash/rev1/keymaps/333fred/rules.mk
@@ -1,7 +1,5 @@
1BACKLIGHT_ENABLE = no 1BACKLIGHT_ENABLE = no
2RGBLIGHT_ENABLE = yes 2RGBLIGHT_ENABLE = yes
3AUDIO_ENABLE = no 3AUDIO_ENABLE = no
4NKRO_ENABLE = yes
5KEY_LOCK_ENABLE = yes 4KEY_LOCK_ENABLE = yes
6TAP_DANCE_ENABLE = yes
7CONSOLE_ENABLE = no 5CONSOLE_ENABLE = no
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h
index 10b969326..319013208 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h
@@ -1,7 +1,5 @@
1#pragma once 1#pragma once
2 2
3#include "333fred_config.h"
4
5#define USE_SERIAL 3#define USE_SERIAL
6#define EE_HANDS 4#define EE_HANDS
7 5
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c
index bc61579de..d8ac1910b 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c
@@ -1,12 +1,6 @@
1#include QMK_KEYBOARD_H 1#include QMK_KEYBOARD_H
2#include "333fred.h" 2#include "333fred.h"
3 3
4enum custom_macros {
5 DLEFT,
6 DRIGHT,
7 PSCREEN_APP
8};
9
10const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 4const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
11 5
12 [BASE] = LAYOUT_5x6( 6 [BASE] = LAYOUT_5x6(
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk
index 79ef33e7c..6d2e27cb4 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk
@@ -1,7 +1,3 @@
1
2NKRO_ENABLE = yes
3KEY_LOCK_ENABLE = yes 1KEY_LOCK_ENABLE = yes
4TAP_DANCE_ENABLE = yes
5CONSOLE_ENABLE = no 2CONSOLE_ENABLE = no
6PERMISSIVE_HOLD = yes
7EXTRAFLAGS += -flto 3EXTRAFLAGS += -flto
diff --git a/keyboards/keebio/iris/keymaps/333fred/config.h b/keyboards/keebio/iris/keymaps/333fred/config.h
index 8a866b826..c3997b0f4 100644
--- a/keyboards/keebio/iris/keymaps/333fred/config.h
+++ b/keyboards/keebio/iris/keymaps/333fred/config.h
@@ -1,7 +1,5 @@
1#pragma once 1#pragma once
2 2
3#include "333fred_config.h"
4
5#define USE_SERIAL 3#define USE_SERIAL
6#define EE_HANDS 4#define EE_HANDS
7#define NO_ACTION_MACRO 5#define NO_ACTION_MACRO
diff --git a/keyboards/keebio/iris/keymaps/333fred/rules.mk b/keyboards/keebio/iris/keymaps/333fred/rules.mk
index 2b5da5a22..995272e2f 100644
--- a/keyboards/keebio/iris/keymaps/333fred/rules.mk
+++ b/keyboards/keebio/iris/keymaps/333fred/rules.mk
@@ -1,7 +1,4 @@
1NKRO_ENABLE = yes
2KEY_LOCK_ENABLE = yes 1KEY_LOCK_ENABLE = yes
3TAP_DANCE_ENABLE = yes
4CONSOLE_ENABLE = no 2CONSOLE_ENABLE = no
5PERMISSIVE_HOLD = yes
6EXTRAFLAGS += -flto 3EXTRAFLAGS += -flto
7 4
diff --git a/keyboards/naked60/keymaps/333fred/config.h b/keyboards/naked60/keymaps/333fred/config.h
new file mode 100644
index 000000000..d19e77f04
--- /dev/null
+++ b/keyboards/naked60/keymaps/333fred/config.h
@@ -0,0 +1,24 @@
1/* Copyright 2018 Salicylic_acid3
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19
20
21/* Select hand configuration */
22
23#define TAPPING_FORCE_HOLD
24#define TAPPING_TERM 200
diff --git a/keyboards/naked60/keymaps/333fred/keymap.c b/keyboards/naked60/keymaps/333fred/keymap.c
new file mode 100644
index 000000000..3331dee9b
--- /dev/null
+++ b/keyboards/naked60/keymaps/333fred/keymap.c
@@ -0,0 +1,53 @@
1#include QMK_KEYBOARD_H
2#include "333fred.h"
3
4const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5 [BASE] = LAYOUT(
6 //,--------------------------------------------------------------------| |---------------------------------------------------------.
7 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
8 //|--------------+------------+------+--------+--------+---------------| |-------+--------+--------+-------+--------+--------------|
9 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
10 //|--------------+------------+------+--------+--------+---------------| |-------+--------+--------+-------+--------+--------------|
11 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
12 //|--------------+------------+------+--------+--------+---------------| |-------+--------+--------+-------+--------+--------------|
13 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),
14 //|--------------+------------+------+--------+--------+---------------+-------+-------+-------+--------+--------+-------+--------+--------------|
15 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
16 //`----------------------------------------------------------------------------------------------------------------'
17 ),
18
19
20 [SYMB] = LAYOUT(
21 //,-----------------------------------------------------| |-----------------------------------------------------.
22 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______,
23 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+-------+--------+--------|
24 _______, KC_EXLM, KC_AT, KC_LPRN, KC_RPRN, KC_PIPE, _______, KC_7, KC_8, KC_9, _______, KC_F12,
25 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+-------+--------+--------|
26 _______, KC_HASH, KC_DLR, KC_LCBR, KC_RCBR, KC_GRV, KC_VOLU, KC_4, KC_5, KC_6, _______, _______,
27 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+-------+--------+--------|
28 _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_VOLD, KC_1, KC_2, KC_3, _______, _______,
29 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------+--------|
30 _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_0, KC_ENT, _______
31 //`------------------------------------------------------------------------------------------------------------'
32 ),
33
34
35 [VIM] = LAYOUT( /* Base */
36 //,-----------------------------------------------------| |-----------------------------------------------------.
37 _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
39 _______, _______, _______, _______, KC_LSFT, _______, _______, _______, _______, _______, _______, _______,
40 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
41 _______, DLEFT, DRIGHT, KC_LCTL, KC_LGUI, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
42 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
44 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
46 //`------------------------------------------------------------------------------------------------------------'
47 )
48};
49
50bool process_record_user(uint16_t keycode, keyrecord_t *record) {
51 tap_dance_process_keycode(keycode);
52 return !try_handle_macro(keycode, record);
53}
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
index 1359e81c0..f858bbe3d 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
+++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
@@ -1,6 +1,4 @@
1RGBLIGHT_ENABLE = yes 1RGBLIGHT_ENABLE = yes
2NKRO_ENABLE = yes
3KEY_LOCK_ENABLE = yes 2KEY_LOCK_ENABLE = yes
4TAP_DANCE_ENABLE = yes
5CONSOLE_ENABLE = no 3CONSOLE_ENABLE = no
6EXTRAFLAGS += -flto 4EXTRAFLAGS += -flto
diff --git a/layouts/community/ergodox/333fred/config.h b/layouts/community/ergodox/333fred/config.h
index 82255e05e..5a91ea3aa 100644
--- a/layouts/community/ergodox/333fred/config.h
+++ b/layouts/community/ergodox/333fred/config.h
@@ -1,7 +1,6 @@
1#pragma once 1#pragma once
2 2
3#include QMK_KEYBOARD_CONFIG_H 3#include QMK_KEYBOARD_CONFIG_H
4#include "333fred_config.h"
5 4
6#undef TAPPING_TERM 5#undef TAPPING_TERM
7#define TAPPING_TERM 200 6#define TAPPING_TERM 200
diff --git a/layouts/community/ergodox/333fred/rules.mk b/layouts/community/ergodox/333fred/rules.mk
index 1549bcfc8..f6c71feb4 100644
--- a/layouts/community/ergodox/333fred/rules.mk
+++ b/layouts/community/ergodox/333fred/rules.mk
@@ -1,7 +1,5 @@
1LCD_BACKLIGHT_ENABLE = yes 1LCD_BACKLIGHT_ENABLE = yes
2LCD_ENABLE = yes 2LCD_ENABLE = yes
3BACKLIGHT_ENABLE = yes 3BACKLIGHT_ENABLE = yes
4NKRO_ENABLE = yes
5KEY_LOCK_ENABLE = yes 4KEY_LOCK_ENABLE = yes
6TAP_DANCE_ENABLE = yes
7CONSOLE_ENABLE = no 5CONSOLE_ENABLE = no
diff --git a/layouts/community/ortho_5x12/333fred/config.h b/layouts/community/ortho_5x12/333fred/config.h
index 7835fa1f0..2e5dfe2e2 100644
--- a/layouts/community/ortho_5x12/333fred/config.h
+++ b/layouts/community/ortho_5x12/333fred/config.h
@@ -1,7 +1,5 @@
1#pragma once 1#pragma once
2 2
3#include "333fred_config.h"
4
5#define USE_SERIAL 3#define USE_SERIAL
6#define MASTER_LEFT 4#define MASTER_LEFT
7 5
diff --git a/layouts/community/ortho_5x12/333fred/rules.mk b/layouts/community/ortho_5x12/333fred/rules.mk
index 0cfb23466..9a3e2b97e 100644
--- a/layouts/community/ortho_5x12/333fred/rules.mk
+++ b/layouts/community/ortho_5x12/333fred/rules.mk
@@ -1,4 +1,2 @@
1KEY_LOCK_ENABLE = yes 1KEY_LOCK_ENABLE = yes
2NKRO_ENABLE = yes
3CONSOLE_ENABLE = no 2CONSOLE_ENABLE = no
4TAP_DANCE_ENABLE = yes
diff --git a/users/333fred/333fred_config.h b/users/333fred/config.h
index c099072fc..5974b7892 100644
--- a/users/333fred/333fred_config.h
+++ b/users/333fred/config.h
@@ -2,3 +2,4 @@
2 2
3#define PERMISSIVE_HOLD 3#define PERMISSIVE_HOLD
4#define NO_ACTION_MACRO 4#define NO_ACTION_MACRO
5#undef ONESHOT_TAP_TOGGLE
diff --git a/users/333fred/rules.mk b/users/333fred/rules.mk
index 0e2cc2588..191422e36 100644
--- a/users/333fred/rules.mk
+++ b/users/333fred/rules.mk
@@ -3,3 +3,7 @@ SRC += 333fred.c
3ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) 3ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
4 SRC += rgb.c 4 SRC += rgb.c
5endif 5endif
6
7TAP_DANCE_ENABLE=yes
8NKRO_ENABLE = yes
9PERMISSIVE_HOLD = yes
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-07 09:01:54 +0000