summaryrefslogtreecommitdiff
path: root/keyboards/neopad
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2022-08-20 10:55:40 +1000
committerfauxpark <fauxpark@gmail.com>2022-08-20 10:55:40 +1000
commit61689ae6096f55148fdc4d333c6a74a79486eba3 (patch)
tree1258cf3619698326cbbd4f28bd3ee502517821fb /keyboards/neopad
parenteceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff)
parent201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff)
downloadqmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.tar.gz
qmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.zip
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/neopad')
-rwxr-xr-xkeyboards/neopad/config.h6
-rwxr-xr-xkeyboards/neopad/rev1/config.h3
-rwxr-xr-xkeyboards/neopad/rev1/info.json6
3 files changed, 6 insertions, 9 deletions
diff --git a/keyboards/neopad/config.h b/keyboards/neopad/config.h
index 79798b1d66..e352a1ab92 100755
--- a/keyboards/neopad/config.h
+++ b/keyboards/neopad/config.h
@@ -18,12 +18,6 @@ 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 PRODUCT_ID 0x0913
-#define MANUFACTURER rookiebwoy
-#define PRODUCT neopad
-
/* Column/Row IO definitions */
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/neopad/rev1/config.h b/keyboards/neopad/rev1/config.h
index aa85ce1975..299c28487d 100755
--- a/keyboards/neopad/rev1/config.h
+++ b/keyboards/neopad/rev1/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x0010
-
/* Column/Row IO definitions */
#define MATRIX_ROWS 2
#define MATRIX_COLS 3
diff --git a/keyboards/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json
index b5868084d1..ef84eef161 100755
--- a/keyboards/neopad/rev1/info.json
+++ b/keyboards/neopad/rev1/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "neopad",
+ "manufacturer": "rookiebwoy",
"url": "https://github.com/rookiebwoy/neopad)",
"maintainer": "rookiebwoy",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0913",
+ "device_version": "0.1.0"
+ },
"layouts": {
"LAYOUT": {
"layout": [