diff options
| author | Ryan <fauxpark@gmail.com> | 2021-09-01 19:03:14 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-01 19:03:14 +1000 |
| commit | 41c50bb653b840c595fb31541729d892f68666e6 (patch) | |
| tree | ba05c7c9654f7be1104b20f3195dd2cf288e004e /keyboards/lfkeyboards | |
| parent | 971d36bb9ea37962c57733e5f7c0c24e5a6cebeb (diff) | |
| download | qmk_firmware-41c50bb653b840c595fb31541729d892f68666e6.tar.gz qmk_firmware-41c50bb653b840c595fb31541729d892f68666e6.zip | |
Change keyboard level include guards to `pragma once` (#14248)
* Change keyboard level include guards to `pragma once`
And clean up a lot of layout macros
* Oops
* Remove dangling endif
Diffstat (limited to 'keyboards/lfkeyboards')
| -rw-r--r-- | keyboards/lfkeyboards/issi.h | 5 | ||||
| -rw-r--r-- | keyboards/lfkeyboards/lfk65_hs/config.h | 5 | ||||
| -rw-r--r-- | keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h | 65 | ||||
| -rw-r--r-- | keyboards/lfkeyboards/lfk87/config.h | 5 | ||||
| -rw-r--r-- | keyboards/lfkeyboards/lfk87/lfk87.h | 151 | ||||
| -rw-r--r-- | keyboards/lfkeyboards/lighting.h | 6 | ||||
| -rw-r--r-- | keyboards/lfkeyboards/mini1800/config.h | 5 | ||||
| -rw-r--r-- | keyboards/lfkeyboards/mini1800/mini1800.h | 44 |
8 files changed, 121 insertions, 165 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 | ||
| 5 | typedef struct ISSIDeviceStruct{ | 5 | typedef 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); | |||
| 37 | void update_issi(uint8_t device_addr, uint8_t blocking); | 37 | void 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 53860ea2b..ed239d6a9 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 | /* if the kb.h file exists (because we're running from qmkbuilder) include it */ | 3 | /* if the kb.h file exists (because we're running from qmkbuilder) include it */ |
| 5 | #ifdef __has_include | 4 | #ifdef __has_include |
| @@ -28,58 +27,56 @@ void reset_keyboard_kb(void); | |||
| 28 | 27 | ||
| 29 | /* All Keymap - contains every possible switch | 28 | /* All Keymap - contains every possible switch |
| 30 | * ,-------------------------------------------------------------------------------. | 29 | * ,-------------------------------------------------------------------------------. |
| 31 | * | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D | 1E | 1F | 1G | | 30 | * | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 0B | 0C | 0D | 0E | 0F | |
| 32 | * |-------------------------------------------------------------------------------| | 31 | * |-------------------------------------------------------------------------------| |
| 33 | * | 21 | 22 |23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D | 2F | 2G | | 32 | * | 10 | 11 |12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1E | 1F | |
| 34 | * |-------------------------------------------------------------------------------| | 33 | * |-------------------------------------------------------------------------------| |
| 35 | * | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3F | 3G | | 34 | * | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2E | 2F | |
| 36 | * |-------------------------------------------------------------------------------| | 35 | * |-------------------------------------------------------------------------------| |
| 37 | * | 41 | 42 | 43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C | 4D | 4F | 4G | | 36 | * | 30 |31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3E | 3F | |
| 38 | * |-------------------------------------------------------------------------------| | 37 | * |-------------------------------------------------------------------------------| |
| 39 | * | 51 | 52 | 53 | 57 | 5A | 5B | 5C | 5D | 5E | 3E | 4E | | 38 | * | 40 | 41 | 42 | 46 | 4A | 4B | 4C | 4D | 2D | 3D | |
| 40 | * `-------------------------------------------------------------------------------' | 39 | * `-------------------------------------------------------------------------------' |
| 41 | */ | 40 | */ |
| 42 | // The first section contains all of the arguements | 41 | // The first section contains all of the arguements |
| 43 | // The second converts the arguments into a two-dimensional array | 42 | // The second converts the arguments into a two-dimensional array |
| 44 | #define LAYOUT_all( \ | 43 | #define LAYOUT_all( \ |
| 45 | k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \ | 44 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ |
| 46 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, k2G, \ | 45 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, k1F, \ |
| 47 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, k3G, \ | 46 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, k2F, \ |
| 48 | k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4F, k4G, \ | 47 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, \ |
| 49 | k51, k52, k53, k57, k5B, k5C, k5D, k5E, k3E, k4E \ | 48 | k40, k41, k42, k46, k4A, k4B, k4C, k4D, k2D, k3D \ |
| 50 | ) { \ | 49 | ) { \ |
| 51 | { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ | 50 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ |
| 52 | { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \ | 51 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E, k1F }, \ |
| 53 | { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G }, \ | 52 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ |
| 54 | { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \ | 53 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ |
| 55 | { k51, k52, k53, ___, ___, ___, k57, ___, ___, ___, k5B, k5C, k5D, k5E, ___, ___ } \ | 54 | { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, ___, ___ } \ |
| 56 | } | 55 | } |
| 57 | 56 | ||
| 58 | /* ANSI Keymap | 57 | /* ANSI Keymap |
| 59 | * ,-------------------------------------------------------------------------------. | 58 | * ,-------------------------------------------------------------------------------. |
| 60 | * | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D | 1E | 1G | | 59 | * | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 0B | 0C | 0E | 0F | |
| 61 | * |-------------------------------------------------------------------------------| | 60 | * |-------------------------------------------------------------------------------| |
| 62 | * | 21 | 22 |23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D | 2F | 2G | | 61 | * | 10 | 11 |12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1E | 1F | |
| 63 | * |-------------------------------------------------------------------------------| | 62 | * |-------------------------------------------------------------------------------| |
| 64 | * | 31 | 32 |33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3F | 3G | | 63 | * | 20 | 21 |22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2E | 2F | |
| 65 | * |-------------------------------------------------------------------------------| | 64 | * |-------------------------------------------------------------------------------| |
| 66 | * | 41 | 42 |43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C | 4D | 4F | 4G | | 65 | * | 30 | 32 |33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3E | 3F | |
| 67 | * |-------------------------------------------------------------------------------| | 66 | * |-------------------------------------------------------------------------------| |
| 68 | * | 51 | 52 | 53 | 57 | 5A | 5B | 5C | 5D | 5E | 3E | 4E | | 67 | * | 40 | 41 | 42 | 46 | 4A | 4B | 4C | 4D | 2D | 3D | |
| 69 | * `-------------------------------------------------------------------------------' | 68 | * `-------------------------------------------------------------------------------' |
| 70 | */ | 69 | */ |
| 71 | #define LAYOUT_ansi( \ | 70 | #define LAYOUT_ansi( \ |
| 72 | k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, k1G, \ | 71 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \ |
| 73 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, k2G, \ | 72 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, k1F, \ |
| 74 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3F, k3G, \ | 73 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2E, k2F, \ |
| 75 | k41, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4F, k4G, \ | 74 | k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, \ |
| 76 | k51, k52, k53, k57, k5B, k5C, k5D, k5E, k3E, k4E \ | 75 | k40, k41, k42, k46, k4A, k4B, k4C, k4D, k2D, k3D \ |
| 77 | ) { \ | 76 | ) { \ |
| 78 | { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F, k1G }, \ | 77 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F }, \ |
| 79 | { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \ | 78 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E, k1F }, \ |
| 80 | { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G }, \ | 79 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, k2E, k2F }, \ |
| 81 | { k41, ___, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \ | 80 | { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ |
| 82 | { k51, k52, k53, ___, ___, ___, k57, ___, ___, ___, k5B, k5C, k5D, k5E, ___, ___ } \ | 81 | { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, ___, ___ } \ |
| 83 | } | 82 | } |
| 84 | |||
| 85 | #endif //LFK65_HS_H | ||
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 | |||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along 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 1a2f9fbaf..4e079687d 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 | /* if the kb.h file exists (because we're running from qmkbuilder) include it */ | 3 | /* if the kb.h file exists (because we're running from qmkbuilder) include it */ |
| 5 | #if __has_include("kb.h") | 4 | #if __has_include("kb.h") |
| @@ -58,85 +57,75 @@ void click(uint16_t freq, uint16_t duration); | |||
| 58 | #define ___ KC_NO | 57 | #define ___ KC_NO |
| 59 | 58 | ||
| 60 | #ifdef LFK_TKL_REV_A | 59 | #ifdef LFK_TKL_REV_A |
| 61 | #ifndef LAYOUT_tkl_ansi | 60 | # ifndef LAYOUT_tkl_ansi |
| 62 | #define LAYOUT_tkl_ansi( \ | 61 | # define LAYOUT_tkl_ansi( \ |
| 63 | k11, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \ | 62 | k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \ |
| 64 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \ | 63 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \ |
| 65 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, k3h, \ | 64 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, \ |
| 66 | k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, \ | 65 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ |
| 67 | k51, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5g, \ | 66 | k40, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4F, \ |
| 68 | k61, k62, k63, k67, k6b, k6c, k6d, k6e, k6f, k6g, k6h \ | 67 | k50, k51, k52, k56, k5A, k5B, k5C, k5D, k5E, k5F, k5G \ |
| 69 | ) \ | 68 | ) { \ |
| 70 | { \ | 69 | { k00, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \ |
| 71 | { k11, ___, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \ | 70 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ |
| 72 | { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ | 71 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \ |
| 73 | { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, k3h }, \ | 72 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___, ___, ___ }, \ |
| 74 | { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, ___, ___, ___ }, \ | 73 | { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, ___, ___, k4F, ___ }, \ |
| 75 | { k51, ___, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, ___, ___, k5g, ___ }, \ | 74 | { k50, k51, k52, ___, ___, ___, k56, ___, ___, ___, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \ |
| 76 | { k61, k62, k63, ___, ___, ___, k67, ___, ___, ___, k6b, k6c, k6d, k6e, k6f, k6g, k6h }, \ | 75 | } |
| 77 | } | ||
| 78 | |||
| 79 | #endif // !LAYOUT_tkl_ansi | 76 | #endif // !LAYOUT_tkl_ansi |
| 80 | #ifndef LAYOUT_tkl_iso | 77 | # ifndef LAYOUT_tkl_iso |
| 81 | #define LAYOUT_tkl_iso( \ | 78 | # define LAYOUT_tkl_iso( \ |
| 82 | k11, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \ | 79 | k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \ |
| 83 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \ | 80 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \ |
| 84 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3f, k3g, k3h, \ | 81 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, k2F, k2G, \ |
| 85 | k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k3e, \ | 82 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k2D, \ |
| 86 | k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5g, \ | 83 | k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4F, \ |
| 87 | k61, k62, k63, k67, k6b, k6c, k6d, k6e, k6f, k6g, k6h \ | 84 | k50, k51, k52, k56, k5A, k5B, k5C, k5D, k5E, k5F, k5G \ |
| 88 | ) \ | 85 | ) { \ |
| 89 | { \ | 86 | { k00, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \ |
| 90 | { k11, ___, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \ | 87 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ |
| 91 | { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ | 88 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \ |
| 92 | { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, k3h }, \ | 89 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___, ___, ___ }, \ |
| 93 | { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, ___, ___, ___ }, \ | 90 | { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, ___, ___, k4F, ___ }, \ |
| 94 | { k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, ___, ___, k5g, ___ }, \ | 91 | { k50, k51, k52, ___, ___, ___, k56, ___, ___, ___, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \ |
| 95 | { k61, k62, k63, ___, ___, ___, k67, ___, ___, ___, k6b, k6c, k6d, k6e, k6f, k6g, k6h }, \ | 92 | } |
| 96 | } | 93 | # endif // !LAYOUT_tkl_iso |
| 97 | |||
| 98 | #endif // !LAYOUT_tkl_iso | ||
| 99 | #else // RevC+ keymaps | 94 | #else // RevC+ keymaps |
| 100 | #ifndef LAYOUT_tkl_ansi | 95 | # ifndef LAYOUT_tkl_ansi |
| 101 | #define LAYOUT_tkl_ansi( \ | 96 | # define LAYOUT_tkl_ansi( \ |
| 102 | k71, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, k1g, \ | 97 | k60, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0D, k0E, k0F, \ |
| 103 | k72, k73, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, \ | 98 | k61, k62, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1E, k1F, \ |
| 104 | k74, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, \ | 99 | k63, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \ |
| 105 | k61, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, \ | 100 | k50, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \ |
| 106 | k62, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5f, \ | 101 | k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4E, \ |
| 107 | k63, k64, k65, k67, k6a, k6b, k6c, k6d, k6e, k6f, k6g \ | 102 | k52, k53, k54, k56, k59, k5A, k5B, k5C, k5D, k5E, k5F \ |
| 108 | ) \ | 103 | ) { \ |
| 109 | { \ | 104 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, ___, k0D, k0E, k0F }, \ |
| 110 | { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, k1f, k1g }, \ | 105 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, ___, k1D, k1E, k1F }, \ |
| 111 | { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e, k2f, k2g }, \ | 106 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ |
| 112 | { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g }, \ | 107 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, ___, ___, ___, ___ }, \ |
| 113 | { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, ___, ___ }, \ | 108 | { ___, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, ___, ___, k4E, ___ }, \ |
| 114 | { ___, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, ___, ___, k5f, ___ }, \ | 109 | { k50, k51, k52, k53, k54, ___, k56, ___, ___, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ |
| 115 | { k61, k62, k63, k64, k65, ___, k67, ___, ___, k6a, k6b, k6c, k6d, k6e, k6f, k6g }, \ | 110 | { k60, k61, k62, k63, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ |
| 116 | { k71, k72, k73, k74, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ | 111 | } |
| 117 | } | 112 | # endif // !LAYOUT_tkl_ansi |
| 118 | 113 | # ifndef LAYOUT_tkl_iso | |
| 119 | #endif // !LAYOUT_tkl_ansi | 114 | # define LAYOUT_tkl_iso( \ |
| 120 | #ifndef LAYOUT_tkl_iso | 115 | k60, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0D, k0E, k0F, \ |
| 121 | #define LAYOUT_tkl_iso( \ | 116 | k61, k62, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1E, k1F, \ |
| 122 | k71, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, k1g, \ | 117 | k63, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, k2F, \ |
| 123 | k72, k73, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, \ | 118 | k50, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k2C, \ |
| 124 | k74, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, k3g, \ | 119 | k51, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4E, \ |
| 125 | k61, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k3d, \ | 120 | k52, k53, k54, k56, k59, k5A, k5B, k5C, k5D, k5E, k5F \ |
| 126 | k62, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5f, \ | 121 | ) { \ |
| 127 | k63, k64, k65, k67, k6a, k6b, k6c, k6d, k6e, k6f, k6g \ | 122 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, ___, k0D, k0E, k0F }, \ |
| 128 | ) \ | 123 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, ___, k1D, k1E, k1F }, \ |
| 129 | { \ | 124 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ |
| 130 | { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, k1f, k1g }, \ | 125 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, ___, ___, ___, ___ }, \ |
| 131 | { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e, k2f, k2g }, \ | 126 | { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, ___, ___, k4E, ___ }, \ |
| 132 | { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g }, \ | 127 | { k50, k51, k52, k53, k54, ___, k56, ___, ___, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ |
| 133 | { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, ___, ___ }, \ | 128 | { k60, k61, k62, k63, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ |
| 134 | { k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, ___, ___, k5f, ___ }, \ | 129 | } |
| 135 | { k61, k62, k63, k64, k65, ___, k67, ___, ___, k6a, k6b, k6c, k6d, k6e, k6f, k6g }, \ | 130 | # endif // !LAYOUT_tkl_iso |
| 136 | { k71, k72, k73, k74, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ | ||
| 137 | } | ||
| 138 | |||
| 139 | #endif // !LAYOUT_tkl_iso | ||
| 140 | #endif //Rev | 131 | #endif //Rev |
| 141 | |||
| 142 | #endif //LFK87_H | ||
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); | |||
| 49 | void set_underglow(uint8_t red, uint8_t green, uint8_t blue); | 47 | void set_underglow(uint8_t red, uint8_t green, uint8_t blue); |
| 50 | void set_rgb(uint8_t rgb_led, uint8_t red, uint8_t green, uint8_t blue); | 48 | void set_rgb(uint8_t rgb_led, uint8_t red, uint8_t green, uint8_t blue); |
| 51 | void set_backlight_by_keymap(uint8_t col, uint8_t row); | 49 | void 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 | |||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along 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 17f7da348..c4729c9bb 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 | /* if the kb.h file exists (because we're running from qmkbuilder) include it */ | 3 | /* if the kb.h file exists (because we're running from qmkbuilder) include it */ |
| 5 | #if __has_include("kb.h") | 4 | #if __has_include("kb.h") |
| @@ -57,33 +56,18 @@ void click(uint16_t freq, uint16_t duration); | |||
| 57 | 56 | ||
| 58 | #define ___ KC_NO | 57 | #define ___ KC_NO |
| 59 | 58 | ||
| 60 | // a = 10 | ||
| 61 | // b = 11 | ||
| 62 | // c = 12 | ||
| 63 | // d = 13 | ||
| 64 | // e = 14 | ||
| 65 | // f = 15 | ||
| 66 | // g = 16 | ||
| 67 | // h = 17 | ||
| 68 | // i = 18 | ||
| 69 | // j = 19 | ||
| 70 | |||
| 71 | #ifndef LAYOUT | 59 | #ifndef LAYOUT |
| 72 | #define LAYOUT( \ | 60 | # define LAYOUT( \ |
| 73 | k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, k1i, k1j,\ | 61 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, k0G, k0H, k0I, \ |
| 74 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2g, k2h, k2i, k2j,\ | 62 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, k1G, k1H, k1I, \ |
| 75 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2f, k3g, k3h, k3i, k3j,\ | 63 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1E, k2F, k2G, k2H, k2I, \ |
| 76 | k41, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4f, k4g, k4h, k4i, k4j,\ | 64 | k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, k3G, k3H, k3I, \ |
| 77 | k51, k52, k53, k56, k5b, k5c, k5d, k5f, k5g, k5h, k5i, k5j \ | 65 | k40, k41, k42, k45, k4A, k4B, k4C, k4E, k4F, k4G, k4H, k4I \ |
| 78 | ) \ | 66 | ) { \ |
| 79 | { \ | 67 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F, k0G, k0H, k0I }, \ |
| 80 | { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, ___, k1f, k1g, k1h, k1i, k1j }, \ | 68 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \ |
| 81 | { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, k2i, k2j }, \ | 69 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, ___, ___, k2F, k2G, k2H, k2I }, \ |
| 82 | { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, k3g, k3h, k3i, k3j }, \ | 70 | { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G, k3H, k3I }, \ |
| 83 | { k41, ___, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, k4g, k4h, k4i, k4j }, \ | 71 | { k40, k41, k42, ___, ___, k45, ___, ___, ___, ___, k4A, k4B, k4C, ___, k4E, k4F, k4G, k4H, k4I } \ |
| 84 | { k51, k52, k53, ___, ___, k56, ___, ___, ___, ___, k5b, k5c, k5d, ___, k5f, k5g, k5h, k5i, k5j }, \ | 72 | } |
| 85 | } | ||
| 86 | |||
| 87 | #endif // !LAYOUT #endif | 73 | #endif // !LAYOUT #endif |
| 88 | |||
| 89 | #endif //LFK87_H | ||
