diff options
Diffstat (limited to 'keyboards/handwired/orbweaver')
| -rw-r--r-- | keyboards/handwired/orbweaver/keyboard.json | 25 | ||||
| -rw-r--r-- | keyboards/handwired/orbweaver/orbweaver.c | 53 | 
2 files changed, 34 insertions, 44 deletions
| diff --git a/keyboards/handwired/orbweaver/keyboard.json b/keyboards/handwired/orbweaver/keyboard.json index 73baa9a21d..0061c79ba2 100644 --- a/keyboards/handwired/orbweaver/keyboard.json +++ b/keyboards/handwired/orbweaver/keyboard.json @@ -12,8 +12,29 @@          "rgb_matrix": true      },      "rgb_matrix": { -        "center_point": [40, 30], -        "driver": "is31fl3731" +        "driver": "is31fl3731", +        "layout": [ +            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, +            {"x": 56, "y": 0, "flags": 4}, +            {"matrix": [0, 1], "x": 112, "y": 0, "flags": 4}, +            {"matrix": [0, 2], "x": 168, "y": 0, "flags": 4}, +            {"matrix": [0, 3], "x": 224, "y": 0, "flags": 4}, +            {"matrix": [0, 4], "x": 0, "y": 20, "flags": 4}, +            {"matrix": [1, 0], "x": 56, "y": 20, "flags": 4}, +            {"matrix": [1, 1], "x": 112, "y": 20, "flags": 4}, +            {"matrix": [1, 2], "x": 168, "y": 20, "flags": 4}, +            {"matrix": [1, 3], "x": 224, "y": 20, "flags": 4}, +            {"matrix": [1, 4], "x": 0, "y": 40, "flags": 4}, +            {"matrix": [2, 0], "x": 56, "y": 40, "flags": 4}, +            {"matrix": [2, 1], "x": 112, "y": 40, "flags": 4}, +            {"matrix": [2, 2], "x": 168, "y": 40, "flags": 4}, +            {"matrix": [2, 3], "x": 224, "y": 40, "flags": 4}, +            {"matrix": [2, 4], "x": 0, "y": 60, "flags": 4}, +            {"matrix": [3, 0], "x": 56, "y": 60, "flags": 4}, +            {"matrix": [3, 1], "x": 112, "y": 60, "flags": 4}, +            {"matrix": [3, 2], "x": 168, "y": 60, "flags": 4}, +            {"matrix": [3, 4], "x": 224, "y": 60, "flags": 4} +        ]      },      "matrix_pins": {          "rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"], diff --git a/keyboards/handwired/orbweaver/orbweaver.c b/keyboards/handwired/orbweaver/orbweaver.c index f89d1ca363..8c23818eea 100644 --- a/keyboards/handwired/orbweaver/orbweaver.c +++ b/keyboards/handwired/orbweaver/orbweaver.c @@ -15,10 +15,10 @@  //  // SPDX-License-Identifier: GPL-2.0-or-later -// This IS31FL3731 configuration is for a Razer Orbweaver Chroma.   -// It was reverse-engineered by testing all possible Cx_y combinations (144 total),  +// This IS31FL3731 configuration is for a Razer Orbweaver Chroma. +// It was reverse-engineered by testing all possible Cx_y combinations (144 total),  // and determining which ones addressed individual diodes (60 total). These were then -// placed in order R-G-B, sweeping left to right, and then top to bottom.   +// placed in order R-G-B, sweeping left to right, and then top to bottom.  #include "rgb_matrix.h" @@ -30,55 +30,24 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {   *   |  |      |      B location   *   |  |      |      | */      {0, C9_1,  C8_1,  C7_1}, //top left key. -    {0, C9_2,  C8_2,  C7_2},	 +    {0, C9_2,  C8_2,  C7_2},      {0, C9_3,  C8_3,  C7_3},      {0, C9_4,  C8_4,  C7_4}, -    {0, C9_5,  C8_5,  C7_5}, //top right key.  +    {0, C9_5,  C8_5,  C7_5}, //top right key.      {0, C9_6,  C8_6,  C7_6}, -    {0, C9_7,  C8_7,  C6_6},       +    {0, C9_7,  C8_7,  C6_6},      {0, C9_8,  C7_7,  C6_7}, -    {0, C1_8,  C2_8,  C3_8},   +    {0, C1_8,  C2_8,  C3_8},      {0, C1_7,  C2_7,  C3_7},      {0, C1_6,  C2_6,  C3_6}, -    {0, C1_5,  C2_5,  C3_5},   -    {0, C1_4,  C2_4,  C3_4},   -    {0, C1_3,  C2_3,  C3_3},   +    {0, C1_5,  C2_5,  C3_5}, +    {0, C1_4,  C2_4,  C3_4}, +    {0, C1_3,  C2_3,  C3_3},      {0, C1_2,  C2_2,  C4_3},      {0, C1_1,  C3_2,  C4_2}, //lower left key -    {0, C9_9,  C8_9,  C7_9},   +    {0, C9_9,  C8_9,  C7_9},      {0, C9_10,  C8_10,  C7_10},      {0, C9_11,  C8_11,  C7_11},      {0, C9_12,  C8_12,  C7_12} //lower right key  }; - -led_config_t g_led_config = { -     // Matrix location to LED index -     { -         { 0, 2, 3, 4, 5 }, -         { 6, 7, 8, 9, 10 }, -         { 11, 12, 13, 14, 15 }, -         { 16, 17, 18, 19, 19 }, -         { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, -         { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED } -     }, - -     // LED index to physical location -     { -         {0,0}, {20,0}, {40,0}, {60,0}, {80,0}, -         {0,20}, {20,20}, {40,20}, {60,20}, {80,20}, -         {0,40}, {20,40}, {40,40}, {60,40}, {80,40}, -         {0,60}, {20,60}, {40,60}, {60,60}, {80,60} -     }, - -     // LED index to flags -     { -         4, 4, 4, 4, 4, -         4, 4, 4, 4, 4, -         4, 4, 4, 4, 4, -         4, 4, 4, 4, 4 -     } - }; -  -  - | 
