diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-05-27 19:19:09 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-05-27 19:19:09 -0700 |
| commit | a677d8a00dc7bb42c1d9ba29455d24f6d8bfaef6 (patch) | |
| tree | b26303950a2b0914b7eb5eaa874c4618d088ebe1 /keyboards/amjpad/amjpad.h | |
| parent | 3b1ddd12a53356196b565235c54d19e45bb17980 (diff) | |
| download | firmware-a677d8a00dc7bb42c1d9ba29455d24f6d8bfaef6.tar.gz firmware-a677d8a00dc7bb42c1d9ba29455d24f6d8bfaef6.tar.bz2 firmware-a677d8a00dc7bb42c1d9ba29455d24f6d8bfaef6.zip | |
Refactor and Configurator updates for AMJ Pad (#3060)
* Refactor for AMJ Pad
* Configurator update for AMJ Pad
* Add hardware agnostic layouts numpad_6x4 and ortho_6x4
* Add agnostic layouts to rules.mk
* Refactor AMJ Pad to use new hardware agnostic layouts
Diffstat (limited to 'keyboards/amjpad/amjpad.h')
| -rw-r--r-- | keyboards/amjpad/amjpad.h | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/keyboards/amjpad/amjpad.h b/keyboards/amjpad/amjpad.h index ffba1c9b9..d9a051621 100644 --- a/keyboards/amjpad/amjpad.h +++ b/keyboards/amjpad/amjpad.h @@ -23,38 +23,40 @@ */ // The first section contains all of the arguments // The second converts the arguments into a two-dimensional array -#define KEYMAP( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, \ - k40, k41, k42, k43, \ - k50, k52 \ +#define LAYOUT_numpad_6x4( \ + k00, k01, k02, k03, \ + k10, k11, k12, k13, \ + k20, k21, k22, \ + k30, k31, k32, k23, \ + k40, k41, k42, \ + k50, k52, k43 \ ) \ { \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, XXX}, \ - {k40, k41, k42, k43}, \ - {k50, XXX, k52, XXX} \ + {k00, k01, k02, k03}, \ + {k10, k11, k12, k13}, \ + {k20, k21, k22, k23}, \ + {k30, k31, k32, XXX}, \ + {k40, k41, k42, k43}, \ + {k50, XXX, k52, XXX} \ } -#define MAXKEYMAP( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53\ + +#define LAYOUT_ortho_6x4( \ + k00, k01, k02, k03, \ + k10, k11, k12, k13, \ + k20, k21, k22, k23, \ + k30, k31, k32, k33, \ + k40, k41, k42, k43, \ + k50, k51, k52, k53 \ ) \ { \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43}, \ - {k50, k51, k52, k53} \ + {k00, k01, k02, k03}, \ + {k10, k11, k12, k13}, \ + {k20, k21, k22, k23}, \ + {k30, k31, k32, k33}, \ + {k40, k41, k42, k43}, \ + {k50, k51, k52, k53} \ } + void matrix_init_user(void); void matrix_scan_user(void); |