aboutsummaryrefslogtreecommitdiff
path: root/keyboards/lfkeyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lfkeyboards')
-rw-r--r--keyboards/lfkeyboards/issi.h5
-rw-r--r--keyboards/lfkeyboards/lfk65_hs/config.h5
-rw-r--r--keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h65
-rw-r--r--keyboards/lfkeyboards/lfk78/post_rules.mk14
-rw-r--r--keyboards/lfkeyboards/lfk78/rules.mk15
-rw-r--r--keyboards/lfkeyboards/lfk87/config.h5
-rw-r--r--keyboards/lfkeyboards/lfk87/lfk87.h151
-rw-r--r--keyboards/lfkeyboards/lfk87/post_rules.mk13
-rw-r--r--keyboards/lfkeyboards/lfk87/rules.mk15
-rw-r--r--keyboards/lfkeyboards/lfkpad/post_rules.mk7
-rw-r--r--keyboards/lfkeyboards/lfkpad/rules.mk8
-rw-r--r--keyboards/lfkeyboards/lighting.h6
-rw-r--r--keyboards/lfkeyboards/mini1800/config.h5
-rw-r--r--keyboards/lfkeyboards/mini1800/mini1800.h44
-rw-r--r--keyboards/lfkeyboards/mini1800/post_rules.mk9
-rw-r--r--keyboards/lfkeyboards/mini1800/rules.mk9
16 files changed, 164 insertions, 212 deletions
diff --git a/keyboards/lfkeyboards/issi.h b/keyboards/lfkeyboards/issi.h
index 51777f6ee..74379ddbc 100644
--- a/keyboards/lfkeyboards/issi.h
+++ b/keyboards/lfkeyboards/issi.h
@@ -1,6 +1,6 @@
1#pragma once
2
1#ifdef ISSI_ENABLE 3#ifdef ISSI_ENABLE
2#ifndef ISSI_H
3#define ISSI_H
4 4
5typedef struct ISSIDeviceStruct{ 5typedef struct ISSIDeviceStruct{
6 uint8_t fn_dirty; // function registers need to be resent 6 uint8_t fn_dirty; // function registers need to be resent
@@ -37,4 +37,3 @@ void activateLED(uint8_t matrix, uint8_t cx, uint8_t cy, uint8_t pwm);
37void update_issi(uint8_t device_addr, uint8_t blocking); 37void update_issi(uint8_t device_addr, uint8_t blocking);
38 38
39#endif 39#endif
40#endif \ No newline at end of file
diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h
index 8107d3ccc..e980bb97b 100644
--- a/keyboards/lfkeyboards/lfk65_hs/config.h
+++ b/keyboards/lfkeyboards/lfk65_hs/config.h
@@ -1,5 +1,4 @@
1#ifndef CONFIG_H 1#pragma once
2#define CONFIG_H
3 2
4#include "config_common.h" 3#include "config_common.h"
5 4
@@ -131,5 +130,3 @@
131//#define NO_ACTION_ONESHOT 130//#define NO_ACTION_ONESHOT
132//#define NO_ACTION_MACRO 131//#define NO_ACTION_MACRO
133//#define NO_ACTION_FUNCTION 132//#define NO_ACTION_FUNCTION
134
135#endif
diff --git a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h
index 325645165..6ba3a63e8 100644
--- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h
+++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h
@@ -1,5 +1,4 @@
1#ifndef LFK65_HS_H 1#pragma once
2#define LFK65_HS_H
3 2
4#include "quantum.h" 3#include "quantum.h"
5#include "matrix.h" 4#include "matrix.h"
@@ -13,58 +12,56 @@ void reset_keyboard_kb(void);
13 12
14/* All Keymap - contains every possible switch 13/* All Keymap - contains every possible switch
15* ,-------------------------------------------------------------------------------. 14* ,-------------------------------------------------------------------------------.
16* | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D | 1E | 1F | 1G | 15* | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 0B | 0C | 0D | 0E | 0F |
17* |-------------------------------------------------------------------------------| 16* |-------------------------------------------------------------------------------|
18* | 21 | 22 |23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D | 2F | 2G | 17* | 10 | 11 |12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1E | 1F |
19* |-------------------------------------------------------------------------------| 18* |-------------------------------------------------------------------------------|
20* | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3F | 3G | 19* | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2E | 2F |
21* |-------------------------------------------------------------------------------| 20* |-------------------------------------------------------------------------------|
22* | 41 | 42 | 43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C | 4D | 4F | 4G | 21* | 30 |31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3E | 3F |
23* |-------------------------------------------------------------------------------| 22* |-------------------------------------------------------------------------------|
24* | 51 | 52 | 53 | 57 | 5A | 5B | 5C | 5D | 5E | 3E | 4E | 23* | 40 | 41 | 42 | 46 | 4A | 4B | 4C | 4D | 2D | 3D |
25* `-------------------------------------------------------------------------------' 24* `-------------------------------------------------------------------------------'
26*/ 25*/
27// The first section contains all of the arguements 26// The first section contains all of the arguements
28// The second converts the arguments into a two-dimensional array 27// The second converts the arguments into a two-dimensional array
29#define LAYOUT_all( \ 28#define LAYOUT_all( \
30 k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \ 29 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
31 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, k2G, \ 30 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, k1F, \
32 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, k3G, \ 31 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, k2F, \
33 k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4F, k4G, \ 32 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, \
34 k51, k52, k53, k57, k5B, k5C, k5D, k5E, k3E, k4E \ 33 k40, k41, k42, k46, k4A, k4B, k4C, k4D, k2D, k3D \
35) { \ 34) { \
36 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ 35 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
37 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \ 36 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E, k1F }, \
38 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G }, \ 37 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
39 { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \ 38 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
40 { k51, k52, k53, ___, ___, ___, k57, ___, ___, ___, k5B, k5C, k5D, k5E, ___, ___ } \ 39 { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, ___, ___ } \
41} 40}
42 41
43/* ANSI Keymap 42/* ANSI Keymap
44* ,-------------------------------------------------------------------------------. 43* ,-------------------------------------------------------------------------------.
45* | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D | 1E | 1G | 44* | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 0B | 0C | 0E | 0F |
46* |-------------------------------------------------------------------------------| 45* |-------------------------------------------------------------------------------|
47* | 21 | 22 |23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D | 2F | 2G | 46* | 10 | 11 |12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1E | 1F |
48* |-------------------------------------------------------------------------------| 47* |-------------------------------------------------------------------------------|
49* | 31 | 32 |33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3F | 3G | 48* | 20 | 21 |22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2E | 2F |
50* |-------------------------------------------------------------------------------| 49* |-------------------------------------------------------------------------------|
51* | 41 | 42 |43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C | 4D | 4F | 4G | 50* | 30 | 32 |33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3E | 3F |
52* |-------------------------------------------------------------------------------| 51* |-------------------------------------------------------------------------------|
53* | 51 | 52 | 53 | 57 | 5A | 5B | 5C | 5D | 5E | 3E | 4E | 52* | 40 | 41 | 42 | 46 | 4A | 4B | 4C | 4D | 2D | 3D |
54* `-------------------------------------------------------------------------------' 53* `-------------------------------------------------------------------------------'
55*/ 54*/
56#define LAYOUT_ansi( \ 55#define LAYOUT_ansi( \
57 k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, k1G, \ 56 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \
58 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, k2G, \ 57 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, k1F, \
59 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3F, k3G, \ 58 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2E, k2F, \
60 k41, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4F, k4G, \ 59 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, \
61 k51, k52, k53, k57, k5B, k5C, k5D, k5E, k3E, k4E \ 60 k40, k41, k42, k46, k4A, k4B, k4C, k4D, k2D, k3D \
62) { \ 61) { \
63 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F, k1G }, \ 62 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F }, \
64 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \ 63 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E, k1F }, \
65 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G }, \ 64 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, k2E, k2F }, \
66 { k41, ___, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \ 65 { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
67 { k51, k52, k53, ___, ___, ___, k57, ___, ___, ___, k5B, k5C, k5D, k5E, ___, ___ } \ 66 { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, ___, ___ } \
68} 67}
69
70#endif //LFK65_HS_H
diff --git a/keyboards/lfkeyboards/lfk78/post_rules.mk b/keyboards/lfkeyboards/lfk78/post_rules.mk
new file mode 100644
index 000000000..03f975b9d
--- /dev/null
+++ b/keyboards/lfkeyboards/lfk78/post_rules.mk
@@ -0,0 +1,14 @@
1# Extra source files for IS3731 lighting
2SRC += TWIlib.c issi.c lighting.c
3
4ifeq ($(strip $(ISSI_ENABLE)), yes)
5 TMK_COMMON_DEFS += -DISSI_ENABLE
6endif
7
8ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
9 TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
10endif
11
12ifeq ($(strip $(CAPSLOCK_LED)), yes)
13 TMK_COMMON_DEFS += -DCAPSLOCK_LED
14endif
diff --git a/keyboards/lfkeyboards/lfk78/rules.mk b/keyboards/lfkeyboards/lfk78/rules.mk
index 81f532615..972e09af5 100644
--- a/keyboards/lfkeyboards/lfk78/rules.mk
+++ b/keyboards/lfkeyboards/lfk78/rules.mk
@@ -24,19 +24,4 @@ ISSI_ENABLE = yes # If the I2C pullup resistors aren't install thi
24WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan isn't run every 250ms 24WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan isn't run every 250ms
25CAPSLOCK_LED = no # Toggle back light LED of Caps Lock 25CAPSLOCK_LED = no # Toggle back light LED of Caps Lock
26 26
27# Extra source files for IS3731 lighting
28SRC = TWIlib.c issi.c lighting.c
29
30ifeq ($(strip $(ISSI_ENABLE)), yes)
31 TMK_COMMON_DEFS += -DISSI_ENABLE
32endif
33
34ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
35 TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
36endif
37
38ifeq ($(strip $(CAPSLOCK_LED)), yes)
39 TMK_COMMON_DEFS += -DCAPSLOCK_LED
40endif
41
42DEFAULT_FOLDER = lfkeyboards/lfk78/revj 27DEFAULT_FOLDER = lfkeyboards/lfk78/revj
diff --git a/keyboards/lfkeyboards/lfk87/config.h b/keyboards/lfkeyboards/lfk87/config.h
index c03059092..1628deab2 100644
--- a/keyboards/lfkeyboards/lfk87/config.h
+++ b/keyboards/lfkeyboards/lfk87/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef CONFIG_H 18#pragma once
19#define CONFIG_H
20 19
21#include "config_common.h" 20#include "config_common.h"
22 21
@@ -162,5 +161,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
162//#define NO_ACTION_ONESHOT 161//#define NO_ACTION_ONESHOT
163//#define NO_ACTION_MACRO 162//#define NO_ACTION_MACRO
164//#define NO_ACTION_FUNCTION 163//#define NO_ACTION_FUNCTION
165
166#endif
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.h b/keyboards/lfkeyboards/lfk87/lfk87.h
index 5c1fba6ba..1b1368659 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.h
+++ b/keyboards/lfkeyboards/lfk87/lfk87.h
@@ -1,5 +1,4 @@
1#ifndef LFK87_H 1#pragma once
2#define LFK87_H
3 2
4#include "quantum.h" 3#include "quantum.h"
5#include "matrix.h" 4#include "matrix.h"
@@ -44,85 +43,75 @@ void click(uint16_t freq, uint16_t duration);
44#define ___ KC_NO 43#define ___ KC_NO
45 44
46#ifdef LFK_TKL_REV_A 45#ifdef LFK_TKL_REV_A
47 #ifndef LAYOUT_tkl_ansi 46# ifndef LAYOUT_tkl_ansi
48 #define LAYOUT_tkl_ansi( \ 47# define LAYOUT_tkl_ansi( \
49 k11, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \ 48 k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \
50 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \ 49 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \
51 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, k3h, \ 50 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, \
52 k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, \ 51 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
53 k51, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5g, \ 52 k40, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4F, \
54 k61, k62, k63, k67, k6b, k6c, k6d, k6e, k6f, k6g, k6h \ 53 k50, k51, k52, k56, k5A, k5B, k5C, k5D, k5E, k5F, k5G \
55 ) \ 54) { \
56 { \ 55 { k00, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
57 { k11, ___, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \ 56 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
58 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ 57 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
59 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, k3h }, \ 58 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___, ___, ___ }, \
60 { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, ___, ___, ___ }, \ 59 { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, ___, ___, k4F, ___ }, \
61 { k51, ___, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, ___, ___, k5g, ___ }, \ 60 { k50, k51, k52, ___, ___, ___, k56, ___, ___, ___, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
62 { k61, k62, k63, ___, ___, ___, k67, ___, ___, ___, k6b, k6c, k6d, k6e, k6f, k6g, k6h }, \ 61}
63 }
64
65 #endif // !LAYOUT_tkl_ansi 62 #endif // !LAYOUT_tkl_ansi
66 #ifndef LAYOUT_tkl_iso 63# ifndef LAYOUT_tkl_iso
67 #define LAYOUT_tkl_iso( \ 64# define LAYOUT_tkl_iso( \
68 k11, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \ 65 k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \
69 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \ 66 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \
70 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3f, k3g, k3h, \ 67 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, k2F, k2G, \
71 k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k3e, \ 68 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k2D, \
72 k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5g, \ 69 k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4F, \
73 k61, k62, k63, k67, k6b, k6c, k6d, k6e, k6f, k6g, k6h \ 70 k50, k51, k52, k56, k5A, k5B, k5C, k5D, k5E, k5F, k5G \
74 ) \ 71) { \
75 { \ 72 { k00, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
76 { k11, ___, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \ 73 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
77 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ 74 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
78 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, k3h }, \ 75 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___, ___, ___ }, \
79 { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, ___, ___, ___ }, \ 76 { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, ___, ___, k4F, ___ }, \
80 { k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, ___, ___, k5g, ___ }, \ 77 { k50, k51, k52, ___, ___, ___, k56, ___, ___, ___, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
81 { k61, k62, k63, ___, ___, ___, k67, ___, ___, ___, k6b, k6c, k6d, k6e, k6f, k6g, k6h }, \ 78}
82 } 79# endif // !LAYOUT_tkl_iso
83
84 #endif // !LAYOUT_tkl_iso
85#else // RevC+ keymaps 80#else // RevC+ keymaps
86 #ifndef LAYOUT_tkl_ansi 81# ifndef LAYOUT_tkl_ansi
87 #define LAYOUT_tkl_ansi( \ 82# define LAYOUT_tkl_ansi( \
88 k71, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, k1g, \ 83 k60, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0D, k0E, k0F, \
89 k72, k73, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, \ 84 k61, k62, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1E, k1F, \
90 k74, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, \ 85 k63, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \
91 k61, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, \ 86 k50, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
92 k62, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5f, \ 87 k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4E, \
93 k63, k64, k65, k67, k6a, k6b, k6c, k6d, k6e, k6f, k6g \ 88 k52, k53, k54, k56, k59, k5A, k5B, k5C, k5D, k5E, k5F \
94 ) \ 89) { \
95 { \ 90 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, ___, k0D, k0E, k0F }, \
96 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, k1f, k1g }, \ 91 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, ___, k1D, k1E, k1F }, \
97 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e, k2f, k2g }, \ 92 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
98 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g }, \ 93 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, ___, ___, ___, ___ }, \
99 { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, ___, ___ }, \ 94 { ___, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, ___, ___, k4E, ___ }, \
100 { ___, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, ___, ___, k5f, ___ }, \ 95 { k50, k51, k52, k53, k54, ___, k56, ___, ___, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
101 { k61, k62, k63, k64, k65, ___, k67, ___, ___, k6a, k6b, k6c, k6d, k6e, k6f, k6g }, \ 96 { k60, k61, k62, k63, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \
102 { k71, k72, k73, k74, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ 97}
103 } 98# endif // !LAYOUT_tkl_ansi
104 99# ifndef LAYOUT_tkl_iso
105 #endif // !LAYOUT_tkl_ansi 100# define LAYOUT_tkl_iso( \
106 #ifndef LAYOUT_tkl_iso 101 k60, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0D, k0E, k0F, \
107 #define LAYOUT_tkl_iso( \ 102 k61, k62, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1E, k1F, \
108 k71, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, k1g, \ 103 k63, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, k2F, \
109 k72, k73, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, \ 104 k50, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k2C, \
110 k74, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, k3g, \ 105 k51, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4E, \
111 k61, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k3d, \ 106 k52, k53, k54, k56, k59, k5A, k5B, k5C, k5D, k5E, k5F \
112 k62, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5f, \ 107) { \
113 k63, k64, k65, k67, k6a, k6b, k6c, k6d, k6e, k6f, k6g \ 108 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, ___, k0D, k0E, k0F }, \
114 ) \ 109 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, ___, k1D, k1E, k1F }, \
115 { \ 110 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
116 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, k1f, k1g }, \ 111 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, ___, ___, ___, ___ }, \
117 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e, k2f, k2g }, \ 112 { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, ___, ___, k4E, ___ }, \
118 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g }, \ 113 { k50, k51, k52, k53, k54, ___, k56, ___, ___, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
119 { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, ___, ___ }, \ 114 { k60, k61, k62, k63, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \
120 { k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, ___, ___, k5f, ___ }, \ 115}
121 { k61, k62, k63, k64, k65, ___, k67, ___, ___, k6a, k6b, k6c, k6d, k6e, k6f, k6g }, \ 116# endif // !LAYOUT_tkl_iso
122 { k71, k72, k73, k74, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
123 }
124
125 #endif // !LAYOUT_tkl_iso
126#endif //Rev 117#endif //Rev
127
128#endif //LFK87_H
diff --git a/keyboards/lfkeyboards/lfk87/post_rules.mk b/keyboards/lfkeyboards/lfk87/post_rules.mk
new file mode 100644
index 000000000..563462dd9
--- /dev/null
+++ b/keyboards/lfkeyboards/lfk87/post_rules.mk
@@ -0,0 +1,13 @@
1ifeq ($(LFK_REV), A)
2 MCU = at90usb1286
3else
4 MCU = at90usb646
5endif
6
7ifeq ($(strip $(ISSI_ENABLE)), yes)
8 OPT_DEFS += -DISSI_ENABLE
9endif
10
11ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
12 OPT_DEFS += -DWATCHDOG_ENABLE
13endif
diff --git a/keyboards/lfkeyboards/lfk87/rules.mk b/keyboards/lfkeyboards/lfk87/rules.mk
index 7f5621b03..bc988f15a 100644
--- a/keyboards/lfkeyboards/lfk87/rules.mk
+++ b/keyboards/lfkeyboards/lfk87/rules.mk
@@ -6,11 +6,6 @@
6# 6#
7LFK_REV = C 7LFK_REV = C
8 8
9ifeq ($(LFK_REV), A)
10 MCU = at90usb1286
11else
12 MCU = at90usb646
13endif
14BOOTLOADER = atmel-dfu 9BOOTLOADER = atmel-dfu
15OPT_DEFS += -DLFK_TKL_REV_$(LFK_REV) 10OPT_DEFS += -DLFK_TKL_REV_$(LFK_REV)
16 11
@@ -42,13 +37,3 @@ TAP_DANCE_ENABLE = no
42 37
43ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled 38ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled
44WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan isn't run every 250ms 39WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan isn't run every 250ms
45
46
47
48ifeq ($(strip $(ISSI_ENABLE)), yes)
49 OPT_DEFS += -DISSI_ENABLE
50endif
51
52ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
53 OPT_DEFS += -DWATCHDOG_ENABLE
54endif
diff --git a/keyboards/lfkeyboards/lfkpad/post_rules.mk b/keyboards/lfkeyboards/lfkpad/post_rules.mk
new file mode 100644
index 000000000..ad997587b
--- /dev/null
+++ b/keyboards/lfkeyboards/lfkpad/post_rules.mk
@@ -0,0 +1,7 @@
1ifeq ($(strip $(ISSI_ENABLE)), yes)
2 TMK_COMMON_DEFS += -DISSI_ENABLE
3endif
4
5ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
6 TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
7endif
diff --git a/keyboards/lfkeyboards/lfkpad/rules.mk b/keyboards/lfkeyboards/lfkpad/rules.mk
index 942f11368..392a0bdb9 100644
--- a/keyboards/lfkeyboards/lfkpad/rules.mk
+++ b/keyboards/lfkeyboards/lfkpad/rules.mk
@@ -29,12 +29,4 @@ WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan() isn't run every
29 29
30SRC = TWIlib.c issi.c lighting.c 30SRC = TWIlib.c issi.c lighting.c
31 31
32ifeq ($(strip $(ISSI_ENABLE)), yes)
33 TMK_COMMON_DEFS += -DISSI_ENABLE
34endif
35
36ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
37 TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
38endif
39
40LAYOUTS = numpad_6x4 32LAYOUTS = numpad_6x4
diff --git a/keyboards/lfkeyboards/lighting.h b/keyboards/lfkeyboards/lighting.h
index 69e63268d..cb07755c5 100644
--- a/keyboards/lfkeyboards/lighting.h
+++ b/keyboards/lfkeyboards/lighting.h
@@ -1,6 +1,4 @@
1#ifndef LIGHTING_H 1#pragma once
2#define LIGHTING_H
3
4 2
5// rgb_sequence[RGBLED_NUM] 3// rgb_sequence[RGBLED_NUM]
6// 4//
@@ -49,5 +47,3 @@ void set_backlight(uint8_t level);
49void set_underglow(uint8_t red, uint8_t green, uint8_t blue); 47void set_underglow(uint8_t red, uint8_t green, uint8_t blue);
50void set_rgb(uint8_t rgb_led, uint8_t red, uint8_t green, uint8_t blue); 48void set_rgb(uint8_t rgb_led, uint8_t red, uint8_t green, uint8_t blue);
51void set_backlight_by_keymap(uint8_t col, uint8_t row); 49void set_backlight_by_keymap(uint8_t col, uint8_t row);
52
53#endif \ No newline at end of file
diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h
index b8c0f2b67..df9f1c4ba 100644
--- a/keyboards/lfkeyboards/mini1800/config.h
+++ b/keyboards/lfkeyboards/mini1800/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef CONFIG_H 18#pragma once
19#define CONFIG_H
20 19
21#include "config_common.h" 20#include "config_common.h"
22 21
@@ -149,5 +148,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
149//#define NO_ACTION_ONESHOT 148//#define NO_ACTION_ONESHOT
150//#define NO_ACTION_MACRO 149//#define NO_ACTION_MACRO
151//#define NO_ACTION_FUNCTION 150//#define NO_ACTION_FUNCTION
152
153#endif
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.h b/keyboards/lfkeyboards/mini1800/mini1800.h
index c007d7f76..3e460c8a1 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.h
+++ b/keyboards/lfkeyboards/mini1800/mini1800.h
@@ -1,5 +1,4 @@
1#ifndef LFK87_H 1#pragma once
2#define LFK87_H
3 2
4#include "quantum.h" 3#include "quantum.h"
5#include "matrix.h" 4#include "matrix.h"
@@ -43,33 +42,18 @@ void click(uint16_t freq, uint16_t duration);
43 42
44#define ___ KC_NO 43#define ___ KC_NO
45 44
46 // a = 10
47 // b = 11
48 // c = 12
49 // d = 13
50 // e = 14
51 // f = 15
52 // g = 16
53 // h = 17
54 // i = 18
55 // j = 19
56
57#ifndef LAYOUT 45#ifndef LAYOUT
58 #define LAYOUT( \ 46# define LAYOUT( \
59 k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, k1i, k1j,\ 47 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, k0G, k0H, k0I, \
60 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2g, k2h, k2i, k2j,\ 48 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, k1G, k1H, k1I, \
61 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2f, k3g, k3h, k3i, k3j,\ 49 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1E, k2F, k2G, k2H, k2I, \
62 k41, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4f, k4g, k4h, k4i, k4j,\ 50 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, k3G, k3H, k3I, \
63 k51, k52, k53, k56, k5b, k5c, k5d, k5f, k5g, k5h, k5i, k5j \ 51 k40, k41, k42, k45, k4A, k4B, k4C, k4E, k4F, k4G, k4H, k4I \
64 ) \ 52) { \
65 { \ 53 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F, k0G, k0H, k0I }, \
66 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, ___, k1f, k1g, k1h, k1i, k1j }, \ 54 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
67 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, k2i, k2j }, \ 55 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, ___, ___, k2F, k2G, k2H, k2I }, \
68 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, k3g, k3h, k3i, k3j }, \ 56 { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G, k3H, k3I }, \
69 { k41, ___, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, k4g, k4h, k4i, k4j }, \ 57 { k40, k41, k42, ___, ___, k45, ___, ___, ___, ___, k4A, k4B, k4C, ___, k4E, k4F, k4G, k4H, k4I } \
70 { k51, k52, k53, ___, ___, k56, ___, ___, ___, ___, k5b, k5c, k5d, ___, k5f, k5g, k5h, k5i, k5j }, \ 58}
71 }
72
73#endif // !LAYOUT #endif 59#endif // !LAYOUT #endif
74
75#endif //LFK87_H
diff --git a/keyboards/lfkeyboards/mini1800/post_rules.mk b/keyboards/lfkeyboards/mini1800/post_rules.mk
new file mode 100644
index 000000000..f04e10e4a
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/post_rules.mk
@@ -0,0 +1,9 @@
1ifeq ($(LFK_REV), A)
2 MCU = at90usb1286
3else
4 MCU = at90usb646
5endif
6
7ifeq ($(strip $(ISSI_ENABLE)), yes)
8 # TMK_COMMON_DEFS += -DISSI_ENABLE
9endif
diff --git a/keyboards/lfkeyboards/mini1800/rules.mk b/keyboards/lfkeyboards/mini1800/rules.mk
index a9c29c4b9..c9a9b0105 100644
--- a/keyboards/lfkeyboards/mini1800/rules.mk
+++ b/keyboards/lfkeyboards/mini1800/rules.mk
@@ -7,21 +7,12 @@
7# Set to A or C 7# Set to A or C
8LFK_REV = C 8LFK_REV = C
9 9
10ifeq ($(LFK_REV), A)
11 MCU = at90usb1286
12else
13 MCU = at90usb646
14endif
15BOOTLOADER = atmel-dfu 10BOOTLOADER = atmel-dfu
16OPT_DEFS += -DLFK_TKL_REV_$(LFK_REV) 11OPT_DEFS += -DLFK_TKL_REV_$(LFK_REV)
17 12
18# Extra source files for IS3731 lighting 13# Extra source files for IS3731 lighting
19SRC = TWIlib.c issi.c lighting.c 14SRC = TWIlib.c issi.c lighting.c
20 15
21ifeq ($(strip $(ISSI_ENABLE)), yes)
22 # TMK_COMMON_DEFS += -DISSI_ENABLE
23endif
24
25# Build Options 16# Build Options
26# change yes to no to disable 17# change yes to no to disable
27# 18#