diff options
author | James Young <[email protected]> | 2020-01-07 16:17:01 -0800 |
---|---|---|
committer | Joel Challis <[email protected]> | 2020-01-08 00:17:01 +0000 |
commit | 0027a0a94874302644fa466ff074091ecc9c7b0b (patch) | |
tree | 976055a6179d1ad83dad54dceee9938a450355c6 /keyboards/tada68/tada68.h | |
parent | 0c86cfeaed23377862356326c0f26191f74d899f (diff) | |
download | qmk_firmware-0027a0a94874302644fa466ff074091ecc9c7b0b.tar.gz qmk_firmware-0027a0a94874302644fa466ff074091ecc9c7b0b.zip |
Tada68 Fixes and Minor Refactoring (#7820)
* fix ANSI layout macro reference
* update ISO layout macro and enable 65_iso community layout support
- rename to LAYOUT_65_iso (with LAYOUT_iso alias for backwards compatibility)
- rename position k2c to k1d (electrical position)
* rules.mk templating
* tada68.h: use #pragma once include guard
* config.h: use #pragma once include guard
* make product id unique
* update info.json
* update readme
* cleanup default keymap
- keycode alignment
- layout macro reference
- four-space indent
* remove matrix_*_user functions from tada68.h
Diffstat (limited to 'keyboards/tada68/tada68.h')
-rwxr-xr-x | keyboards/tada68/tada68.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/keyboards/tada68/tada68.h b/keyboards/tada68/tada68.h index a71910cb3b..6bc3cdccf3 100755 --- a/keyboards/tada68/tada68.h +++ b/keyboards/tada68/tada68.h @@ -1,5 +1,4 @@ -#ifndef TADA68_H -#define TADA68_H +#pragma once #include "quantum.h" @@ -22,7 +21,7 @@ // The first section contains all of the arguments // The second converts the arguments into a two-dimensional array -#define LAYOUT_ansi( \ +#define LAYOUT_65_ansi( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k2e, \ @@ -55,21 +54,23 @@ // The first section contains all of the arguments // The second converts the arguments into a two-dimensional array -#define LAYOUT_iso( \ +#define LAYOUT_65_iso( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k1d, k2d, k2e, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ k40, k41, k42, k45, k49, k4a, k4b, k4c, k4d, k4e \ ) \ { \ {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, k1e}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \ {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \ {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \ {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e} \ } +#define LAYOUT_iso LAYOUT_65_iso + /* TADA68 ANSI layout with Split Enter key * ,----------------------------------------------------------------. * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e | @@ -100,8 +101,3 @@ {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \ {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e} \ } - -void matrix_init_user(void); -void matrix_scan_user(void); - -#endif |