From 34bc896cf90e57e7e4fe12d07711ec51963ad959 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 10 Feb 2023 20:12:35 -0800 Subject: [PATCH] [Keyboard] Fix merge error with fave84 board (#19808) --- keyboards/linworks/fave84h/info.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json index e401639add..95df89fd4e 100644 --- a/keyboards/linworks/fave84h/info.json +++ b/keyboards/linworks/fave84h/info.json @@ -2,6 +2,7 @@ "manufacturer": "Lx3", "keyboard_name": "FAve 84H", "maintainer": "ToastyStoemp", + "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { @@ -18,7 +19,6 @@ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"], "rows": ["B1", "B2", "B3", "D3", "D1", "D0"] }, - "processor": "atmega32u4", "rgb_matrix": { "driver": "WS2812", "layout": [ @@ -156,8 +156,6 @@ "pid": "0x0004", "vid": "0x4C58" }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", "community_layouts": [ "tkl_ansi_tsangan" ], @@ -180,7 +178,7 @@ { "matrix": [0, 14], "x": 15.25, "y": 0 }, { "matrix": [0, 15], "x": 16.25, "y": 0 }, { "matrix": [0, 16], "x": 17.25, "y": 0 }, - + { "matrix": [1, 0], "x": 0, "y": 1.25 }, { "matrix": [1, 1], "x": 1, "y": 1.25 }, { "matrix": [1, 2], "x": 2, "y": 1.25 }, @@ -276,7 +274,7 @@ { "matrix": [0, 14], "x": 15.25, "y": 0 }, { "matrix": [0, 15], "x": 16.25, "y": 0 }, { "matrix": [0, 16], "x": 17.25, "y": 0 }, - + { "matrix": [1, 0], "x": 0, "y": 1.25 }, { "matrix": [1, 1], "x": 1, "y": 1.25 }, { "matrix": [1, 2], "x": 2, "y": 1.25 }, @@ -340,7 +338,7 @@ { "matrix": [4, 10], "x": 11.25, "y": 4.25 }, { "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25 }, { "matrix": [4, 15], "x": 16.25, "y": 4.25 }, - + { "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 }, { "matrix": [5, 1], "x": 1.5, "y": 5.25 }, { "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 }, @@ -354,4 +352,4 @@ ] } } -} \ No newline at end of file +}