From 1df37114320b816fe318316bce705d772859c610 Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Wed, 12 Jan 2022 02:07:14 +0800 Subject: [PATCH] [Keyboard] AMJ84 (#15742) --- keyboards/amjkeyboard/amj84/amj84.c | 4 + keyboards/amjkeyboard/amj84/amj84.h | 30 +++++ keyboards/amjkeyboard/amj84/config.h | 112 ++++++++++++++++++ keyboards/amjkeyboard/amj84/info.json | 97 +++++++++++++++ .../amj84/keymaps/default/keymap.c | 53 +++++++++ .../amj84/keymaps/default/readme.md | 1 + keyboards/amjkeyboard/amj84/readme.md | 27 +++++ keyboards/amjkeyboard/amj84/rules.mk | 18 +++ 8 files changed, 342 insertions(+) create mode 100644 keyboards/amjkeyboard/amj84/amj84.c create mode 100644 keyboards/amjkeyboard/amj84/amj84.h create mode 100644 keyboards/amjkeyboard/amj84/config.h create mode 100644 keyboards/amjkeyboard/amj84/info.json create mode 100644 keyboards/amjkeyboard/amj84/keymaps/default/keymap.c create mode 100644 keyboards/amjkeyboard/amj84/keymaps/default/readme.md create mode 100644 keyboards/amjkeyboard/amj84/readme.md create mode 100644 keyboards/amjkeyboard/amj84/rules.mk diff --git a/keyboards/amjkeyboard/amj84/amj84.c b/keyboards/amjkeyboard/amj84/amj84.c new file mode 100644 index 0000000000..49116c48c3 --- /dev/null +++ b/keyboards/amjkeyboard/amj84/amj84.c @@ -0,0 +1,4 @@ +// Copyright 2022 peepeetee (@peepeetee) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "amj84.h" diff --git a/keyboards/amjkeyboard/amj84/amj84.h b/keyboards/amjkeyboard/amj84/amj84.h new file mode 100644 index 0000000000..19718da8cd --- /dev/null +++ b/keyboards/amjkeyboard/amj84/amj84.h @@ -0,0 +1,30 @@ +// Copyright 2022 peepeetee (@peepeetee) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + 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, K2C, K2D, K2E, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ + K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ + K50, K51, K52, K55, K58, K59, K5A, K5B, K5C, K5D, K5E \ +) { \ + { 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, K2C, K2D, K2E }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ + { K50, K51, K52,KC_NO,KC_NO,K55,KC_NO,KC_NO,K58,K59,K5A, K5B, K5C, K5D, K5E } \ +} diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h new file mode 100644 index 0000000000..279d1268e8 --- /dev/null +++ b/keyboards/amjkeyboard/amj84/config.h @@ -0,0 +1,112 @@ +// Copyright 2022 peepeetee (@peepeetee) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x00D8 //A+M+J +#define PRODUCT_ID 0x6068 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Han Chen +#define PRODUCT AMJ84 + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { D0, F7, F6, F5, F4, D5 } +#define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7, D6, B3, D1 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +//#define LED_NUM_LOCK_PIN B0 +//#define LED_CAPS_LOCK_PIN B2 +//#define LED_SCROLL_LOCK_PIN B2 +//#define LED_COMPOSE_PIN B3 +//#define LED_KANA_PIN B4 + +#define BACKLIGHT_PIN B6 +#define BACKLIGHT_LEVELS 3 +#define BACKLIGHT_BREATHING + + + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is useful for the Windows task manager shortcut (ctrl+shift+esc). + */ +//#define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +#define FORCE_NKRO + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json new file mode 100644 index 0000000000..484823fcca --- /dev/null +++ b/keyboards/amjkeyboard/amj84/info.json @@ -0,0 +1,97 @@ +{ + "keyboard_name": "AMJ84", + "maintainer": "peepeetee", + "url": "", + "layouts": { + "LAYOUT": { + "layout": [ + { "x": 0, "y": 0 }, + { "x": 1, "y": 0 }, + { "x": 2, "y": 0 }, + { "x": 3, "y": 0 }, + { "x": 4, "y": 0 }, + { "x": 5, "y": 0 }, + { "x": 6, "y": 0 }, + { "x": 7, "y": 0 }, + { "x": 8, "y": 0 }, + { "x": 9, "y": 0 }, + { "x": 10, "y": 0 }, + { "x": 11, "y": 0 }, + { "x": 12, "y": 0 }, + { "x": 13, "y": 0 }, + { "x": 14, "y": 0 }, + { "x": 15, "y": 0 }, + { "x": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 12, "y": 1 }, + { "w": 2, "x": 13, "y": 1 }, + { "x": 15, "y": 1 }, + { "w": 1.5, "x": 0, "y": 2 }, + { "x": 1.5, "y": 2 }, + { "x": 2.5, "y": 2 }, + { "x": 3.5, "y": 2 }, + { "x": 4.5, "y": 2 }, + { "x": 5.5, "y": 2 }, + { "x": 6.5, "y": 2 }, + { "x": 7.5, "y": 2 }, + { "x": 8.5, "y": 2 }, + { "x": 9.5, "y": 2 }, + { "x": 10.5, "y": 2 }, + { "x": 11.5, "y": 2 }, + { "x": 12.5, "y": 2 }, + { "w": 1.5, "x": 13.5, "y": 2 }, + { "x": 15, "y": 2 }, + { "w": 1.75, "x": 0, "y": 3 }, + { "x": 1.75, "y": 3 }, + { "x": 2.75, "y": 3 }, + { "x": 3.75, "y": 3 }, + { "x": 4.75, "y": 3 }, + { "x": 5.75, "y": 3 }, + { "x": 6.75, "y": 3 }, + { "x": 7.75, "y": 3 }, + { "x": 8.75, "y": 3 }, + { "x": 9.75, "y": 3 }, + { "x": 10.75, "y": 3 }, + { "x": 11.75, "y": 3 }, + { "x": 12.75, "y": 3 }, + { "w": 1.25, "x": 13.75, "y": 3 }, + { "x": 15, "y": 3 }, + { "w": 2.25, "x": 0, "y": 4 }, + { "x": 2.25, "y": 4 }, + { "x": 3.25, "y": 4 }, + { "x": 4.25, "y": 4 }, + { "x": 5.25, "y": 4 }, + { "x": 6.25, "y": 4 }, + { "x": 7.25, "y": 4 }, + { "x": 8.25, "y": 4 }, + { "x": 9.25, "y": 4 }, + { "x": 10.25, "y": 4 }, + { "x": 11.25, "y": 4 }, + { "w": 1.75, "x": 12.25, "y": 4 }, + { "x": 14, "y": 4 }, + { "x": 15, "y": 4 }, + { "w": 1.25, "x": 0, "y": 5 }, + { "w": 1.25, "x": 1.25, "y": 5 }, + { "w": 1.25, "x": 2.5, "y": 5 }, + { "w": 5.25, "x": 3.75, "y": 5 }, + { "x": 9, "y": 5 }, + { "x": 10, "y": 5 }, + { "x": 11, "y": 5 }, + { "x": 12, "y": 5 }, + { "x": 13, "y": 5 }, + { "x": 14, "y": 5 }, + { "x": 15, "y": 5 } + ] + } + } +} diff --git a/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c new file mode 100644 index 0000000000..11f8482352 --- /dev/null +++ b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c @@ -0,0 +1,53 @@ +// Copyright 2022 peepeetee (@peepeetee) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + /* Keymap 0: Default Layer + * ,----------------------------------------------------------------. + * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Home |Del| + * |------------------------------------------------------------|---| + * |` | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp |PgU| + * |------------------------------------------------------------|---| + * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ |PgD| + * |------------------------------------------------------------|---| + * |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return |Ins| + * |------------------------------------------------------------|---| + * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |Fn0| + * |------------------------------------------------------------|---| + * |Ctrl|Win |Alt | Space |END|Alt |Ctrl|Left |Down|Rig| + * `----------------------------------------------------------------' + */ + [0] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME,KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC,KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS,KC_PGDN, + KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_NO, KC_ENT, KC_INS, + KC_LSFT,KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,KC_UP, MO(1), + KC_LCTL,KC_LGUI,KC_LALT, KC_SPC, KC_END, KC_NO, KC_RALT,KC_RCTL,KC_LEFT,KC_DOWN,KC_RIGHT), + /* Keymap 1: Fn Layer + * ,-----------------------------------------------------------. + * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete | + * |-----------------------------------------------------------| + * | | |Up | | | |Cal| |Ins| |Psc|Slk|Pau| | + * |-----------------------------------------------------------| + * | |Lef|Dow|Rig| | | | | | |Hom|PgU| | + * |-----------------------------------------------------------| + * | | |App|Fn1|Fn2|Fn3|VoD|VoU|Mut|End|PgD| | | + * |-----------------------------------------------------------| + * | | | | | | | | | + * `-----------------------------------------------------------' + */ + [1] = LAYOUT( + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, + KC_TRNS,KC_TRNS,KC_UP, KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_TRNS,KC_INS, KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS, + BL_BRTG,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_TRNS,KC_TRNS,KC_TRNS, + BL_STEP,KC_NO, KC_TRNS,KC_APP, KC_FN1, KC_FN2, KC_FN3, KC_VOLD,KC_VOLU,KC_MUTE,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,KC_TRNS, + KC_SLEP,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS) + +}; diff --git a/keyboards/amjkeyboard/amj84/keymaps/default/readme.md b/keyboards/amjkeyboard/amj84/keymaps/default/readme.md new file mode 100644 index 0000000000..9233dcbfdb --- /dev/null +++ b/keyboards/amjkeyboard/amj84/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for amj84 diff --git a/keyboards/amjkeyboard/amj84/readme.md b/keyboards/amjkeyboard/amj84/readme.md new file mode 100644 index 0000000000..c0df110eb0 --- /dev/null +++ b/keyboards/amjkeyboard/amj84/readme.md @@ -0,0 +1,27 @@ +# amj84 + +![amj84](https://i.imgur.com/oKAkyBW.jpeg) + +A 84 key keyboard by AMJ + +* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee) +* Hardware Supported: AMJ84 +* Hardware Availability: no longer available + +Make example for this keyboard (after setting up your build environment): + + make amjkeyboard/amj84:default + +Flashing example for this keyboard: + + make amjkeyboard/amj84:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/amjkeyboard/amj84/rules.mk b/keyboards/amjkeyboard/amj84/rules.mk new file mode 100644 index 0000000000..8649486da6 --- /dev/null +++ b/keyboards/amjkeyboard/amj84/rules.mk @@ -0,0 +1,18 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output