~ruther/qmk_firmware

bd8220e9fc871d7997f1565858bb7b3c77756237 — peepeetee 3 years ago 314865f
move amj keyboards into amjkeyboard vendor folder (#15733)

Co-authored-by: Nick Brassel <nick@tzarc.org>
49 files changed, 12 insertions(+), 12 deletions(-)

R keyboards/{ => amjkeyboard}/amj40/amj40.c
R keyboards/{ => amjkeyboard}/amj40/amj40.h
R keyboards/{ => amjkeyboard}/amj40/config.h
R keyboards/{ => amjkeyboard}/amj40/info.json
R keyboards/{ => amjkeyboard}/amj40/keymaps/default/keymap.c
R keyboards/{ => amjkeyboard}/amj40/keymaps/default/readme.md
R keyboards/{ => amjkeyboard}/amj40/keymaps/default_625u_space/keymap.c
R keyboards/{ => amjkeyboard}/amj40/keymaps/default_ortho_275u_space/keymap.c
R keyboards/{ => amjkeyboard}/amj40/keymaps/default_ortho_600u_space/keymap.c
R keyboards/{ => amjkeyboard}/amj40/keymaps/fabian/keymap.c
R keyboards/{ => amjkeyboard}/amj40/keymaps/fabian/rules.mk
R keyboards/{ => amjkeyboard}/amj40/keymaps/jetpacktuxedo/config.h
R keyboards/{ => amjkeyboard}/amj40/keymaps/jetpacktuxedo/keymap.c
R keyboards/{ => amjkeyboard}/amj40/keymaps/jetpacktuxedo/readme.md
R keyboards/{ => amjkeyboard}/amj40/keymaps/jetpacktuxedo/rules.mk
R keyboards/{ => amjkeyboard}/amj40/keymaps/myee/build.sh
R keyboards/{ => amjkeyboard}/amj40/keymaps/myee/config.h
R keyboards/{ => amjkeyboard}/amj40/keymaps/myee/keymap.c
R keyboards/{ => amjkeyboard}/amj40/keymaps/myee/readme.md
R keyboards/{ => amjkeyboard}/amj40/keymaps/myee/rules.mk
R keyboards/{ => amjkeyboard}/amj40/keymaps/myee/updatemerge.sh
R keyboards/{ => amjkeyboard}/amj40/readme.md
R keyboards/{ => amjkeyboard}/amj40/rules.mk
R keyboards/{ => amjkeyboard}/amj60/amj60.c
R keyboards/{ => amjkeyboard}/amj60/amj60.h
R keyboards/{ => amjkeyboard}/amj60/config.h
R keyboards/{ => amjkeyboard}/amj60/info.json
R keyboards/{ => amjkeyboard}/amj60/keymaps/default/keymap.c
R keyboards/{ => amjkeyboard}/amj60/readme.md
R keyboards/{ => amjkeyboard}/amj60/rules.mk
M keyboards/amjkeyboard/amj66/config.h
R keyboards/{ => amjkeyboard}/amj96/amj96.c
R keyboards/{ => amjkeyboard}/amj96/amj96.h
R keyboards/{ => amjkeyboard}/amj96/config.h
R keyboards/{ => amjkeyboard}/amj96/info.json
R keyboards/{ => amjkeyboard}/amj96/keymaps/default/keymap.c
R keyboards/{ => amjkeyboard}/amj96/matrix.c
R keyboards/{ => amjkeyboard}/amj96/readme.md
R keyboards/{ => amjkeyboard}/amj96/rules.mk
R keyboards/{ => amjkeyboard}/amjpad/amjpad.c
R keyboards/{ => amjkeyboard}/amjpad/amjpad.h
R keyboards/{ => amjkeyboard}/amjpad/config.h
R keyboards/{ => amjkeyboard}/amjpad/info.json
R keyboards/{ => amjkeyboard}/amjpad/keymaps/default/keymap.c
R keyboards/{ => amjkeyboard}/amjpad/keymaps/max/keymap.c
R keyboards/{ => amjkeyboard}/amjpad/keymaps/ortho_left/keymap.c
R keyboards/{ => amjkeyboard}/amjpad/keymaps/ortho_right/keymap.c
R keyboards/{ => amjkeyboard}/amjpad/readme.md
R keyboards/{ => amjkeyboard}/amjpad/rules.mk
R keyboards/amj40/amj40.c => keyboards/amjkeyboard/amj40/amj40.c +0 -0
R keyboards/amj40/amj40.h => keyboards/amjkeyboard/amj40/amj40.h +0 -0
R keyboards/amj40/config.h => keyboards/amjkeyboard/amj40/config.h +1 -1
@@ 20,7 20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID       0xFEED
#define VENDOR_ID       0x00D8 //A+M+J
#define PRODUCT_ID      0x6072
#define DEVICE_VER      0x0002
#define MANUFACTURER    Han Chen

R keyboards/amj40/info.json => keyboards/amjkeyboard/amj40/info.json +0 -0
R keyboards/amj40/keymaps/default/keymap.c => keyboards/amjkeyboard/amj40/keymaps/default/keymap.c +0 -0
R keyboards/amj40/keymaps/default/readme.md => keyboards/amjkeyboard/amj40/keymaps/default/readme.md +0 -0
R keyboards/amj40/keymaps/default_625u_space/keymap.c => keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c +0 -0
R keyboards/amj40/keymaps/default_ortho_275u_space/keymap.c => keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c +0 -0
R keyboards/amj40/keymaps/default_ortho_600u_space/keymap.c => keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c +0 -0
R keyboards/amj40/keymaps/fabian/keymap.c => keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c +0 -0
R keyboards/amj40/keymaps/fabian/rules.mk => keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk +0 -0
R keyboards/amj40/keymaps/jetpacktuxedo/config.h => keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h +0 -0
R keyboards/amj40/keymaps/jetpacktuxedo/keymap.c => keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c +0 -0
R keyboards/amj40/keymaps/jetpacktuxedo/readme.md => keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md +0 -0
R keyboards/amj40/keymaps/jetpacktuxedo/rules.mk => keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk +0 -0
R keyboards/amj40/keymaps/myee/build.sh => keyboards/amjkeyboard/amj40/keymaps/myee/build.sh +0 -0
R keyboards/amj40/keymaps/myee/config.h => keyboards/amjkeyboard/amj40/keymaps/myee/config.h +0 -0
R keyboards/amj40/keymaps/myee/keymap.c => keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c +0 -0
R keyboards/amj40/keymaps/myee/readme.md => keyboards/amjkeyboard/amj40/keymaps/myee/readme.md +0 -0
R keyboards/amj40/keymaps/myee/rules.mk => keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk +0 -0
R keyboards/amj40/keymaps/myee/updatemerge.sh => keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh +0 -0
R keyboards/amj40/readme.md => keyboards/amjkeyboard/amj40/readme.md +2 -2
@@ 12,11 12,11 @@ DIY/Assembled compact 40% keyboard.

Make example for this keyboard (after setting up your build environment):

    make amj40:default
    make amjkeyboard/amj40:default

Flashing example for this keyboard:

    make amj40:default:flash
    make amjkeyboard/amj40:default:flash

To reset the board into bootloader mode, hold the key at the top left of the keyboard while connecting the USB cable (also erases persistent settings).


R keyboards/amj40/rules.mk => keyboards/amjkeyboard/amj40/rules.mk +0 -0
R keyboards/amj60/amj60.c => keyboards/amjkeyboard/amj60/amj60.c +0 -0
R keyboards/amj60/amj60.h => keyboards/amjkeyboard/amj60/amj60.h +0 -0
R keyboards/amj60/config.h => keyboards/amjkeyboard/amj60/config.h +1 -1
@@ 20,7 20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID       0xFEED
#define VENDOR_ID       0x00D8 //A+M+J
#define PRODUCT_ID      0x6066
#define DEVICE_VER      0x0001
#define MANUFACTURER    Han Chen

R keyboards/amj60/info.json => keyboards/amjkeyboard/amj60/info.json +0 -0
R keyboards/amj60/keymaps/default/keymap.c => keyboards/amjkeyboard/amj60/keymaps/default/keymap.c +0 -0
R keyboards/amj60/readme.md => keyboards/amjkeyboard/amj60/readme.md +2 -2
@@ 11,11 11,11 @@ A 60% keyboard.

Make example for this keyboard (after setting up your build environment):

    make amj60:default
    make amjkeyboard/amj60:default

Flashing example for this keyboard:

    make amj60:default:flash
    make amjkeyboard/amj60:default:flash

To reset the board into bootloader mode, tap the Reset switch mounted on the bottom side of the PCB.


R keyboards/amj60/rules.mk => keyboards/amjkeyboard/amj60/rules.mk +0 -0
M keyboards/amjkeyboard/amj66/config.h => keyboards/amjkeyboard/amj66/config.h +1 -1
@@ 20,7 20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID       0xFEED
#define VENDOR_ID       0x00D8 //A+M+J
#define PRODUCT_ID      0xBD66
#define DEVICE_VER      0x0001
#define MANUFACTURER    AMJKeyboard

R keyboards/amj96/amj96.c => keyboards/amjkeyboard/amj96/amj96.c +0 -0
R keyboards/amj96/amj96.h => keyboards/amjkeyboard/amj96/amj96.h +0 -0
R keyboards/amj96/config.h => keyboards/amjkeyboard/amj96/config.h +1 -1
@@ 20,7 20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID       0xFEED
#define VENDOR_ID       0x00D8 //A+M+J
#define PRODUCT_ID      0x6074
#define DEVICE_VER      0x0002
#define MANUFACTURER    Han Chen

R keyboards/amj96/info.json => keyboards/amjkeyboard/amj96/info.json +0 -0
R keyboards/amj96/keymaps/default/keymap.c => keyboards/amjkeyboard/amj96/keymaps/default/keymap.c +0 -0
R keyboards/amj96/matrix.c => keyboards/amjkeyboard/amj96/matrix.c +0 -0
R keyboards/amj96/readme.md => keyboards/amjkeyboard/amj96/readme.md +2 -2
@@ 8,11 8,11 @@ The AMD96 is a 96 key custom keyboard with anodized aluminum case, twin usb port

Make example for this keyboard (after setting up your build environment):

    make amj96:default
    make amjkeyboard/amj96:default

Flashing example for this keyboard:

    make amj96:default:flash
    make amjkeyboard/amj96: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).


R keyboards/amj96/rules.mk => keyboards/amjkeyboard/amj96/rules.mk +0 -0
R keyboards/amjpad/amjpad.c => keyboards/amjkeyboard/amjpad/amjpad.c +0 -0
R keyboards/amjpad/amjpad.h => keyboards/amjkeyboard/amjpad/amjpad.h +0 -0
R keyboards/amjpad/config.h => keyboards/amjkeyboard/amjpad/config.h +1 -1
@@ 20,7 20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID       0xFEED
#define VENDOR_ID       0x00D8 //A+M+J
#define PRODUCT_ID      0x6060
#define DEVICE_VER      0x0003
#define MANUFACTURER    AMJ

R keyboards/amjpad/info.json => keyboards/amjkeyboard/amjpad/info.json +0 -0
R keyboards/amjpad/keymaps/default/keymap.c => keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c +0 -0
R keyboards/amjpad/keymaps/max/keymap.c => keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c +0 -0
R keyboards/amjpad/keymaps/ortho_left/keymap.c => keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c +0 -0
R keyboards/amjpad/keymaps/ortho_right/keymap.c => keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c +0 -0
R keyboards/amjpad/readme.md => keyboards/amjkeyboard/amjpad/readme.md +1 -1
@@ 9,6 9,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=83546.0

Make example for this keyboard (after setting up your build environment):

    make amjpad:default
    make amjkeyboard/amjpad:default

See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.

R keyboards/amjpad/rules.mk => keyboards/amjkeyboard/amjpad/rules.mk +0 -0