summaryrefslogtreecommitdiffstats
path: root/keyboards/fjlabs/solanis
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-27 21:44:42 +0000
committerQMK Bot <hello@qmk.fm>2022-07-27 21:44:42 +0000
commit7bb73306d640a7453462f76c9d22459b5356a9da (patch)
tree5b0acb1a7efbe5155ea732af3cc95bb307f1fe3d /keyboards/fjlabs/solanis
parent5055c9a74b0b88cb164f600963df40351ce4d5f7 (diff)
parent23f365b6014634bf9f67ed3515853bf8c4372615 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/fjlabs/solanis')
-rw-r--r--keyboards/fjlabs/solanis/config.h7
-rw-r--r--keyboards/fjlabs/solanis/info.json6
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/fjlabs/solanis/config.h b/keyboards/fjlabs/solanis/config.h
index 50649889fc..40b9ad8525 100644
--- a/keyboards/fjlabs/solanis/config.h
+++ b/keyboards/fjlabs/solanis/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7074 // FJLaboratories
-#define PRODUCT_ID 0x0017 // Solanis
-#define DEVICE_VER 0x0001 // Version 1
-#define MANUFACTURER FJLaboratories
-#define PRODUCT Solanis
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json
index d05857e0a8..6fb66c6574 100644
--- a/keyboards/fjlabs/solanis/info.json
+++ b/keyboards/fjlabs/solanis/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Solanis",
+ "manufacturer": "FJLaboratories",
"url": "http://www.fjlaboratories.com/",
"maintainer": "FJLabs",
+ "usb": {
+ "vid": "0x7074",
+ "pid": "0x0017",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [