aboutsummaryrefslogtreecommitdiff
path: root/keyboards/jiran
diff options
context:
space:
mode:
authorzvecr <[email protected]>2022-07-29 17:30:33 +0100
committerzvecr <[email protected]>2022-07-29 17:30:33 +0100
commitade2eb1e751be2918b901bfe4352a71f1d54e2a2 (patch)
tree4a2c409651420d4c99296aebeaaf0514d2cb4a71 /keyboards/jiran
parent1050cf24536378d534c6163fd1ae5ae3fe46ccc4 (diff)
parent394cf7c41e24f966d38b9c8cc9bbc2faca905e2a (diff)
downloadqmk_firmware-ade2eb1e751be2918b901bfe4352a71f1d54e2a2.tar.gz
qmk_firmware-ade2eb1e751be2918b901bfe4352a71f1d54e2a2.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/jiran')
-rw-r--r--keyboards/jiran/config.h7
-rw-r--r--keyboards/jiran/info.json8
2 files changed, 7 insertions, 8 deletions
diff --git a/keyboards/jiran/config.h b/keyboards/jiran/config.h
index da100292e2..0579f44a77 100644
--- a/keyboards/jiran/config.h
+++ b/keyboards/jiran/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 0x1209
-#define PRODUCT_ID 0x3735
-#define DEVICE_VER 0x0300
-#define MANUFACTURER Ladniy
-#define PRODUCT Jiran
-
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10
diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json
index 8dd6a43fe8..93b8ad11ce 100644
--- a/keyboards/jiran/info.json
+++ b/keyboards/jiran/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "jiran",
+ "keyboard_name": "Jiran",
+ "manufacturer": "Ladniy",
"url": "t.me/s/ladniys",
"maintainer": "Ladniy",
+ "usb": {
+ "vid": "0x1209",
+ "pid": "0x3735",
+ "device_version": "3.0.0"
+ },
"layouts": {
"LAYOUT": {
"layout": [