summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-02-12 01:03:00 +0000
committerQMK Bot <hello@qmk.fm>2021-02-12 01:03:00 +0000
commit0b68c7441a03a898073b87318ee73bff12015ee0 (patch)
treee3955d7b3c75774880e4faa74c4a7981f80dd001
parent02654ad2d7abefc00c621cf453ed0fdd2764c6f2 (diff)
parentbc74027f3920c244ea3524e755dba66b0dd2fb8c (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/noxary/220/config.h3
-rw-r--r--keyboards/noxary/260/config.h5
-rw-r--r--keyboards/noxary/268/config.h2
-rw-r--r--keyboards/noxary/268_2/config.h2
-rw-r--r--keyboards/noxary/280/config.h2
-rw-r--r--keyboards/noxary/x268/config.h2
6 files changed, 9 insertions, 7 deletions
diff --git a/keyboards/noxary/220/config.h b/keyboards/noxary/220/config.h
index 49d98f583a..78da8ccbce 100644
--- a/keyboards/noxary/220/config.h
+++ b/keyboards/noxary/220/config.h
@@ -21,11 +21,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4E58 //"NX"
-#define PRODUCT_ID 0x00DC //220
+#define PRODUCT_ID 0x0899 //2201
#define DEVICE_VER 0x0001
#define MANUFACTURER Noxary
#define PRODUCT 220
+
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 4
diff --git a/keyboards/noxary/260/config.h b/keyboards/noxary/260/config.h
index 82814d2f7a..b447dec69f 100644
--- a/keyboards/noxary/260/config.h
+++ b/keyboards/noxary/260/config.h
@@ -20,12 +20,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4E58
-#define PRODUCT_ID 0x003C
+#define VENDOR_ID 0x4E58 //"NX"
+#define PRODUCT_ID 0x0A29 //2601
#define DEVICE_VER 0x0001
#define MANUFACTURER Noxary
#define PRODUCT 260
+
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/noxary/268/config.h b/keyboards/noxary/268/config.h
index c3477f5c75..bd72bdba74 100644
--- a/keyboards/noxary/268/config.h
+++ b/keyboards/noxary/268/config.h
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4E58 //"NX"
-#define PRODUCT_ID 0x010C //268
+#define PRODUCT_ID 0x0A79 //2681
#define DEVICE_VER 0x0001
#define MANUFACTURER Noxary
#define PRODUCT 268
diff --git a/keyboards/noxary/268_2/config.h b/keyboards/noxary/268_2/config.h
index c78349e0dd..960977fa0b 100644
--- a/keyboards/noxary/268_2/config.h
+++ b/keyboards/noxary/268_2/config.h
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4E58 //"NX"
-#define PRODUCT_ID 0x010C //268
+#define PRODUCT_ID 0x0A7A //2682
#define DEVICE_VER 0x0002
#define MANUFACTURER Noxary
#define PRODUCT 268.2
diff --git a/keyboards/noxary/280/config.h b/keyboards/noxary/280/config.h
index 1876555400..53a6e5733a 100644
--- a/keyboards/noxary/280/config.h
+++ b/keyboards/noxary/280/config.h
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4E58 //"NX"
-#define PRODUCT_ID 0x0118 //280
+#define PRODUCT_ID 0x0AF1 //2801
#define DEVICE_VER 0x0001
#define MANUFACTURER Noxary
#define PRODUCT 280
diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h
index fcfbf6f12a..00a696fb7a 100644
--- a/keyboards/noxary/x268/config.h
+++ b/keyboards/noxary/x268/config.h
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4E58 //"NX"
-#define PRODUCT_ID 0x010C //268
+#define PRODUCT_ID 0x0A7B //2683
#define DEVICE_VER 0x0078 //"x"
#define MANUFACTURER Noxary
#define PRODUCT x268