Merge remote-tracking branch 'origin/develop' into xap

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"
 
 /* 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

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

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"
 
 /* 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

keyboards/amjkeyboard/amj60/readme.md

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

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"
 
 /* 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

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"
 
 /* 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

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

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"
 
 /* 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

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

keyboards/ymdk/melody96/readme.md

@@ -10,7 +10,7 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make melody96:default
+    make ymdk/melody96:default
 
 Flashing example for this keyboard: