aboutsummaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorFred Silberberg <fred@silberberg.xyz>2020-10-04 12:24:35 -0700
committerGitHub <noreply@github.com>2020-10-04 12:24:35 -0700
commit1aacbc44d18a1d23c58561ee17498618a1e6319d (patch)
treed941ac9d29fd325b55defcc4686c03c216351f67 /users
parent793de76bb451d2072a4460407dec2b2811dc48ac (diff)
downloadqmk_firmware-1aacbc44d18a1d23c58561ee17498618a1e6319d.tar.gz
qmk_firmware-1aacbc44d18a1d23c58561ee17498618a1e6319d.zip
[Keymap] Added 333fred 5x6_5 keymap (#10272)
* First pass at manuform layout. * Updates from actual usage on my board. Fixed a couple of bugs, added a stormlight quote randomizer. * Use a 32-bit timer that can actually hit 5 minutes. * Some updates after a day of usage: * Turn off WPM. It's too inaccurate and takes up a decent amount of space that can be devoted to quotes. * Turn off the OLEDs after 5 minutes * Move the keys around a bit. * Add many more quotes. * Adjust the quotes to make room for missing and misswritten WoT quote. Adjusted the keymap slightly. Adjust the mods display to include one_shots. * Revert osm on lgui as it makes start menu search impossible to use. * Use LTO_ENABLE flag. * License all of my (333fred's) keymaps as MIT. * Update users/333fred/rgb.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'users')
-rw-r--r--users/333fred/333fred.c22
-rw-r--r--users/333fred/333fred.h35
-rw-r--r--users/333fred/config.h22
-rw-r--r--users/333fred/layout_macros.h22
-rw-r--r--users/333fred/rgb.c22
-rw-r--r--users/333fred/rules.mk1
6 files changed, 117 insertions, 7 deletions
diff --git a/users/333fred/333fred.c b/users/333fred/333fred.c
index 79df8c4de..621b9e664 100644
--- a/users/333fred/333fred.c
+++ b/users/333fred/333fred.c
@@ -1,3 +1,25 @@
1/*
2 Copyright (c) 2020 Fred Silberberg
3
4 Permission is hereby granted, free of charge, to any person obtaining a copy
5 of this software and associated documentation files (the "Software"), to deal
6 in the Software without restriction, including without limitation the rights
7 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 copies of the Software, and to permit persons to whom the Software is
9 furnished to do so, subject to the following conditions:
10
11 The above copyright notice and this permission notice shall be included in all
12 copies or substantial portions of the Software.
13
14 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20 THE SOFTWARE.
21*/
22
1#include "333fred.h" 23#include "333fred.h"
2#include "quantum.h" 24#include "quantum.h"
3#include "action.h" 25#include "action.h"
diff --git a/users/333fred/333fred.h b/users/333fred/333fred.h
index 716b61a25..0532ff2df 100644
--- a/users/333fred/333fred.h
+++ b/users/333fred/333fred.h
@@ -1,16 +1,37 @@
1/*
2 Copyright (c) 2020 Fred Silberberg
3
4 Permission is hereby granted, free of charge, to any person obtaining a copy
5 of this software and associated documentation files (the "Software"), to deal
6 in the Software without restriction, including without limitation the rights
7 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 copies of the Software, and to permit persons to whom the Software is
9 furnished to do so, subject to the following conditions:
10
11 The above copyright notice and this permission notice shall be included in all
12 copies or substantial portions of the Software.
13
14 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20 THE SOFTWARE.
21*/
22
1#pragma once 23#pragma once
2 24
3#include "quantum.h" 25#include "quantum.h"
4#include "layout_macros.h" 26#include "layout_macros.h"
5 27
6#define BASE 0 28#define BASE 0
7#define CODE 1 // code layer 29#define CODEFLOW 1
8#define CODEFLOW 2 30#define SYMB 2
9#define SYMB 3 31#define MDIA 3 // media keys
10#define MDIA 4 // media keys 32#define VIM 4
11#define VIM 5 33#define GAME 5
12#define GAME 6 34#define GAME_ARROW 6
13#define GAME_ARROW 7
14 35
15// Tap dance config shared between my keyboards 36// Tap dance config shared between my keyboards
16enum tap_dance_declarations { 37enum tap_dance_declarations {
diff --git a/users/333fred/config.h b/users/333fred/config.h
index 5974b7892..0bbaa38a9 100644
--- a/users/333fred/config.h
+++ b/users/333fred/config.h
@@ -1,3 +1,25 @@
1/*
2 Copyright (c) 2020 Fred Silberberg
3
4 Permission is hereby granted, free of charge, to any person obtaining a copy
5 of this software and associated documentation files (the "Software"), to deal
6 in the Software without restriction, including without limitation the rights
7 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 copies of the Software, and to permit persons to whom the Software is
9 furnished to do so, subject to the following conditions:
10
11 The above copyright notice and this permission notice shall be included in all
12 copies or substantial portions of the Software.
13
14 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20 THE SOFTWARE.
21*/
22
1#pragma once 23#pragma once
2 24
3#define PERMISSIVE_HOLD 25#define PERMISSIVE_HOLD
diff --git a/users/333fred/layout_macros.h b/users/333fred/layout_macros.h
index 3b163f6ce..d46a41905 100644
--- a/users/333fred/layout_macros.h
+++ b/users/333fred/layout_macros.h
@@ -1,3 +1,25 @@
1/*
2 Copyright (c) 2020 Fred Silberberg
3
4 Permission is hereby granted, free of charge, to any person obtaining a copy
5 of this software and associated documentation files (the "Software"), to deal
6 in the Software without restriction, including without limitation the rights
7 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 copies of the Software, and to permit persons to whom the Software is
9 furnished to do so, subject to the following conditions:
10
11 The above copyright notice and this permission notice shall be included in all
12 copies or substantial portions of the Software.
13
14 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20 THE SOFTWARE.
21*/
22
1#pragma once 23#pragma once
2 24
3#define SIX_TRNS _______, _______, _______, _______, _______, _______ 25#define SIX_TRNS _______, _______, _______, _______, _______, _______
diff --git a/users/333fred/rgb.c b/users/333fred/rgb.c
index c86cd1c77..d28714330 100644
--- a/users/333fred/rgb.c
+++ b/users/333fred/rgb.c
@@ -1,3 +1,25 @@
1/*
2 Copyright (c) 2020 Fred Silberberg
3
4 Permission is hereby granted, free of charge, to any person obtaining a copy
5 of this software and associated documentation files (the "Software"), to deal
6 in the Software without restriction, including without limitation the rights
7 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 copies of the Software, and to permit persons to whom the Software is
9 furnished to do so, subject to the following conditions:
10
11 The above copyright notice and this permission notice shall be included in all
12 copies or substantial portions of the Software.
13
14 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20 THE SOFTWARE.
21*/
22
1#include "quantum.h" 23#include "quantum.h"
2#include "333fred.h" 24#include "333fred.h"
3 25
diff --git a/users/333fred/rules.mk b/users/333fred/rules.mk
index 191422e36..265a6c18c 100644
--- a/users/333fred/rules.mk
+++ b/users/333fred/rules.mk
@@ -7,3 +7,4 @@ endif
7TAP_DANCE_ENABLE=yes 7TAP_DANCE_ENABLE=yes
8NKRO_ENABLE = yes 8NKRO_ENABLE = yes
9PERMISSIVE_HOLD = yes 9PERMISSIVE_HOLD = yes
10LTO_ENABLE = yes