summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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 e48702fd6b..862f306d01 100644
--- a/keyboards/ergodash/rev1/keymaps/333fred/config.h
+++ b/keyboards/ergodash/rev1/keymaps/333fred/config.h
@@ -1,7 +1,6 @@
#pragma once
#include QMK_KEYBOARD_CONFIG_H
-#include "333fred_config.h"
#define USE_SERIAL
#define MASTER_LEFT
diff --git a/keyboards/ergodash/rev1/keymaps/333fred/rules.mk b/keyboards/ergodash/rev1/keymaps/333fred/rules.mk
index 9d8ff37e11..2a91ad3ba4 100644
--- a/keyboards/ergodash/rev1/keymaps/333fred/rules.mk
+++ b/keyboards/ergodash/rev1/keymaps/333fred/rules.mk
@@ -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
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h
index 10b9693267..3190132085 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 @@
#pragma once
-#include "333fred_config.h"
-
#define USE_SERIAL
#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c
index bc61579de8..d8ac1910bf 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 @@
#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(
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk
index 79ef33e7c3..6d2e27cb41 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 @@
-
-NKRO_ENABLE = yes
KEY_LOCK_ENABLE = yes
-TAP_DANCE_ENABLE = yes
CONSOLE_ENABLE = no
-PERMISSIVE_HOLD = yes
EXTRAFLAGS += -flto
diff --git a/keyboards/keebio/iris/keymaps/333fred/config.h b/keyboards/keebio/iris/keymaps/333fred/config.h
index 8a866b826d..c3997b0f47 100644
--- a/keyboards/keebio/iris/keymaps/333fred/config.h
+++ b/keyboards/keebio/iris/keymaps/333fred/config.h
@@ -1,7 +1,5 @@
#pragma once
-#include "333fred_config.h"
-
#define USE_SERIAL
#define EE_HANDS
#define NO_ACTION_MACRO
diff --git a/keyboards/keebio/iris/keymaps/333fred/rules.mk b/keyboards/keebio/iris/keymaps/333fred/rules.mk
index 2b5da5a22f..995272e2f2 100644
--- a/keyboards/keebio/iris/keymaps/333fred/rules.mk
+++ b/keyboards/keebio/iris/keymaps/333fred/rules.mk
@@ -1,7 +1,4 @@
-NKRO_ENABLE = yes
KEY_LOCK_ENABLE = yes
-TAP_DANCE_ENABLE = yes
CONSOLE_ENABLE = no
-PERMISSIVE_HOLD = yes
EXTRAFLAGS += -flto
diff --git a/keyboards/naked60/keymaps/333fred/config.h b/keyboards/naked60/keymaps/333fred/config.h
new file mode 100644
index 0000000000..d19e77f044
--- /dev/null
+++ b/keyboards/naked60/keymaps/333fred/config.h
@@ -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
diff --git a/keyboards/naked60/keymaps/333fred/keymap.c b/keyboards/naked60/keymaps/333fred/keymap.c
new file mode 100644
index 0000000000..3331dee9b1
--- /dev/null
+++ b/keyboards/naked60/keymaps/333fred/keymap.c
@@ -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);
+}
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
index 1359e81c09..f858bbe3da 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
+++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
@@ -1,6 +1,4 @@
RGBLIGHT_ENABLE = yes
-NKRO_ENABLE = yes
KEY_LOCK_ENABLE = yes
-TAP_DANCE_ENABLE = yes
CONSOLE_ENABLE = no
EXTRAFLAGS += -flto
diff --git a/layouts/community/ergodox/333fred/config.h b/layouts/community/ergodox/333fred/config.h
index 82255e05ec..5a91ea3aa4 100644
--- a/layouts/community/ergodox/333fred/config.h
+++ b/layouts/community/ergodox/333fred/config.h
@@ -1,7 +1,6 @@
#pragma once
#include QMK_KEYBOARD_CONFIG_H
-#include "333fred_config.h"
#undef TAPPING_TERM
#define TAPPING_TERM 200
diff --git a/layouts/community/ergodox/333fred/rules.mk b/layouts/community/ergodox/333fred/rules.mk
index 1549bcfc84..f6c71feb46 100644
--- a/layouts/community/ergodox/333fred/rules.mk
+++ b/layouts/community/ergodox/333fred/rules.mk
@@ -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
diff --git a/layouts/community/ortho_5x12/333fred/config.h b/layouts/community/ortho_5x12/333fred/config.h
index 7835fa1f07..2e5dfe2e29 100644
--- a/layouts/community/ortho_5x12/333fred/config.h
+++ b/layouts/community/ortho_5x12/333fred/config.h
@@ -1,7 +1,5 @@
#pragma once
-#include "333fred_config.h"
-
#define USE_SERIAL
#define MASTER_LEFT
diff --git a/layouts/community/ortho_5x12/333fred/rules.mk b/layouts/community/ortho_5x12/333fred/rules.mk
index 0cfb234665..9a3e2b97e5 100644
--- a/layouts/community/ortho_5x12/333fred/rules.mk
+++ b/layouts/community/ortho_5x12/333fred/rules.mk
@@ -1,4 +1,2 @@
KEY_LOCK_ENABLE = yes
-NKRO_ENABLE = yes
CONSOLE_ENABLE = no
-TAP_DANCE_ENABLE = yes
diff --git a/users/333fred/333fred_config.h b/users/333fred/config.h
index c099072fc7..5974b78926 100644
--- a/users/333fred/333fred_config.h
+++ b/users/333fred/config.h
@@ -2,3 +2,4 @@
#define PERMISSIVE_HOLD
#define NO_ACTION_MACRO
+#undef ONESHOT_TAP_TOGGLE
diff --git a/users/333fred/rules.mk b/users/333fred/rules.mk
index 0e2cc2588c..191422e365 100644
--- a/users/333fred/rules.mk
+++ b/users/333fred/rules.mk
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 17:55:42 +0000