From cb9d0b27366699f87117e975af2c354d00cf544a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayta=C3=A7=20Kayadelen?= Date: Sat, 6 Jan 2024 19:34:13 +0100 Subject: [PATCH] fix broken layouts --- .../Extra Features/2zone_1logo_mousepad.json | 6 +-- .../generic_60_percent_right_features.json | 20 ++++++++ ...board22jp_numpad_left_bottom_features.json | 19 +------ ...ard22usuk_numpad_left_bottom_features.json | 18 +------ .../logitech_g102_features.json | 4 +- kb_layouts/Uniwill2ND_35X_1.json | 25 +-------- kb_layouts/Uniwill2ND_35X_2.json | 32 +----------- kb_layouts/Uniwill2P1_550_BR.json | 41 +++------------ kb_layouts/Uniwill2P1_550_JP.json | 41 +++------------ kb_layouts/Uniwill2P1_550_UK.json | 34 +++---------- kb_layouts/Uniwill2P1_550_US.json | 43 +++------------- kb_layouts/Uniwill2P2_650_BR.json | 47 +++-------------- kb_layouts/Uniwill2P2_650_JP.json | 51 +++---------------- kb_layouts/Uniwill2P2_650_UK.json | 38 +++----------- kb_layouts/Uniwill2P2_650_US.json | 45 +++------------- kb_layouts/bloody_full.json | 4 -- kb_layouts/clevo_3_zone.json | 31 +---------- kb_layouts/generic_60_percent.json | 11 +++- kb_layouts/generic_laptop.json | 17 ++++--- kb_layouts/generic_laptop_numpad.json | 3 +- kb_layouts/keychron_q1_knob_ansi.json | 18 ++++--- kb_layouts/msi_gp66_us.json | 26 ++++------ kb_layouts/razer_blade.json | 15 ++++-- kb_layouts/roccat_vulcan_tkl.json | 3 +- 24 files changed, 145 insertions(+), 447 deletions(-) create mode 100644 kb_layouts/Extra Features/generic_60_percent_right_features.json diff --git a/kb_layouts/Extra Features/2zone_1logo_mousepad.json b/kb_layouts/Extra Features/2zone_1logo_mousepad.json index d07a9d2..0ac2707 100644 --- a/kb_layouts/Extra Features/2zone_1logo_mousepad.json +++ b/kb_layouts/Extra Features/2zone_1logo_mousepad.json @@ -15,7 +15,7 @@ "enabled": true, "absolute_location": true }, - { //logo + { "tag": 213, "visualName": "", "margin_left": 143.5, @@ -29,7 +29,7 @@ "enabled": true, "absolute_location": true }, - { //right + { "tag": 214, "visualName": "", "margin_left": 200.0, @@ -43,7 +43,7 @@ "enabled": true, "absolute_location": true }, - { //left + { "tag": 215, "visualName": "", "margin_left": 15.0, diff --git a/kb_layouts/Extra Features/generic_60_percent_right_features.json b/kb_layouts/Extra Features/generic_60_percent_right_features.json new file mode 100644 index 0000000..afd7b9a --- /dev/null +++ b/kb_layouts/Extra Features/generic_60_percent_right_features.json @@ -0,0 +1,20 @@ +{ + "group_tag": "keyboard", + "origin_region": 2, + "grouped_keys": [ + { + "visualName": "\\", + "tag": 51, + "margin_left": -47, + "margin_top": 37, + "width": 47.0, + "height": 30.0, + "font_size": 9.0, + "enabled": true, + "absolute_location": true + } + ], + "key_conversion": { + "77": 51 + } +} diff --git a/kb_layouts/Extra Features/keyboard22jp_numpad_left_bottom_features.json b/kb_layouts/Extra Features/keyboard22jp_numpad_left_bottom_features.json index c1dd1a8..0c4ee13 100644 --- a/kb_layouts/Extra Features/keyboard22jp_numpad_left_bottom_features.json +++ b/kb_layouts/Extra Features/keyboard22jp_numpad_left_bottom_features.json @@ -73,22 +73,5 @@ "enabled": true, "absolute_location": true } - //, - - //{ - // "visualName": "\\", - // "tag": 54, - // "margin_left": 452.0, - // "margin_top": -74.0, - // "width": 30.0, - // "height": 30.0, - // "font_size": 9.0, - // "width_bits": 3, - // "height_bits": 3, - // "margin_left_bits": 4, - // "margin_top_bits": -3, - // "enabled": true, - // "absolute_location": true - //} ] -} \ No newline at end of file +} diff --git a/kb_layouts/Extra Features/keyboard22usuk_numpad_left_bottom_features.json b/kb_layouts/Extra Features/keyboard22usuk_numpad_left_bottom_features.json index c922f35..7eacafe 100644 --- a/kb_layouts/Extra Features/keyboard22usuk_numpad_left_bottom_features.json +++ b/kb_layouts/Extra Features/keyboard22usuk_numpad_left_bottom_features.json @@ -61,22 +61,6 @@ "enabled": true, "absolute_location": true }, - - //{ - // "visualName": "+", - // "tag": 54, - // "margin_left": 666.0, - // "margin_top": -222.0, - // "width": 30.0, - // "height": 30.0, - // "font_size": 9.0, - // "width_bits": 3, - // "height_bits": 3, - // "margin_left_bits": 4, - // "margin_top_bits": -3, - // "enabled": true, - // "absolute_location": true - //}, { "visualName": "FN", "tag": 107, @@ -89,4 +73,4 @@ "absolute_location": true } ] -} \ No newline at end of file +} diff --git a/kb_layouts/Extra Features/logitech_g102_features.json b/kb_layouts/Extra Features/logitech_g102_features.json index cd53273..a014268 100644 --- a/kb_layouts/Extra Features/logitech_g102_features.json +++ b/kb_layouts/Extra Features/logitech_g102_features.json @@ -12,7 +12,7 @@ "enabled": true, "absolute_location": true }, - { //for now G102 has to use a single zone bc Logitech is big dumb dumb and zones don't work on G102. the SDK for G102 didn't even work at all for the last x years. + { "visualName": "Logo", "tag": 160, "margin_left": 18.0, @@ -24,4 +24,4 @@ "absolute_location": true } ] -} \ No newline at end of file +} diff --git a/kb_layouts/Uniwill2ND_35X_1.json b/kb_layouts/Uniwill2ND_35X_1.json index 0a5b5b9..bfbb29d 100644 --- a/kb_layouts/Uniwill2ND_35X_1.json +++ b/kb_layouts/Uniwill2ND_35X_1.json @@ -63,7 +63,8 @@ }, "13": { "tag": 13, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, @@ -72,14 +73,6 @@ "margin_left": 7.0 }, - //home - //"32": { - // "tag": 32, - - // "margin_left": 7.0 - //}, - - //Number lock "34": { "tag": 34, "margin_left": 7 @@ -107,24 +100,18 @@ "margin_left": 7, "width": 30 }, - //number 7 "55": { "tag": 55, "margin_left": 62 }, - //number 8 "56": { "tag": 56, "margin_left": 7 }, - - //number 9 "57": { "tag": 57, "margin_left": 7 }, - - //+ "58": { "margin_left": 7, "line_break": true @@ -144,7 +131,6 @@ "73": { "margin_left": 7 }, - //number 6 "75": { "line_break": true }, @@ -156,13 +142,10 @@ "height": 30.0, "font_size": 12.0 }, - //right shift "88": { "tag": 88, "width": 57 }, - - //"↑" "89": { "tag": 89, "margin_left": 7 @@ -170,11 +153,9 @@ "90": { "margin_left": 7.0 }, - //Number enter "93": { "line_break": true }, - //LeftControl "94": { "tag": 94, "width": 41 @@ -204,7 +185,6 @@ "margin_left": 7, "width": 30 }, - //Rith control "101": { "tag": 101, "margin_left": 7, @@ -231,7 +211,6 @@ "included_features": [ "keyboard_numpad_left_bottom_features.json", - //"generic_laptop_numpad_right_bottom_features.json", "keyboard101_numpad_right_features.json" ] diff --git a/kb_layouts/Uniwill2ND_35X_2.json b/kb_layouts/Uniwill2ND_35X_2.json index 3569517..edfebc2 100644 --- a/kb_layouts/Uniwill2ND_35X_2.json +++ b/kb_layouts/Uniwill2ND_35X_2.json @@ -63,7 +63,8 @@ }, "13": { "tag": 13, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, @@ -72,14 +73,6 @@ "margin_left": 7.0 }, - //home - //"32": { - // "tag": 32, - - // "margin_left": 7.0 - //}, - - //Number lock "34": { "tag": 34, "margin_left": 7 @@ -107,38 +100,29 @@ "margin_left": 7, "width": 30 }, - //number 7 "55": { "tag": 55, "margin_left": 62 }, - //number 8 "56": { "tag": 56, "margin_left": 7 }, - - //number 9 "57": { "tag": 57, "margin_left": 7 }, - - //+ "58": { "margin_left": 7, "line_break": true }, - - //key ~ "71": { "visualName": "~", "tag": 71 }, - //ENTER "72": { "tag": 72, "margin_left": 7.0, @@ -150,11 +134,9 @@ "73": { "margin_left": 7 }, - //number 6 "75": { "line_break": true }, - //left shift "76": { "tag": 76, "margin_left": 0.0, @@ -163,18 +145,13 @@ "height": 30.0, "font_size": 12.0 }, - // \ "77": { "tag": 77 }, - - //right shift "88": { "tag": 88, "width": 57 }, - - //"↑" "89": { "tag": 89, "margin_left": 7 @@ -182,11 +159,9 @@ "90": { "margin_left": 7.0 }, - //Number enter "93": { "line_break": true }, - //LeftControl "94": { "tag": 94, "width": 41 @@ -216,7 +191,6 @@ "margin_left": 7, "width": 30 }, - //Rith control "101": { "tag": 101, "margin_left": 7, @@ -244,7 +218,5 @@ "included_features": [ "keyboard_numpad_left_bottom_features.json" - //"keyboard102_numpad_right_features.json" - ] } diff --git a/kb_layouts/Uniwill2P1_550_BR.json b/kb_layouts/Uniwill2P1_550_BR.json index 2e78fd5..a3598d4 100644 --- a/kb_layouts/Uniwill2P1_550_BR.json +++ b/kb_layouts/Uniwill2P1_550_BR.json @@ -72,14 +72,16 @@ }, "13": { "tag": 13, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, "30": { "visualName": "←", "tag": 30, "width": 30, - "margin_left": 44.0 + "margin_left": 44.0, + "line_break": true }, @@ -93,31 +95,21 @@ "width": 30 }, - - //key ~ "71": { "visualName": "]", "tag": 71 }, - //ENTER "72": { "tag": 72, "margin_left": 7.0, "margin_top": -40.0, "width": 37.0, "height": 70.0, - "font_size": 12.0 + "font_size": 12.0, + "line_break": true }, - //"73": { - // "margin_left": 7 - //}, - ////number 6 - //"75": { - // "line_break": true - //}, - //left shift "76": { "tag": 76, "margin_left": 0.0, @@ -126,7 +118,6 @@ "height": 30.0, "font_size": 12.0 }, - // \ "77": { "tag": 77 }, @@ -147,27 +138,19 @@ "width": 28 }, - - //right shift "88": { "font_size": 10.0, "tag": 88, "width": 28 }, - - //"↑" "89": { "tag": 89, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, "90": { "margin_left": 7.0 }, - ////Number enter - //"93": { - // "line_break": true - //}, - //LeftControl "94": { "tag": 94, "width": 41 @@ -197,7 +180,6 @@ "margin_left": 7, "width": 30 }, - //Rith control "101": { "tag": 101, "margin_left": 7, @@ -213,13 +195,6 @@ "line_break": true } - //"105": { - // "margin_left": 7.0, - // "width": 30 - //}, - //"106": { - // "line_break": true - //} }, diff --git a/kb_layouts/Uniwill2P1_550_JP.json b/kb_layouts/Uniwill2P1_550_JP.json index 5a5961f..ce2895d 100644 --- a/kb_layouts/Uniwill2P1_550_JP.json +++ b/kb_layouts/Uniwill2P1_550_JP.json @@ -75,13 +75,15 @@ }, "13": { "tag": 13, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, "30": { "tag": 30, "width": 30, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, @@ -95,31 +97,21 @@ "width": 30 }, - - //key ~ "71": { "visualName": "]", "tag": 71 }, - //ENTER "72": { "tag": 72, "margin_left": 7.0, "margin_top": -40.0, "width": 37.0, "height": 70.0, - "font_size": 12.0 + "font_size": 12.0, + "line_break": true }, - //"73": { - // "margin_left": 7 - //}, - ////number 6 - //"75": { - // "line_break": true - //}, - //left shift "76": { "tag": 76, "margin_left": 0.0, @@ -128,30 +120,21 @@ "height": 30.0, "font_size": 12.0 }, - // \ "77": { "tag": 77 }, - - //right shift "88": { "tag": 88, "width": 30 }, - - //"↑" "89": { "tag": 89, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, "90": { "margin_left": 7.0 }, - ////Number enter - //"93": { - // "line_break": true - //}, - //LeftControl "94": { "tag": 94, "width": 41 @@ -181,7 +164,6 @@ "margin_left": 7, "width": 30 }, - //Rith control "101": { "tag": 101, "margin_left": 7, @@ -197,13 +179,6 @@ "line_break": true } - //"105": { - // "margin_left": 7.0, - // "width": 30 - //}, - //"106": { - // "line_break": true - //} }, diff --git a/kb_layouts/Uniwill2P1_550_UK.json b/kb_layouts/Uniwill2P1_550_UK.json index 3ebab79..eeb7cdb 100644 --- a/kb_layouts/Uniwill2P1_550_UK.json +++ b/kb_layouts/Uniwill2P1_550_UK.json @@ -72,12 +72,14 @@ }, "13": { "tag": 13, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, "30": { "tag": 30, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, @@ -91,31 +93,21 @@ "width": 30 }, - - //key ~ "71": { "visualName": "~", "tag": 71 }, - //ENTER "72": { "tag": 72, "margin_left": 7.0, "margin_top": -40.0, "width": 37.0, "height": 70.0, - "font_size": 12.0 + "font_size": 12.0, + "line_break": true }, - //"73": { - // "margin_left": 7 - //}, - ////number 6 - //"75": { - // "line_break": true - //}, - //left shift "76": { "tag": 76, "margin_left": 0.0, @@ -124,30 +116,21 @@ "height": 30.0, "font_size": 12.0 }, - // \ "77": { "tag": 77 }, - - //right shift "88": { "tag": 88, "width": 57 }, - - //"↑" "89": { "tag": 89, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, "90": { "margin_left": 7.0 }, - ////Number enter - //"93": { - // "line_break": true - //}, - //LeftControl "94": { "tag": 94, "width": 41 @@ -177,7 +160,6 @@ "margin_left": 7, "width": 30 }, - //Rith control "101": { "tag": 101, "margin_left": 7, diff --git a/kb_layouts/Uniwill2P1_550_US.json b/kb_layouts/Uniwill2P1_550_US.json index b035721..a81da9b 100644 --- a/kb_layouts/Uniwill2P1_550_US.json +++ b/kb_layouts/Uniwill2P1_550_US.json @@ -80,12 +80,14 @@ }, "13": { "tag": 13, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, "30": { "tag": 30, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, @@ -99,31 +101,19 @@ "width": 30 }, - - //key ~ "71": { "visualName": "~", - "tag": 71 - }, - //ENTER "72": { "tag": 72, "margin_left": 7.0, "margin_top": 0, "width": 76.0, "height": 30.0, - "font_size": 12.0 + "font_size": 12.0, + "line_break": true }, - //"73": { - // "margin_left": 7 - //}, - ////number 6 - //"75": { - // "line_break": true - //}, - //left shift "76": { "tag": 76, "margin_left": 0.0, @@ -132,30 +122,21 @@ "height": 30.0, "font_size": 12.0 }, - // \ "77": { "tag": 77 }, - - //right shift "88": { "tag": 88, "width": 57 }, - - //"↑" "89": { "tag": 89, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, "90": { "margin_left": 7.0 }, - ////Number enter - //"93": { - // "line_break": true - //}, - //LeftControl "94": { "tag": 94, "width": 41 @@ -185,7 +166,6 @@ "margin_left": 7, "width": 30 }, - //Rith control "101": { "tag": 101, "margin_left": 7, @@ -201,13 +181,6 @@ "line_break": true } - //"105": { - // "margin_left": 7.0, - // "width": 30 - //}, - //"106": { - // "line_break": true - //} }, diff --git a/kb_layouts/Uniwill2P2_650_BR.json b/kb_layouts/Uniwill2P2_650_BR.json index e272abf..be14811 100644 --- a/kb_layouts/Uniwill2P2_650_BR.json +++ b/kb_layouts/Uniwill2P2_650_BR.json @@ -67,19 +67,15 @@ }, "13": { "tag": 13, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, - - //black space "30": { "visualName": "←", "tag": 30, "width": 30, "margin_left": 44.0 }, - - - //Number lock "34": { "tag": 34, "margin_left": 7 @@ -90,14 +86,9 @@ }, "36": { "tag": 36, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, - // - - //"37": { - // "tag": 37, - // "margin_left": 7, - // "line_break": true - //}, @@ -108,33 +99,19 @@ "margin_left": 7, "width": 30 }, - //number 7 "55": { "tag": 55, "margin_left": 62 }, - //number 8 "56": { "tag": 56, "margin_left": 7 }, - - //number 9 "57": { "tag": 57, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, - - ////+ - //"58": { - // "margin_left": 7, - // "line_break": true - - - //}, - - - //ENTER "72": { "tag": 72, "margin_left": 7.0, @@ -146,7 +123,6 @@ "73": { "margin_left": 7 }, - //number 6 "75": { "line_break": true }, @@ -176,14 +152,11 @@ "width": 28 }, - //right shift "88": { "tag": 88, "width": 28, "margin_left": 7 }, - - //"↑" "89": { "tag": 89, "margin_left": 5 @@ -194,11 +167,6 @@ "92": { "line_break": true }, - ////Number enter - //"93": { - // "line_break": true - //}, - //LeftControl "94": { "tag": 94, "width": 41 @@ -228,7 +196,6 @@ "margin_left": 7, "width": 30 }, - //Rith control "101": { "tag": 101, "margin_left": 7, @@ -255,8 +222,6 @@ "included_features": [ "keyboard22br_numpad_left_bottom_features.json" - //"generic_laptop_numpad_right_bottom_features.json", - //"keyboard101_numpad_right_features.json" ] } diff --git a/kb_layouts/Uniwill2P2_650_JP.json b/kb_layouts/Uniwill2P2_650_JP.json index 2b3c59e..92972dc 100644 --- a/kb_layouts/Uniwill2P2_650_JP.json +++ b/kb_layouts/Uniwill2P2_650_JP.json @@ -70,19 +70,15 @@ }, "13": { "tag": 13, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, - - //black space "30": { "visualName": "←", "tag": 30, "width": 30, "margin_left": 7.0 }, - - - //Number lock "34": { "tag": 34, "margin_left": 7 @@ -93,14 +89,9 @@ }, "36": { "tag": 36, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, - // - - //"37": { - // "tag": 37, - // "margin_left": 7, - // "line_break": true - //}, @@ -111,33 +102,19 @@ "margin_left": 7, "width": 30 }, - //number 7 "55": { "tag": 55, "margin_left": 62 }, - //number 8 "56": { "tag": 56, "margin_left": 7 }, - - //number 9 "57": { "tag": 57, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, - - ////+ - //"58": { - // "margin_left": 7, - // "line_break": true - - - //}, - - - //ENTER "72": { "tag": 72, "margin_left": 7.0, @@ -149,7 +126,6 @@ "73": { "margin_left": 7 }, - //number 6 "75": { "line_break": true }, @@ -162,14 +138,11 @@ "height": 30.0, "font_size": 12.0 }, - //right shift "88": { "tag": 88, "width": 30, "margin_left": 7 }, - - //"↑" "89": { "tag": 89, "margin_left": 5 @@ -180,11 +153,6 @@ "92": { "line_break": true }, - ////Number enter - //"93": { - // "line_break": true - //}, - //LeftControl "94": { "tag": 94, "width": 41 @@ -208,13 +176,6 @@ "margin_left": 7, "width": 30 }, - //"100": { - // "visualName": "App", - // "tag": 100, - // "margin_left": 7, - // "width": 30 - //}, - //Rith control "101": { "tag": 101, "margin_left": 7, diff --git a/kb_layouts/Uniwill2P2_650_UK.json b/kb_layouts/Uniwill2P2_650_UK.json index 27cf3bb..920400b 100644 --- a/kb_layouts/Uniwill2P2_650_UK.json +++ b/kb_layouts/Uniwill2P2_650_UK.json @@ -67,7 +67,8 @@ }, "13": { "tag": 13, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, @@ -76,14 +77,6 @@ "margin_left": 7.0 }, - //home - //"32": { - // "tag": 32, - - // "margin_left": 7.0 - //}, - - //Number lock "34": { "tag": 34, "margin_left": 7 @@ -94,7 +87,8 @@ }, "36": { "tag": 36, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, "37": { "tag": 37, @@ -111,38 +105,30 @@ "margin_left": 7, "width": 30 }, - //number 7 "55": { "tag": 55, "margin_left": 62 }, - //number 8 "56": { "tag": 56, "margin_left": 7 }, - - //number 9 "57": { "tag": 57, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, - - //+ "58": { "margin_left": 7, "line_break": true }, - - //key ~ "71": { "visualName": "~", "tag": 71 }, - //ENTER "72": { "tag": 72, "margin_left": 7.0, @@ -154,11 +140,9 @@ "73": { "margin_left": 7 }, - //number 6 "75": { "line_break": true }, - //left shift "76": { "tag": 76, "margin_left": 0.0, @@ -167,18 +151,13 @@ "height": 30.0, "font_size": 12.0 }, - // \ "77": { "tag": 77 }, - - //right shift "88": { "tag": 88, "width": 57 }, - - //"↑" "89": { "tag": 89, "margin_left": 7 @@ -190,13 +169,9 @@ "line_break": true, "margin_left": 7.0 }, - - - //Number enter "93": { "line_break": true }, - //LeftControl "94": { "tag": 94, "width": 41 @@ -226,7 +201,6 @@ "margin_left": 7, "width": 30 }, - //Rith control "101": { "tag": 101, "margin_left": 7, diff --git a/kb_layouts/Uniwill2P2_650_US.json b/kb_layouts/Uniwill2P2_650_US.json index bdc8381..a021595 100644 --- a/kb_layouts/Uniwill2P2_650_US.json +++ b/kb_layouts/Uniwill2P2_650_US.json @@ -67,7 +67,8 @@ }, "13": { "tag": 13, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, @@ -76,14 +77,6 @@ "margin_left": 7.0 }, - //home - //"32": { - // "tag": 32, - - // "margin_left": 7.0 - //}, - - //Number lock "34": { "tag": 34, "margin_left": 7 @@ -94,14 +87,9 @@ }, "36": { "tag": 36, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, - // - - //"37": { - // "tag": 37, - // "margin_left": 7, - // "line_break": true - //}, @@ -112,31 +100,20 @@ "margin_left": 7, "width": 30 }, - //number 7 "55": { "tag": 55, "margin_left": 62 }, - //number 8 "56": { "tag": 56, "margin_left": 7 }, - - //number 9 "57": { "tag": 57, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, - ////+ - //"58": { - // "margin_left": 7, - // "line_break": true - - - //}, - "72": { "tag": 72, @@ -149,7 +126,6 @@ "73": { "margin_left": 7 }, - //number 6 "75": { "line_break": true }, @@ -161,13 +137,10 @@ "height": 30.0, "font_size": 12.0 }, - //right shift "88": { "tag": 88, "width": 57 }, - - //"↑" "89": { "tag": 89, "margin_left": 7 @@ -178,11 +151,6 @@ "92": { "line_break": true }, - ////Number enter - //"93": { - // "line_break": true - //}, - //LeftControl "94": { "tag": 94, "width": 41 @@ -212,7 +180,6 @@ "margin_left": 7, "width": 30 }, - //Rith control "101": { "tag": 101, "margin_left": 7, diff --git a/kb_layouts/bloody_full.json b/kb_layouts/bloody_full.json index e8b31cb..ab5e4c3 100644 --- a/kb_layouts/bloody_full.json +++ b/kb_layouts/bloody_full.json @@ -2,18 +2,15 @@ "keys_to_remove": [71], "key_modifications": { - //PSCR "14": { "margin_left": 169.0 }, "50": { "width": 30.0 }, - //DEL "52": { "margin_left": 69.0 }, - //ENTER "72": { "tag": 72, "margin_left": 7.0, @@ -22,7 +19,6 @@ "height": 30.0, "font_size": 12.0 }, - //FN "99": { "visualName": "FN", "tag": 107 diff --git a/kb_layouts/clevo_3_zone.json b/kb_layouts/clevo_3_zone.json index 759221d..af80dfa 100644 --- a/kb_layouts/clevo_3_zone.json +++ b/kb_layouts/clevo_3_zone.json @@ -59,7 +59,8 @@ }, "13": { "tag": 13, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, @@ -68,14 +69,6 @@ "margin_left": 7.0 }, - //home - //"32": { - // "tag": 32, - - // "margin_left": 7.0 - //}, - - //Number lock "34": { "tag": 34, "margin_left": 7 @@ -103,38 +96,28 @@ "margin_left": 7, "width": 30 }, - //number 7 "55": { "tag": 55, "margin_left": 62 }, - //number 8 "56": { "tag": 56, "margin_left": 7 }, - - //number 9 "57": { "tag": 57, "margin_left": 7 }, - //+ "58": { "margin_left": 7, "line_break": true - - }, - - //key ~ "71": { "visualName": "~", "tag": 71 }, - //ENTER "72": { "tag": 72, "margin_left": 7.0, @@ -146,11 +129,9 @@ "73": { "margin_left": 7 }, - //number 6 "75": { "line_break": true }, - //left shift "76": { "tag": 76, "margin_left": 0.0, @@ -159,18 +140,13 @@ "height": 30.0, "font_size": 12.0 }, - // \ "77": { "tag": 77 }, - - //right shift "88": { "tag": 88, "width": 57 }, - - //"↑" "89": { "tag": 89, "margin_left": 7 @@ -178,11 +154,9 @@ "90": { "margin_left": 7.0 }, - //Number enter "93": { "line_break": true }, - //LeftControl "94": { "tag": 94, "width": 41 @@ -212,7 +186,6 @@ "margin_left": 7, "width": 30 }, - //Rith control "101": { "tag": 101, "margin_left": 7, diff --git a/kb_layouts/generic_60_percent.json b/kb_layouts/generic_60_percent.json index f1e4c39..35dd505 100644 --- a/kb_layouts/generic_60_percent.json +++ b/kb_layouts/generic_60_percent.json @@ -23,6 +23,7 @@ 35, 36, 37, + 51, 52, 53, 54, @@ -48,6 +49,9 @@ "30": { "line_break": true }, + "50": { + "line_break": true + }, "51": { "line_break": true }, @@ -60,5 +64,8 @@ "101": { "line_break": true } - } -} \ No newline at end of file + }, + "included_features": [ + "generic_60_percent_right_features.json" + ] +} diff --git a/kb_layouts/generic_laptop.json b/kb_layouts/generic_laptop.json index 85e682d..be4aecf 100644 --- a/kb_layouts/generic_laptop.json +++ b/kb_layouts/generic_laptop.json @@ -95,7 +95,8 @@ "15": { "visualName": "DEL", "tag": 52, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, "30": { "tag": 30, @@ -103,7 +104,8 @@ }, "50": { "tag": 50, - "width": 30 + "width": 30, + "line_break": true }, "72": { "tag": 72, @@ -111,19 +113,21 @@ "margin_top": 0.0, "width": 74.0, "height": 30.0, - "font_size": 12.0 + "font_size": 12.0, + "line_break": true }, "76": { "tag": 76, "margin_left": 0.0, "margin_top": 0.0, - "width": 78.0, + "width": 74.0, "height": 30.0, "font_size": 12.0 }, "88": { "tag": 88, - "width": 93 + "width": 93, + "line_break": true }, "94": { "tag": 94, @@ -175,7 +179,8 @@ }, "104": { "tag": 104, - "width": 24.5 + "width": 24.5, + "line_break": true } }, "included_features": [ diff --git a/kb_layouts/generic_laptop_numpad.json b/kb_layouts/generic_laptop_numpad.json index 0d38e9c..0f7042f 100644 --- a/kb_layouts/generic_laptop_numpad.json +++ b/kb_layouts/generic_laptop_numpad.json @@ -78,7 +78,8 @@ "15": { "visualName": "DEL", "tag": 52, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, "34": { "margin_left": 7.0 diff --git a/kb_layouts/keychron_q1_knob_ansi.json b/kb_layouts/keychron_q1_knob_ansi.json index 9127c12..3fb8f5b 100644 --- a/kb_layouts/keychron_q1_knob_ansi.json +++ b/kb_layouts/keychron_q1_knob_ansi.json @@ -181,7 +181,8 @@ "width": 30.0, "height": 30.0, "font_size": 12.0, - "enabled": true + "enabled": true, + "line_break": true }, "17": { "visualName": "~", @@ -345,7 +346,8 @@ "width": 30.0, "height": 30.0, "font_size": 9.0, - "enabled": true + "enabled": true, + "line_break": true }, "38": { "visualName": "TAB", @@ -509,7 +511,8 @@ "width": 30.0, "height": 30.0, "font_size": 9.0, - "enabled": true + "enabled": true, + "line_break": true }, "59": { "visualName": "CAPS\r\nLOCK", @@ -666,7 +669,8 @@ "width": 30.0, "height": 30.0, "font_size": 9.0, - "enabled": true + "enabled": true, + "line_break": true }, "76": { "visualName": "SHIFT", @@ -808,7 +812,8 @@ "width": 30.0, "height": 30.0, "font_size": 12.0, - "enabled": true + "enabled": true, + "line_break": true }, "101": { "visualName": "CTRL", @@ -917,7 +922,8 @@ "width": 30.0, "height": 30.0, "font_size": 12.0, - "enabled": true + "enabled": true, + "line_break": true } } } diff --git a/kb_layouts/msi_gp66_us.json b/kb_layouts/msi_gp66_us.json index c3d156c..91093d8 100644 --- a/kb_layouts/msi_gp66_us.json +++ b/kb_layouts/msi_gp66_us.json @@ -97,7 +97,8 @@ "13": { "tag": 13, "margin_left": 7.0, - "height": 15 + "height": 15, + "line_break": true }, "17": { @@ -109,7 +110,8 @@ "30": { "tag": 30, "margin_left": 7.0, - "width": 80 + "width": 80, + "line_break": true }, "38": { @@ -122,29 +124,27 @@ "50": { "visualName": "]", - "width": 30 + "width": 30, + "line_break": true }, "59": { "width": 48.0 }, - - //key ~ "71": { "visualName": "~", "tag": 71 }, - //ENTER "72": { "tag": 72, "margin_left": 7.0, "margin_top": 0, "width": 85.0, "height": 30.0, - "font_size": 12.0 + "font_size": 12.0, + "line_break": true }, - //left shift "76": { "tag": 76, "margin_left": 0.0, @@ -153,26 +153,21 @@ "height": 30.0, "font_size": 12.0 }, - // \ "77": { "tag": 77 }, - - //right shift "88": { "tag": 88, "width": 65 }, - - //"↑" "89": { "tag": 89, - "margin_left": 7 + "margin_left": 7, + "line_break": true }, "90": { "margin_left": 7.0 }, - //LeftControl "94": { "tag": 94, "width": 68 @@ -196,7 +191,6 @@ "margin_left": 7, "width": 30 }, - //Rith control "101": { "tag": 101, "margin_left": 80, diff --git a/kb_layouts/razer_blade.json b/kb_layouts/razer_blade.json index 43ffea7..bd99ff1 100644 --- a/kb_layouts/razer_blade.json +++ b/kb_layouts/razer_blade.json @@ -94,7 +94,8 @@ "15": { "visualName": "DEL", "tag": 52, - "margin_left": 7.0 + "margin_left": 7.0, + "line_break": true }, "30": { "tag": 30, @@ -102,7 +103,8 @@ }, "50": { "tag": 50, - "width": 30 + "width": 30, + "line_break": true }, "72": { "tag": 72, @@ -110,7 +112,8 @@ "margin_top": 0.0, "width": 74.0, "height": 30.0, - "font_size": 12.0 + "font_size": 12.0, + "line_break": true }, "76": { "tag": 76, @@ -122,7 +125,8 @@ }, "88": { "tag": 88, - "width": 93 + "width": 93, + "line_break": true }, "94": { "tag": 94, @@ -174,7 +178,8 @@ }, "104": { "tag": 104, - "width": 24.5 + "width": 24.5, + "line_break": true } }, "included_features": [ diff --git a/kb_layouts/roccat_vulcan_tkl.json b/kb_layouts/roccat_vulcan_tkl.json index b55599f..b7d1a57 100644 --- a/kb_layouts/roccat_vulcan_tkl.json +++ b/kb_layouts/roccat_vulcan_tkl.json @@ -27,7 +27,8 @@ "margin_left": 16, "margin_top": 8, "width": 26, - "height": 14 + "height": 14, + "line_break": true }, "33": { "tag": 33,