Jelajahi Sumber

move amj keyboards into amjkeyboard vendor folder (#15733)

Co-authored-by: Nick Brassel <nick@tzarc.org>
peepeetee 3 tahun lalu
induk
melakukan
bd8220e9fc
49 mengubah file dengan 12 tambahan dan 12 penghapusan
  1. 0 0
      keyboards/amjkeyboard/amj40/amj40.c
  2. 0 0
      keyboards/amjkeyboard/amj40/amj40.h
  3. 1 1
      keyboards/amjkeyboard/amj40/config.h
  4. 0 0
      keyboards/amjkeyboard/amj40/info.json
  5. 0 0
      keyboards/amjkeyboard/amj40/keymaps/default/keymap.c
  6. 0 0
      keyboards/amjkeyboard/amj40/keymaps/default/readme.md
  7. 0 0
      keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c
  8. 0 0
      keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c
  9. 0 0
      keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c
  10. 0 0
      keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
  11. 0 0
      keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk
  12. 0 0
      keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h
  13. 0 0
      keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
  14. 0 0
      keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md
  15. 0 0
      keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk
  16. 0 0
      keyboards/amjkeyboard/amj40/keymaps/myee/build.sh
  17. 0 0
      keyboards/amjkeyboard/amj40/keymaps/myee/config.h
  18. 0 0
      keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
  19. 0 0
      keyboards/amjkeyboard/amj40/keymaps/myee/readme.md
  20. 0 0
      keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk
  21. 0 0
      keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh
  22. 2 2
      keyboards/amjkeyboard/amj40/readme.md
  23. 0 0
      keyboards/amjkeyboard/amj40/rules.mk
  24. 0 0
      keyboards/amjkeyboard/amj60/amj60.c
  25. 0 0
      keyboards/amjkeyboard/amj60/amj60.h
  26. 1 1
      keyboards/amjkeyboard/amj60/config.h
  27. 0 0
      keyboards/amjkeyboard/amj60/info.json
  28. 0 0
      keyboards/amjkeyboard/amj60/keymaps/default/keymap.c
  29. 2 2
      keyboards/amjkeyboard/amj60/readme.md
  30. 0 0
      keyboards/amjkeyboard/amj60/rules.mk
  31. 1 1
      keyboards/amjkeyboard/amj66/config.h
  32. 0 0
      keyboards/amjkeyboard/amj96/amj96.c
  33. 0 0
      keyboards/amjkeyboard/amj96/amj96.h
  34. 1 1
      keyboards/amjkeyboard/amj96/config.h
  35. 0 0
      keyboards/amjkeyboard/amj96/info.json
  36. 0 0
      keyboards/amjkeyboard/amj96/keymaps/default/keymap.c
  37. 0 0
      keyboards/amjkeyboard/amj96/matrix.c
  38. 2 2
      keyboards/amjkeyboard/amj96/readme.md
  39. 0 0
      keyboards/amjkeyboard/amj96/rules.mk
  40. 0 0
      keyboards/amjkeyboard/amjpad/amjpad.c
  41. 0 0
      keyboards/amjkeyboard/amjpad/amjpad.h
  42. 1 1
      keyboards/amjkeyboard/amjpad/config.h
  43. 0 0
      keyboards/amjkeyboard/amjpad/info.json
  44. 0 0
      keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c
  45. 0 0
      keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
  46. 0 0
      keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c
  47. 0 0
      keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c
  48. 1 1
      keyboards/amjkeyboard/amjpad/readme.md
  49. 0 0
      keyboards/amjkeyboard/amjpad/rules.mk

+ 0 - 0
keyboards/amj40/amj40.c → keyboards/amjkeyboard/amj40/amj40.c


+ 0 - 0
keyboards/amj40/amj40.h → keyboards/amjkeyboard/amj40/amj40.h


+ 1 - 1
keyboards/amj40/config.h → keyboards/amjkeyboard/amj40/config.h

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 #include "config_common.h"
 
 
 /* USB Device descriptor parameter */
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6072
 #define PRODUCT_ID      0x6072
 #define DEVICE_VER      0x0002
 #define DEVICE_VER      0x0002
 #define MANUFACTURER    Han Chen
 #define MANUFACTURER    Han Chen

+ 0 - 0
keyboards/amj40/info.json → keyboards/amjkeyboard/amj40/info.json


+ 0 - 0
keyboards/amj40/keymaps/default/keymap.c → keyboards/amjkeyboard/amj40/keymaps/default/keymap.c


+ 0 - 0
keyboards/amj40/keymaps/default/readme.md → keyboards/amjkeyboard/amj40/keymaps/default/readme.md


+ 0 - 0
keyboards/amj40/keymaps/default_625u_space/keymap.c → keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c


+ 0 - 0
keyboards/amj40/keymaps/default_ortho_275u_space/keymap.c → keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c


+ 0 - 0
keyboards/amj40/keymaps/default_ortho_600u_space/keymap.c → keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c


+ 0 - 0
keyboards/amj40/keymaps/fabian/keymap.c → keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c


+ 0 - 0
keyboards/amj40/keymaps/fabian/rules.mk → keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk


+ 0 - 0
keyboards/amj40/keymaps/jetpacktuxedo/config.h → keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h


+ 0 - 0
keyboards/amj40/keymaps/jetpacktuxedo/keymap.c → keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c


+ 0 - 0
keyboards/amj40/keymaps/jetpacktuxedo/readme.md → keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md


+ 0 - 0
keyboards/amj40/keymaps/jetpacktuxedo/rules.mk → keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk


+ 0 - 0
keyboards/amj40/keymaps/myee/build.sh → keyboards/amjkeyboard/amj40/keymaps/myee/build.sh


+ 0 - 0
keyboards/amj40/keymaps/myee/config.h → keyboards/amjkeyboard/amj40/keymaps/myee/config.h


+ 0 - 0
keyboards/amj40/keymaps/myee/keymap.c → keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c


+ 0 - 0
keyboards/amj40/keymaps/myee/readme.md → keyboards/amjkeyboard/amj40/keymaps/myee/readme.md


+ 0 - 0
keyboards/amj40/keymaps/myee/rules.mk → keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk


+ 0 - 0
keyboards/amj40/keymaps/myee/updatemerge.sh → keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh


+ 2 - 2
keyboards/amj40/readme.md → keyboards/amjkeyboard/amj40/readme.md

@@ -12,11 +12,11 @@ DIY/Assembled compact 40% keyboard.
 
 
 Make example for this keyboard (after setting up your build environment):
 Make example for this keyboard (after setting up your build environment):
 
 
-    make amj40:default
+    make amjkeyboard/amj40:default
 
 
 Flashing example for this keyboard:
 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).
 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).
 
 

+ 0 - 0
keyboards/amj40/rules.mk → keyboards/amjkeyboard/amj40/rules.mk


+ 0 - 0
keyboards/amj60/amj60.c → keyboards/amjkeyboard/amj60/amj60.c


+ 0 - 0
keyboards/amj60/amj60.h → keyboards/amjkeyboard/amj60/amj60.h


+ 1 - 1
keyboards/amj60/config.h → keyboards/amjkeyboard/amj60/config.h

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 #include "config_common.h"
 
 
 /* USB Device descriptor parameter */
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6066
 #define PRODUCT_ID      0x6066
 #define DEVICE_VER      0x0001
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Han Chen
 #define MANUFACTURER    Han Chen

+ 0 - 0
keyboards/amj60/info.json → keyboards/amjkeyboard/amj60/info.json


+ 0 - 0
keyboards/amj60/keymaps/default/keymap.c → keyboards/amjkeyboard/amj60/keymaps/default/keymap.c


+ 2 - 2
keyboards/amj60/readme.md → keyboards/amjkeyboard/amj60/readme.md

@@ -11,11 +11,11 @@ A 60% keyboard.
 
 
 Make example for this keyboard (after setting up your build environment):
 Make example for this keyboard (after setting up your build environment):
 
 
-    make amj60:default
+    make amjkeyboard/amj60:default
 
 
 Flashing example for this keyboard:
 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.
 To reset the board into bootloader mode, tap the Reset switch mounted on the bottom side of the PCB.
 
 

+ 0 - 0
keyboards/amj60/rules.mk → keyboards/amjkeyboard/amj60/rules.mk


+ 1 - 1
keyboards/amjkeyboard/amj66/config.h

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 #include "config_common.h"
 
 
 /* USB Device descriptor parameter */
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0xBD66
 #define PRODUCT_ID      0xBD66
 #define DEVICE_VER      0x0001
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    AMJKeyboard
 #define MANUFACTURER    AMJKeyboard

+ 0 - 0
keyboards/amj96/amj96.c → keyboards/amjkeyboard/amj96/amj96.c


+ 0 - 0
keyboards/amj96/amj96.h → keyboards/amjkeyboard/amj96/amj96.h


+ 1 - 1
keyboards/amj96/config.h → keyboards/amjkeyboard/amj96/config.h

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 #include "config_common.h"
 
 
 /* USB Device descriptor parameter */
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6074
 #define PRODUCT_ID      0x6074
 #define DEVICE_VER      0x0002
 #define DEVICE_VER      0x0002
 #define MANUFACTURER    Han Chen
 #define MANUFACTURER    Han Chen

+ 0 - 0
keyboards/amj96/info.json → keyboards/amjkeyboard/amj96/info.json


+ 0 - 0
keyboards/amj96/keymaps/default/keymap.c → keyboards/amjkeyboard/amj96/keymaps/default/keymap.c


+ 0 - 0
keyboards/amj96/matrix.c → keyboards/amjkeyboard/amj96/matrix.c


+ 2 - 2
keyboards/amj96/readme.md → keyboards/amjkeyboard/amj96/readme.md

@@ -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 example for this keyboard (after setting up your build environment):
 
 
-    make amj96:default
+    make amjkeyboard/amj96:default
 
 
 Flashing example for this keyboard:
 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).
 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).
 
 

+ 0 - 0
keyboards/amj96/rules.mk → keyboards/amjkeyboard/amj96/rules.mk


+ 0 - 0
keyboards/amjpad/amjpad.c → keyboards/amjkeyboard/amjpad/amjpad.c


+ 0 - 0
keyboards/amjpad/amjpad.h → keyboards/amjkeyboard/amjpad/amjpad.h


+ 1 - 1
keyboards/amjpad/config.h → keyboards/amjkeyboard/amjpad/config.h

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 #include "config_common.h"
 
 
 /* USB Device descriptor parameter */
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6060
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0003
 #define DEVICE_VER      0x0003
 #define MANUFACTURER    AMJ
 #define MANUFACTURER    AMJ

+ 0 - 0
keyboards/amjpad/info.json → keyboards/amjkeyboard/amjpad/info.json


+ 0 - 0
keyboards/amjpad/keymaps/default/keymap.c → keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c


+ 0 - 0
keyboards/amjpad/keymaps/max/keymap.c → keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c


+ 0 - 0
keyboards/amjpad/keymaps/ortho_left/keymap.c → keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c


+ 0 - 0
keyboards/amjpad/keymaps/ortho_right/keymap.c → keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c


+ 1 - 1
keyboards/amjpad/readme.md → keyboards/amjkeyboard/amjpad/readme.md

@@ -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 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.
 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.

+ 0 - 0
keyboards/amjpad/rules.mk → keyboards/amjkeyboard/amjpad/rules.mk