diff options
Diffstat (limited to 'keyboards/amjpad')
| -rw-r--r-- | keyboards/amjpad/amjpad.h | 59 | ||||
| -rw-r--r-- | keyboards/amjpad/config.h | 5 |
2 files changed, 28 insertions, 36 deletions
diff --git a/keyboards/amjpad/amjpad.h b/keyboards/amjpad/amjpad.h index d9a051621..976a7ab04 100644 --- a/keyboards/amjpad/amjpad.h +++ b/keyboards/amjpad/amjpad.h | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #ifndef AMJPAD_H | 1 | #pragma once |
| 2 | #define ADMJPAD_H | ||
| 3 | 2 | ||
| 4 | #include "quantum.h" | 3 | #include "quantum.h" |
| 5 | 4 | ||
| @@ -24,40 +23,36 @@ | |||
| 24 | // The first section contains all of the arguments | 23 | // The first section contains all of the arguments |
| 25 | // The second converts the arguments into a two-dimensional array | 24 | // The second converts the arguments into a two-dimensional array |
| 26 | #define LAYOUT_numpad_6x4( \ | 25 | #define LAYOUT_numpad_6x4( \ |
| 27 | k00, k01, k02, k03, \ | 26 | k00, k01, k02, k03, \ |
| 28 | k10, k11, k12, k13, \ | 27 | k10, k11, k12, k13, \ |
| 29 | k20, k21, k22, \ | 28 | k20, k21, k22, \ |
| 30 | k30, k31, k32, k23, \ | 29 | k30, k31, k32, k23, \ |
| 31 | k40, k41, k42, \ | 30 | k40, k41, k42, \ |
| 32 | k50, k52, k43 \ | 31 | k50, k52, k43 \ |
| 33 | ) \ | 32 | ) { \ |
| 34 | { \ | 33 | { k00, k01, k02, k03 }, \ |
| 35 | {k00, k01, k02, k03}, \ | 34 | { k10, k11, k12, k13 }, \ |
| 36 | {k10, k11, k12, k13}, \ | 35 | { k20, k21, k22, k23 }, \ |
| 37 | {k20, k21, k22, k23}, \ | 36 | { k30, k31, k32, XXX }, \ |
| 38 | {k30, k31, k32, XXX}, \ | 37 | { k40, k41, k42, k43 }, \ |
| 39 | {k40, k41, k42, k43}, \ | 38 | { k50, XXX, k52, XXX } \ |
| 40 | {k50, XXX, k52, XXX} \ | ||
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | #define LAYOUT_ortho_6x4( \ | 41 | #define LAYOUT_ortho_6x4( \ |
| 44 | k00, k01, k02, k03, \ | 42 | k00, k01, k02, k03, \ |
| 45 | k10, k11, k12, k13, \ | 43 | k10, k11, k12, k13, \ |
| 46 | k20, k21, k22, k23, \ | 44 | k20, k21, k22, k23, \ |
| 47 | k30, k31, k32, k33, \ | 45 | k30, k31, k32, k33, \ |
| 48 | k40, k41, k42, k43, \ | 46 | k40, k41, k42, k43, \ |
| 49 | k50, k51, k52, k53 \ | 47 | k50, k51, k52, k53 \ |
| 50 | ) \ | 48 | ) { \ |
| 51 | { \ | 49 | { k00, k01, k02, k03 }, \ |
| 52 | {k00, k01, k02, k03}, \ | 50 | { k10, k11, k12, k13 }, \ |
| 53 | {k10, k11, k12, k13}, \ | 51 | { k20, k21, k22, k23 }, \ |
| 54 | {k20, k21, k22, k23}, \ | 52 | { k30, k31, k32, k33 }, \ |
| 55 | {k30, k31, k32, k33}, \ | 53 | { k40, k41, k42, k43 }, \ |
| 56 | {k40, k41, k42, k43}, \ | 54 | { k50, k51, k52, k53 } \ |
| 57 | {k50, k51, k52, k53} \ | ||
| 58 | } | 55 | } |
| 59 | 56 | ||
| 60 | void matrix_init_user(void); | 57 | void matrix_init_user(void); |
| 61 | void matrix_scan_user(void); | 58 | void matrix_scan_user(void); |
| 62 | |||
| 63 | #endif | ||
diff --git a/keyboards/amjpad/config.h b/keyboards/amjpad/config.h index 6bac897e7..f1d57592b 100644 --- a/keyboards/amjpad/config.h +++ b/keyboards/amjpad/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 | ||
| @@ -87,5 +86,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 87 | //#define NO_ACTION_ONESHOT | 86 | //#define NO_ACTION_ONESHOT |
| 88 | //#define NO_ACTION_MACRO | 87 | //#define NO_ACTION_MACRO |
| 89 | //#define NO_ACTION_FUNCTION | 88 | //#define NO_ACTION_FUNCTION |
| 90 | |||
| 91 | #endif | ||
