diff options
Diffstat (limited to 'keyboards/tzarc/djinn')
-rw-r--r-- | keyboards/tzarc/djinn/config.h | 4 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/djinn.c | 21 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/djinn.h | 3 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/djinn_split_sync.c | 5 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/graphics/theme_djinn_default.c | 1 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/info.json | 159 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/keymaps/via/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/rev1/info.json | 168 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/rev1/rev1.c | 3 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/rev1/rev1.h | 3 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/rev2/info.json | 172 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/rev2/rev2.c | 3 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/rev2/rev2.h | 3 | ||||
-rw-r--r-- | keyboards/tzarc/djinn/rules.mk | 3 |
15 files changed, 267 insertions, 285 deletions
diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h index e8b2abc1f6..af98f887db 100644 --- a/keyboards/tzarc/djinn/config.h +++ b/keyboards/tzarc/djinn/config.h @@ -1,4 +1,4 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) +// Copyright 2018-2023 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -16,6 +16,7 @@ #define SPLIT_LED_STATE_ENABLE #define SPLIT_MODS_ENABLE #define SPLIT_WPM_ENABLE +#define SPLIT_ACTIVITY_ENABLE // SPI Configuration #define SPI_DRIVER SPID3 @@ -40,7 +41,6 @@ #define BACKLIGHT_PAL_MODE 1 // RGB configuration -#define RGB_DI_PIN B2 #define WS2812_EXTERNAL_PULLUP #define WS2812_PWM_DRIVER PWMD20 #define WS2812_PWM_CHANNEL 1 diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c index 93b1ee775e..17e5833ee9 100644 --- a/keyboards/tzarc/djinn/djinn.c +++ b/keyboards/tzarc/djinn/djinn.c @@ -1,4 +1,4 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) +// Copyright 2018-2023 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later #include <string.h> #include "quantum.h" @@ -74,7 +74,6 @@ void keyboard_post_init_kb(void) { qp_init(lcd, QP_ROTATION_0); // Turn on the LCD and clear the display - kb_state.lcd_power = 1; qp_power(lcd, true); qp_rect(lcd, 0, 0, 239, 319, HSV_BLACK, true); @@ -187,18 +186,14 @@ void housekeeping_task_kb(void) { } // Turn on/off the LCD - static bool lcd_on = false; - if (lcd_on != (bool)kb_state.lcd_power) { - lcd_on = (bool)kb_state.lcd_power; - qp_power(lcd, lcd_on); - } + bool peripherals_on = last_input_activity_elapsed() < LCD_ACTIVITY_TIMEOUT; // Enable/disable RGB - if (lcd_on) { + if (peripherals_on) { // Turn on RGB writePinHigh(RGB_POWER_ENABLE_PIN); // Modify the RGB state if different to the LCD state - if (rgb_matrix_is_enabled() != lcd_on) { + if (rgb_matrix_is_enabled() != peripherals_on) { // Wait for a small amount of time to allow the RGB capacitors to charge, before enabling RGB output wait_ms(10); // Enable RGB @@ -208,21 +203,21 @@ void housekeeping_task_kb(void) { // Turn off RGB writePinLow(RGB_POWER_ENABLE_PIN); // Disable the PWM output for the RGB - if (rgb_matrix_is_enabled() != lcd_on) { + if (rgb_matrix_is_enabled() != peripherals_on) { rgb_matrix_disable_noeeprom(); } } // Match the backlight to the LCD state - if (is_keyboard_master() && is_backlight_enabled() != lcd_on) { - if (lcd_on) + if (is_keyboard_master() && is_backlight_enabled() != peripherals_on) { + if (peripherals_on) backlight_enable(); else backlight_disable(); } // Draw the UI - if (kb_state.lcd_power) { + if (peripherals_on) { draw_ui_user(false); } diff --git a/keyboards/tzarc/djinn/djinn.h b/keyboards/tzarc/djinn/djinn.h index ff6b555e8e..70aa34ff08 100644 --- a/keyboards/tzarc/djinn/djinn.h +++ b/keyboards/tzarc/djinn/djinn.h @@ -1,4 +1,4 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) +// Copyright 2018-2023 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include "quantum.h" @@ -20,7 +20,6 @@ const char* usbpd_str(usbpd_allowance_t allowance); #pragma pack(push) #pragma pack(1) typedef struct kb_runtime_config { - unsigned lcd_power : 1; usbpd_allowance_t current_setting : 2; } kb_runtime_config; #pragma pack(pop) diff --git a/keyboards/tzarc/djinn/djinn_split_sync.c b/keyboards/tzarc/djinn/djinn_split_sync.c index 3c7a58d155..8b10e88b4b 100644 --- a/keyboards/tzarc/djinn/djinn_split_sync.c +++ b/keyboards/tzarc/djinn/djinn_split_sync.c @@ -1,4 +1,4 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) +// Copyright 2018-2023 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later #include <string.h> #include "quantum.h" @@ -13,9 +13,6 @@ void kb_state_update(void) { if (is_keyboard_master()) { // Modify allowed current limits usbpd_update(); - - // Turn off the LCD if there's been no matrix activity - kb_state.lcd_power = (last_input_activity_elapsed() < LCD_ACTIVITY_TIMEOUT) ? 1 : 0; } } diff --git a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c index c9863f2285..f321308ac5 100644 --- a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c +++ b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c @@ -1,6 +1,5 @@ // Copyright 2018-2022 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H #include <hal.h> #include <string.h> #include <ctype.h> diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json index 19f5e52060..2a50e5762d 100644 --- a/keyboards/tzarc/djinn/info.json +++ b/keyboards/tzarc/djinn/info.json @@ -33,6 +33,13 @@ "pin": "A7", "levels": 4 }, + "ws2812": { + "pin": "B2", + "driver": "pwm" + }, + "rgb_matrix": { + "driver": "WS2812" + }, "split": { "enabled": true, "main": "pin", @@ -52,96 +59,96 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0.88 }, - { "matrix": [0, 1], "label": "1", "x": 1, "y": 0.63 }, - { "matrix": [0, 2], "label": "2", "x": 2, "y": 0.38 }, - { "matrix": [0, 3], "label": "3", "x": 3, "y": 0 }, - { "matrix": [0, 4], "label": "4", "x": 4, "y": 0.13 }, - { "matrix": [0, 5], "label": "5", "x": 5, "y": 0.5 }, - { "matrix": [0, 6], "label": "~", "x": 6, "y": 1 }, + {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0.88}, + {"matrix": [0, 1], "label": "1", "x": 1, "y": 0.63}, + {"matrix": [0, 2], "label": "2", "x": 2, "y": 0.38}, + {"matrix": [0, 3], "label": "3", "x": 3, "y": 0}, + {"matrix": [0, 4], "label": "4", "x": 4, "y": 0.13}, + {"matrix": [0, 5], "label": "5", "x": 5, "y": 0.5}, + {"matrix": [0, 6], "label": "~", "x": 6, "y": 1}, - { "matrix": [6, 6], "label": "Del", "x": 12, "y": 1 }, - { "matrix": [6, 5], "label": "6", "x": 13, "y": 0.5 }, - { "matrix": [6, 4], "label": "7", "x": 14, "y": 0.13 }, - { "matrix": [6, 3], "label": "8", "x": 15, "y": 0 }, - { "matrix": [6, 2], "label": "9", "x": 16, "y": 0.38 }, - { "matrix": [6, 1], "label": "0", "x": 17, "y": 0.63 }, - { "matrix": [6, 0], "label": "Bksp", "x": 18, "y": 0.88 }, + {"matrix": [6, 6], "label": "Del", "x": 12, "y": 1}, + {"matrix": [6, 5], "label": "6", "x": 13, "y": 0.5}, + {"matrix": [6, 4], "label": "7", "x": 14, "y": 0.13}, + {"matrix": [6, 3], "label": "8", "x": 15, "y": 0}, + {"matrix": [6, 2], "label": "9", "x": 16, "y": 0.38}, + {"matrix": [6, 1], "label": "0", "x": 17, "y": 0.63}, + {"matrix": [6, 0], "label": "Bksp", "x": 18, "y": 0.88}, - { "matrix": [1, 0], "label": "Tab", "x": 0, "y": 1.88 }, - { "matrix": [1, 1], "label": "Q", "x": 1, "y": 1.63 }, - { "matrix": [1, 2], "label": "W", "x": 2, "y": 1.38 }, - { "matrix": [1, 3], "label": "E", "x": 3, "y": 1 }, - { "matrix": [1, 4], "label": "R", "x": 4, "y": 1.13 }, - { "matrix": [1, 5], "label": "T", "x": 5, "y": 1.5 }, - { "matrix": [1, 6], "label": "[", "x": 6, "y": 2 }, + {"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1.88}, + {"matrix": [1, 1], "label": "Q", "x": 1, "y": 1.63}, + {"matrix": [1, 2], "label": "W", "x": 2, "y": 1.38}, + {"matrix": [1, 3], "label": "E", "x": 3, "y": 1}, + {"matrix": [1, 4], "label": "R", "x": 4, "y": 1.13}, + {"matrix": [1, 5], "label": "T", "x": 5, "y": 1.5}, + {"matrix": [1, 6], "label": "[", "x": 6, "y": 2}, - { "matrix": [7, 6], "label": "]", "x": 12, "y": 2 }, - { "matrix": [7, 5], "label": "Y", "x": 13, "y": 1.5 }, - { "matrix": [7, 4], "label": "U", "x": 14, "y": 1.13 }, - { "matrix": [7, 3], "label": "I", "x": 15, "y": 1 }, - { "matrix": [7, 2], "label": "O", "x": 16, "y": 1.38 }, - { "matrix": [7, 1], "label": "P", "x": 17, "y": 1.63 }, - { "matrix": [7, 0], "label": "\\", "x": 18, "y": 1.88 }, + {"matrix": [7, 6], "label": "]", "x": 12, "y": 2}, + {"matrix": [7, 5], "label": "Y", "x": 13, "y": 1.5}, + {"matrix": [7, 4], "label": "U", "x": 14, "y": 1.13}, + {"matrix": [7, 3], "label": "I", "x": 15, "y": 1}, + {"matrix": [7, 2], "label": "O", "x": 16, "y": 1.38}, + {"matrix": [7, 1], "label": "P", "x": 17, "y": 1.63}, + {"matrix": [7, 0], "label": "\\", "x": 18, "y": 1.88}, - { "matrix": [2, 0], "label": "Ctrl", "x": 0, "y": 2.88 }, - { "matrix": [2, 1], "label": "A", "x": 1, "y": 2.63 }, - { "matrix": [2, 2], "label": "S", "x": 2, "y": 2.38 }, - { "matrix": [2, 3], "label": "D", "x": 3, "y": 2 }, - { "matrix": [2, 4], "label": "F", "x": 4, "y": 2.13 }, - { "matrix": [2, 5], "label": "G", "x": 5, "y": 2.5 }, - { "matrix": [2, 6], "label": "Home", "x": 6, "y": 3 }, + {"matrix": [2, 0], "label": "Ctrl", "x": 0, "y": 2.88}, + {"matrix": [2, 1], "label": "A", "x": 1, "y": 2.63}, + {"matrix": [2, 2], "label": "S", "x": 2, "y": 2.38}, + {"matrix": [2, 3], "label": "D", "x": 3, "y": 2}, + {"matrix": [2, 4], "label": "F", "x": 4, "y": 2.13}, + {"matrix": [2, 5], "label": "G", "x": 5, "y": 2.5}, + {"matrix": [2, 6], "label": "Home", "x": 6, "y": 3}, - { "matrix": [8, 6], "label": "PgUp", "x": 12, "y": 3 }, - { "matrix": [8, 5], "label": "H", "x": 13, "y": 2.5 }, - { "matrix": [8, 4], "label": "J", "x": 14, "y": 2.13 }, - { "matrix": [8, 3], "label": "K", "x": 15, "y": 2 }, - { "matrix": [8, 2], "label": "L", "x": 16, "y": 2.38 }, - { "matrix": [8, 1], "label": ";", "x": 17, "y": 2.63 }, - { "matrix": [8, 0], "label": "\"", "x": 18, "y": 2.88 }, + {"matrix": [8, 6], "label": "PgUp", "x": 12, "y": 3}, + {"matrix": [8, 5], "label": "H", "x": 13, "y": 2.5}, + {"matrix": [8, 4], "label": "J", "x": 14, "y": 2.13}, + {"matrix": [8, 3], "label": "K", "x": 15, "y": 2}, + {"matrix": [8, 2], "label": "L", "x": 16, "y": 2.38}, + {"matrix": [8, 1], "label": ";", "x": 17, "y": 2.63}, + {"matrix": [8, 0], "label": "\"", "x": 18, "y": 2.88}, - { "matrix": [3, 0], "label": "Shift", "x": 0, "y": 3.88 }, - { "matrix": [3, 1], "label": "Z", "x": 1, "y": 3.63 }, - { "matrix": [3, 2], "label": "X", "x": 2, "y": 3.38 }, - { "matrix": [3, 3], "label": "C", "x": 3, "y": 3 }, - { "matrix": [3, 4], "label": "V", "x": 4, "y": 3.13 }, - { "matrix": [3, 5], "label": "B", "x": 5, "y": 3.5 }, - { "matrix": [3, 6], "label": "End", "x": 6, "y": 4 }, + {"matrix": [3, 0], "label": "Shift", "x": 0, "y": 3.88}, + {"matrix": [3, 1], "label": "Z", "x": 1, "y": 3.63}, + {"matrix": [3, 2], "label": "X", "x": 2, "y": 3.38}, + {"matrix": [3, 3], "label": "C", "x": 3, "y": 3}, + {"matrix": [3, 4], "label": "V", "x": 4, "y": 3.13}, + {"matrix": [3, 5], "label": "B", "x": 5, "y": 3.5}, + {"matrix": [3, 6], "label": "End", "x": 6, "y": 4}, - { "matrix": [9, 6], "label": "PgDn", "x": 12, "y": 4 }, - { "matrix": [9, 5], "label": "N", "x": 13, "y": 3.5 }, - { "matrix": [9, 4], "label": "M", "x": 14, "y": 3.13 }, - { "matrix": [9, 3], "label": ",", "x": 15, "y": 3 }, - { "matrix": [9, 2], "label": ".", "x": 16, "y": 3.38 }, - { "matrix": [9, 1], "label": "/", "x": 17, "y": 3.63 }, - { "matrix": [9, 0], "label": "Shift", "x": 18, "y": 3.88 }, + {"matrix": [9, 6], "label": "PgDn", "x": 12, "y": 4}, + {"matrix": [9, 5], "label": "N", "x": 13, "y": 3.5}, + {"matrix": [9, 4], "label": "M", "x": 14, "y": 3.13}, + {"matrix": [9, 3], "label": ",", "x": 15, "y": 3}, + {"matrix": [9, 2], "label": ".", "x": 16, "y": 3.38}, + {"matrix": [9, 1], "label": "/", "x": 17, "y": 3.63}, + {"matrix": [9, 0], "label": "Shift", "x": 18, "y": 3.88}, - { "matrix": [4, 3], "label": "GUI", "x": 2.5, "y": 4.9 }, - { "matrix": [4, 4], "label": "Lower", "x": 3.5, "y": 4.9 }, - { "matrix": [4, 5], "label": "Space", "x": 4.5, "y": 5.06 }, - { "matrix": [4, 6], "label": " ", "x": 5.5, "y": 5.4 }, + {"matrix": [4, 3], "label": "GUI", "x": 2.5, "y": 4.9}, + {"matrix": [4, 4], "label": "Lower", "x": 3.5, "y": 4.9}, + {"matrix": [4, 5], "label": "Space", "x": 4.5, "y": 5.06}, + {"matrix": [4, 6], "label": " ", "x": 5.5, "y": 5.4}, - { "matrix": [10, 6], "label": " ", "x": 12.5, "y": 5.4 }, - { "matrix": [10, 5], "label": "Space", "x": 13.5, "y": 5.06 }, - { "matrix": [10, 4], "label": "Raise", "x": 14.5, "y": 4.88 }, - { "matrix": [10, 3], "label": "Alt", "x": 15.5, "y": 4.9 }, + {"matrix": [10, 6], "label": " ", "x": 12.5, "y": 5.4}, + {"matrix": [10, 5], "label": "Space", "x": 13.5, "y": 5.06}, + {"matrix": [10, 4], "label": "Raise", "x": 14.5, "y": 4.88}, + {"matrix": [10, 3], "label": "Alt", "x": 15.5, "y": 4.9}, - { "matrix": [5, 6], "label": "RGB", "x": 7.25, "y": 4.9 }, - { "matrix": [11, 6], "label": "RGB", "x": 10.75, "y": 4.9 }, + {"matrix": [5, 6], "label": "RGB", "x": 7.25, "y": 4.9}, + {"matrix": [11, 6], "label": "RGB", "x": 10.75, "y": 4.9}, - { "matrix": [5, 1], "label": "Up", "x": 4.5, "y": 7 }, - { "matrix": [11, 1], "label": "Up", "x": 13.5, "y": 7 }, + {"matrix": [5, 1], "label": "Up", "x": 4.5, "y": 7}, + {"matrix": [11, 1], "label": "Up", "x": 13.5, "y": 7}, - { "matrix": [5, 2], "label": "Left", "x": 3.5, "y": 8 }, - { "matrix": [5, 5], "label": "Press", "x": 4.5, "y": 8 }, - { "matrix": [5, 4], "label": "Right", "x": 5.5, "y": 8 }, + {"matrix": [5, 2], "label": "Left", "x": 3.5, "y": 8}, + {"matrix": [5, 5], "label": "Press", "x": 4.5, "y": 8}, + {"matrix": [5, 4], "label": "Right", "x": 5.5, "y": 8}, - { "matrix": [11, 2], "label": "Left", "x": 12.5, "y": 8 }, - { "matrix": [11, 5], "label": "Press", "x": 13.5, "y": 8 }, - { "matrix": [11, 4], "label": "Right", "x": 14.5, "y": 8 }, + {"matrix": [11, 2], "label": "Left", "x": 12.5, "y": 8}, + {"matrix": [11, 5], "label": "Press", "x": 13.5, "y": 8}, + {"matrix": [11, 4], "label": "Right", "x": 14.5, "y": 8}, - { "matrix": [5, 3], "label": "Down", "x": 4.5, "y": 9 }, - { "matrix": [11, 3], "label": "Down", "x": 13.5, "y": 9 } + {"matrix": [5, 3], "label": "Down", "x": 4.5, "y": 9}, + {"matrix": [11, 3], "label": "Down", "x": 13.5, "y": 9} ] } }, diff --git a/keyboards/tzarc/djinn/keymaps/default/keymap.c b/keyboards/tzarc/djinn/keymaps/default/keymap.c index 65b494cf32..626233946c 100644 --- a/keyboards/tzarc/djinn/keymaps/default/keymap.c +++ b/keyboards/tzarc/djinn/keymaps/default/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Encoder map // clang-format off -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LOWER] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, diff --git a/keyboards/tzarc/djinn/keymaps/via/keymap.c b/keyboards/tzarc/djinn/keymaps/via/keymap.c index 65b494cf32..626233946c 100644 --- a/keyboards/tzarc/djinn/keymaps/via/keymap.c +++ b/keyboards/tzarc/djinn/keymaps/via/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Encoder map // clang-format off -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LOWER] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, diff --git a/keyboards/tzarc/djinn/rev1/info.json b/keyboards/tzarc/djinn/rev1/info.json index 65b9eb2eab..8a77a0fdc1 100644 --- a/keyboards/tzarc/djinn/rev1/info.json +++ b/keyboards/tzarc/djinn/rev1/info.json @@ -13,90 +13,90 @@ }, "rgb_matrix": { "layout": [ - { "flags": 2, "x": 110, "y": 30 }, - { "flags": 2, "x": 110, "y": 80 }, - { "flags": 2, "x": 110, "y": 130 }, - { "flags": 2, "x": 95, "y": 180 }, - { "flags": 2, "x": 75, "y": 195 }, - { "flags": 2, "x": 60, "y": 210 }, - { "flags": 2, "x": 45, "y": 190 }, - { "flags": 2, "x": 35, "y": 175 }, - { "flags": 2, "x": 20, "y": 160 }, - { "flags": 2, "x": 5, "y": 160 }, - { "flags": 4, "matrix": [4, 3], "x": 78, "y": 150 }, - { "flags": 4, "matrix": [4, 4], "x": 104, "y": 150 }, - { "flags": 4, "matrix": [4, 5], "x": 130, "y": 150 }, - { "flags": 4, "matrix": [4, 6], "x": 156, "y": 150 }, - { "flags": 4, "matrix": [3, 6], "x": 156, "y": 120 }, - { "flags": 4, "matrix": [3, 5], "x": 130, "y": 120 }, - { "flags": 4, "matrix": [3, 4], "x": 104, "y": 120 }, - { "flags": 4, "matrix": [3, 3], "x": 78, "y": 120 }, - { "flags": 4, "matrix": [3, 2], "x": 52, "y": 120 }, - { "flags": 4, "matrix": [3, 1], "x": 26, "y": 120 }, - { "flags": 4, "matrix": [3, 0], "x": 0, "y": 120 }, - { "flags": 4, "matrix": [2, 0], "x": 0, "y": 90 }, - { "flags": 4, "matrix": [2, 1], "x": 26, "y": 90 }, - { "flags": 4, "matrix": [2, 2], "x": 52, "y": 90 }, - { "flags": 4, "matrix": [2, 3], "x": 78, "y": 90 }, - { "flags": 4, "matrix": [2, 4], "x": 104, "y": 90 }, - { "flags": 4, "matrix": [2, 5], "x": 130, "y": 90 }, - { "flags": 4, "matrix": [2, 6], "x": 156, "y": 90 }, - { "flags": 4, "matrix": [1, 6], "x": 156, "y": 60 }, - { "flags": 4, "matrix": [1, 5], "x": 130, "y": 60 }, - { "flags": 4, "matrix": [1, 4], "x": 104, "y": 60 }, - { "flags": 4, "matrix": [1, 3], "x": 78, "y": 60 }, - { "flags": 4, "matrix": [1, 2], "x": 52, "y": 60 }, - { "flags": 4, "matrix": [1, 1], "x": 26, "y": 60 }, - { "flags": 4, "matrix": [1, 0], "x": 0, "y": 60 }, - { "flags": 4, "matrix": [0, 0], "x": 0, "y": 30 }, - { "flags": 4, "matrix": [0, 1], "x": 26, "y": 30 }, - { "flags": 4, "matrix": [0, 2], "x": 52, "y": 30 }, - { "flags": 4, "matrix": [0, 3], "x": 78, "y": 30 }, - { "flags": 4, "matrix": [0, 4], "x": 104, "y": 30 }, - { "flags": 4, "matrix": [0, 5], "x": 130, "y": 30 }, - { "flags": 4, "matrix": [0, 6], "x": 156, "y": 30 }, - { "flags": 2, "x": 114, "y": 30 }, - { "flags": 2, "x": 114, "y": 80 }, - { "flags": 2, "x": 114, "y": 130 }, - { "flags": 2, "x": 129, "y": 180 }, - { "flags": 2, "x": 149, "y": 195 }, - { "flags": 2, "x": 164, "y": 210 }, - { "flags": 2, "x": 179, "y": 190 }, - { "flags": 2, "x": 189, "y": 175 }, - { "flags": 2, "x": 204, "y": 160 }, - { "flags": 2, "x": 219, "y": 160 }, - { "flags": 4, "matrix": [10, 3], "x": 146, "y": 150 }, - { "flags": 4, "matrix": [10, 4], "x": 120, "y": 150 }, - { "flags": 4, "matrix": [10, 5], "x": 94, "y": 150 }, - { "flags": 4, "matrix": [10, 6], "x": 68, "y": 150 }, - { "flags": 4, "matrix": [9, 6], "x": 68, "y": 120 }, - { "flags": 4, "matrix": [9, 5], "x": 94, "y": 120 }, - { "flags": 4, "matrix": [9, 4], "x": 120, "y": 120 }, - { "flags": 4, "matrix": [9, 3], "x": 146, "y": 120 }, - { "flags": 4, "matrix": [9, 2], "x": 172, "y": 120 }, - { "flags": 4, "matrix": [9, 1], "x": 198, "y": 120 }, - { "flags": 4, "matrix": [9, 0], "x": 224, "y": 120 }, - { "flags": 4, "matrix": [8, 0], "x": 224, "y": 90 }, - { "flags": 4, "matrix": [8, 1], "x": 198, "y": 90 }, - { "flags": 4, "matrix": [8, 2], "x": 172, "y": 90 }, - { "flags": 4, "matrix": [8, 3], "x": 146, "y": 90 }, - { "flags": 4, "matrix": [8, 4], "x": 120, "y": 90 }, - { "flags": 4, "matrix": [8, 5], "x": 94, "y": 90 }, - { "flags": 4, "matrix": [8, 6], "x": 68, "y": 90 }, - { "flags": 4, "matrix": [7, 6], "x": 68, "y": 60 }, - { "flags": 4, "matrix": [7, 5], "x": 94, "y": 60 }, - { "flags": 4, "matrix": [7, 4], "x": 120, "y": 60 }, - { "flags": 4, "matrix": [7, 3], "x": 146, "y": 60 }, - { "flags": 4, "matrix": [7, 2], "x": 172, "y": 60 }, - { "flags": 4, "matrix": [7, 1], "x": 198, "y": 60 }, - { "flags": 4, "matrix": [7, 0], "x": 224, "y": 60 }, - { "flags": 4, "matrix": [6, 0], "x": 224, "y": 30 }, - { "flags": 4, "matrix": [6, 1], "x": 198, "y": 30 }, - { "flags": 4, "matrix": [6, 2], "x": 172, "y": 30 }, - { "flags": 4, "matrix": [6, 3], "x": 146, "y": 30 }, - { "flags": 4, "matrix": [6, 4], "x": 120, "y": 30 }, - { "flags": 4, "matrix": [6, 5], "x": 94, "y": 30 }, - { "flags": 4, "matrix": [6, 6], "x": 68, "y": 30 } + {"flags": 2, "x": 110, "y": 30}, + {"flags": 2, "x": 110, "y": 80}, + {"flags": 2, "x": 110, "y": 130}, + {"flags": 2, "x": 95, "y": 180}, + {"flags": 2, "x": 75, "y": 195}, + {"flags": 2, "x": 60, "y": 210}, + {"flags": 2, "x": 45, "y": 190}, + {"flags": 2, "x": 35, "y": 175}, + {"flags": 2, "x": 20, "y": 160}, + {"flags": 2, "x": 5, "y": 160}, + {"flags": 4, "matrix": [4, 3], "x": 78, "y": 150}, + {"flags": 4, "matrix": [4, 4], "x": 104, "y": 150}, + {"flags": 4, "matrix": [4, 5], "x": 130, "y": 150}, + {"flags": 4, "matrix": [4, 6], "x": 156, "y": 150}, + {"flags": 4, "matrix": [3, 6], "x": 156, "y": 120}, + {"flags": 4, "matrix": [3, 5], "x": 130, "y": 120}, + {"flags": 4, "matrix": [3, 4], "x": 104, "y": 120}, + {"flags": 4, "matrix": [3, 3], "x": 78, "y": 120}, + {"flags": 4, "matrix": [3, 2], "x": 52, "y": 120}, + {"flags": 4, "matrix": [3, 1], "x": 26, "y": 120}, + {"flags": 4, "matrix": [3, 0], "x": 0, "y": 120}, + {"flags": 4, "matrix": [2, 0], "x": 0, "y": 90}, + {"flags": 4, "matrix": [2, 1], "x": 26, "y": 90}, + {"flags": 4, "matrix": [2, 2], "x": 52, "y": 90}, + {"flags": 4, "matrix": [2, 3], "x": 78, "y": 90}, + {"flags": 4, "matrix": [2, 4], "x": 104, "y": 90}, + {"flags": 4, "matrix": [2, 5], "x": 130, "y": 90}, + {"flags": 4, "matrix": [2, 6], "x": 156, "y": 90}, + {"flags": 4, "matrix": [1, 6], "x": 156, "y": 60}, + {"flags": 4, "matrix": [1, 5], "x": 130, "y": 60}, + {"flags": 4, "matrix": [1, 4], "x": 104, "y": 60}, + {"flags": 4, "matrix": [1, 3], "x": 78, "y": 60}, + {"flags": 4, "matrix": [1, 2], "x": 52, "y": 60}, + {"flags": 4, "matrix": [1, 1], "x": 26, "y": 60}, + {"flags": 4, "matrix": [1, 0], "x": 0, "y": 60}, + {"flags": 4, "matrix": [0, 0], "x": 0, "y": 30}, + {"flags": 4, "matrix": [0, 1], "x": 26, "y": 30}, + {"flags": 4, "matrix": [0, 2], "x": 52, "y": 30}, + {"flags": 4, "matrix": [0, 3], "x": 78, "y": 30}, + {"flags": 4, "matrix": [0, 4], "x": 104, "y": 30}, + {"flags": 4, "matrix": [0, 5], "x": 130, "y": 30}, + {"flags": 4, "matrix": [0, 6], "x": 156, "y": 30}, + {"flags": 2, "x": 114, "y": 30}, + {"flags": 2, "x": 114, "y": 80}, + {"flags": 2, "x": 114, "y": 130}, + {"flags": 2, "x": 129, "y": 180}, + {"flags": 2, "x": 149, "y": 195}, + {"flags": 2, "x": 164, "y": 210}, + {"flags": 2, "x": 179, "y": 190}, + {"flags": 2, "x": 189, "y": 175}, + {"flags": 2, "x": 204, "y": 160}, + {"flags": 2, "x": 219, "y": 160}, + {"flags": 4, "matrix": [10, 3], "x": 146, "y": 150}, + {"flags": 4, "matrix": [10, 4], "x": 120, "y": 150}, + {"flags": 4, "matrix": [10, 5], "x": 94, "y": 150}, + {"flags": 4, "matrix": [10, 6], "x": 68, "y": 150}, + {"flags": 4, "matrix": [9, 6], "x": 68, "y": 120}, + {"flags": 4, "matrix": [9, 5], "x": 94, "y": 120}, + {"flags": 4, "matrix": [9, 4], "x": 120, "y": 120}, + {"flags": 4, "matrix": [9, 3], "x": 146, "y": 120}, + {"flags": 4, "matrix": [9, 2], "x": 172, "y": 120}, + {"flags": 4, "matrix": [9, 1], "x": 198, "y": 120}, + {"flags": 4, "matrix": [9, 0], "x": 224, "y": 120}, + {"flags": 4, "matrix": [8, 0], "x": 224, "y": 90}, + {"flags": 4, "matrix": [8, 1], "x": 198, "y": 90}, + {"flags": 4, "matrix": [8, 2], "x": 172, "y": 90}, + {"flags": 4, "matrix": [8, 3], "x": 146, "y": 90}, + {"flags": 4, "matrix": [8, 4], "x": 120, "y": 90}, + {"flags": 4, "matrix": [8, 5], "x": 94, "y": 90}, + {"flags": 4, "matrix": [8, 6], "x": 68, "y": 90}, + {"flags": 4, "matrix": [7, 6], "x": 68, "y": 60}, + {"flags": 4, "matrix": [7, 5], "x": 94, "y": 60}, + {"flags": 4, "matrix": [7, 4], "x": 120, "y": 60}, + {"flags": 4, "matrix": [7, 3], "x": 146, "y": 60}, + {"flags": 4, "matrix": [7, 2], "x": 172, "y": 60}, + {"flags": 4, "matrix": [7, 1], "x": 198, "y": 60}, + {"flags": 4, "matrix": [7, 0], "x": 224, "y": 60}, + {"flags": 4, "matrix": [6, 0], "x": 224, "y": 30}, + {"flags": 4, "matrix": [6, 1], "x": 198, "y": 30}, + {"flags": 4, "matrix": [6, 2], "x": 172, "y": 30}, + {"flags": 4, "matrix": [6, 3], "x": 146, "y": 30}, + {"flags": 4, "matrix": [6, 4], "x": 120, "y": 30}, + {"flags": 4, "matrix": [6, 5], "x": 94, "y": 30}, + {"flags": 4, "matrix": [6, 6], "x": 68, "y": 30} ] } } diff --git a/keyboards/tzarc/djinn/rev1/rev1.c b/keyboards/tzarc/djinn/rev1/rev1.c deleted file mode 100644 index 95f0e20020..0000000000 --- a/keyboards/tzarc/djinn/rev1/rev1.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "rev1.h" diff --git a/keyboards/tzarc/djinn/rev1/rev1.h b/keyboards/tzarc/djinn/rev1/rev1.h deleted file mode 100644 index 1845cb8fdd..0000000000 --- a/keyboards/tzarc/djinn/rev1/rev1.h +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once diff --git a/keyboards/tzarc/djinn/rev2/info.json b/keyboards/tzarc/djinn/rev2/info.json index 22cafa74ae..a8716209ea 100644 --- a/keyboards/tzarc/djinn/rev2/info.json +++ b/keyboards/tzarc/djinn/rev2/info.json @@ -12,92 +12,92 @@ }, "rgb_matrix": { "layout": [ - { "flags": 2, "x": 110, "y": 30 }, - { "flags": 2, "x": 110, "y": 80 }, - { "flags": 2, "x": 110, "y": 130 }, - { "flags": 2, "x": 95, "y": 180 }, - { "flags": 2, "x": 75, "y": 195 }, - { "flags": 2, "x": 60, "y": 210 }, - { "flags": 2, "x": 45, "y": 190 }, - { "flags": 2, "x": 35, "y": 175 }, - { "flags": 2, "x": 20, "y": 160 }, - { "flags": 2, "x": 5, "y": 160 }, - { "flags": 2, "x": 5, "y": 160 }, - { "flags": 4, "matrix": [4, 3], "x": 78, "y": 150 }, - { "flags": 4, "matrix": [4, 4], "x": 104, "y": 150 }, - { "flags": 4, "matrix": [4, 5], "x": 130, "y": 150 }, - { "flags": 4, "matrix": [4, 6], "x": 156, "y": 150 }, - { "flags": 4, "matrix": [3, 6], "x": 156, "y": 120 }, - { "flags": 4, "matrix": [3, 5], "x": 130, "y": 120 }, - { "flags": 4, "matrix": [3, 4], "x": 104, "y": 120 }, - { "flags": 4, "matrix": [3, 3], "x": 78, "y": 120 }, - { "flags": 4, "matrix": [3, 2], "x": 52, "y": 120 }, - { "flags": 4, "matrix": [3, 1], "x": 26, "y": 120 }, - { "flags": 4, "matrix": [3, 0], "x": 0, "y": 120 }, - { "flags": 4, "matrix": [2, 0], "x": 0, "y": 90 }, - { "flags": 4, "matrix": [2, 1], "x": 26, "y": 90 }, - { "flags": 4, "matrix": [2, 2], "x": 52, "y": 90 }, - { "flags": 4, "matrix": [2, 3], "x": 78, "y": 90 }, - { "flags": 4, "matrix": [2, 4], "x": 104, "y": 90 }, - { "flags": 4, "matrix": [2, 5], "x": 130, "y": 90 }, - { "flags": 4, "matrix": [2, 6], "x": 156, "y": 90 }, - { "flags": 4, "matrix": [1, 6], "x": 156, "y": 60 }, - { "flags": 4, "matrix": [1, 5], "x": 130, "y": 60 }, - { "flags": 4, "matrix": [1, 4], "x": 104, "y": 60 }, - { "flags": 4, "matrix": [1, 3], "x": 78, "y": 60 }, - { "flags": 4, "matrix": [1, 2], "x": 52, "y": 60 }, - { "flags": 4, "matrix": [1, 1], "x": 26, "y": 60 }, - { "flags": 4, "matrix": [1, 0], "x": 0, "y": 60 }, - { "flags": 4, "matrix": [0, 0], "x": 0, "y": 30 }, - { "flags": 4, "matrix": [0, 1], "x": 26, "y": 30 }, - { "flags": 4, "matrix": [0, 2], "x": 52, "y": 30 }, - { "flags": 4, "matrix": [0, 3], "x": 78, "y": 30 }, - { "flags": 4, "matrix": [0, 4], "x": 104, "y": 30 }, - { "flags": 4, "matrix": [0, 5], "x": 130, "y": 30 }, - { "flags": 4, "matrix": [0, 6], "x": 156, "y": 30 }, - { "flags": 2, "x": 114, "y": 30 }, - { "flags": 2, "x": 114, "y": 80 }, - { "flags": 2, "x": 114, "y": 130 }, - { "flags": 2, "x": 129, "y": 180 }, - { "flags": 2, "x": 149, "y": 195 }, - { "flags": 2, "x": 164, "y": 210 }, - { "flags": 2, "x": 179, "y": 190 }, - { "flags": 2, "x": 189, "y": 175 }, - { "flags": 2, "x": 24, "y": 160 }, - { "flags": 2, "x": 219, "y": 160 }, - { "flags": 2, "x": 219, "y": 160 }, - { "flags": 4, "matrix": [10, 3], "x": 146, "y": 150 }, - { "flags": 4, "matrix": [10, 4], "x": 120, "y": 150 }, - { "flags": 4, "matrix": [10, 5], "x": 94, "y": 150 }, - { "flags": 4, "matrix": [10, 6], "x": 68, "y": 150 }, - { "flags": 4, "matrix": [9, 6], "x": 68, "y": 120 }, - { "flags": 4, "matrix": [9, 5], "x": 94, "y": 120 }, - { "flags": 4, "matrix": [9, 4], "x": 120, "y": 120 }, - { "flags": 4, "matrix": [9, 3], "x": 146, "y": 120 }, - { "flags": 4, "matrix": [9, 2], "x": 172, "y": 120 }, - { "flags": 4, "matrix": [9, 1], "x": 198, "y": 120 }, - { "flags": 4, "matrix": [9, 0], "x": 224, "y": 120 }, - { "flags": 4, "matrix": [8, 0], "x": 224, "y": 90 }, - { "flags": 4, "matrix": [8, 1], "x": 198, "y": 90 }, - { "flags": 4, "matrix": [8, 2], "x": 172, "y": 90 }, - { "flags": 4, "matrix": [8, 3], "x": 146, "y": 90 }, - { "flags": 4, "matrix": [8, 4], "x": 120, "y": 90 }, - { "flags": 4, "matrix": [8, 5], "x": 94, "y": 90 }, - { "flags": 4, "matrix": [8, 6], "x": 68, "y": 90 }, - { "flags": 4, "matrix": [7, 6], "x": 68, "y": 60 }, - { "flags": 4, "matrix": [7, 5], "x": 94, "y": 60 }, - { "flags": 4, "matrix": [7, 4], "x": 120, "y": 60 }, - { "flags": 4, "matrix": [7, 3], "x": 146, "y": 60 }, - { "flags": 4, "matrix": [7, 2], "x": 172, "y": 60 }, - { "flags": 4, "matrix": [7, 1], "x": 198, "y": 60 }, - { "flags": 4, "matrix": [7, 0], "x": 224, "y": 60 }, - { "flags": 4, "matrix": [6, 0], "x": 224, "y": 30 }, - { "flags": 4, "matrix": [6, 1], "x": 198, "y": 30 }, - { "flags": 4, "matrix": [6, 2], "x": 172, "y": 30 }, - { "flags": 4, "matrix": [6, 3], "x": 146, "y": 30 }, - { "flags": 4, "matrix": [6, 4], "x": 120, "y": 30 }, - { "flags": 4, "matrix": [6, 5], "x": 94, "y": 30 }, - { "flags": 4, "matrix": [6, 6], "x": 68, "y": 30 } + {"flags": 2, "x": 110, "y": 30}, + {"flags": 2, "x": 110, "y": 80}, + {"flags": 2, "x": 110, "y": 130}, + {"flags": 2, "x": 95, "y": 180}, + {"flags": 2, "x": 75, "y": 195}, + {"flags": 2, "x": 60, "y": 210}, + {"flags": 2, "x": 45, "y": 190}, + {"flags": 2, "x": 35, "y": 175}, + {"flags": 2, "x": 20, "y": 160}, + {"flags": 2, "x": 5, "y": 160}, + {"flags": 2, "x": 5, "y": 160}, + {"flags": 4, "matrix": [4, 3], "x": 78, "y": 150}, + {"flags": 4, "matrix": [4, 4], "x": 104, "y": 150}, + {"flags": 4, "matrix": [4, 5], "x": 130, "y": 150}, + {"flags": 4, "matrix": [4, 6], "x": 156, "y": 150}, + {"flags": 4, "matrix": [3, 6], "x": 156, "y": 120}, + {"flags": 4, "matrix": [3, 5], "x": 130, "y": 120}, + {"flags": 4, "matrix": [3, 4], "x": 104, "y": 120}, + {"flags": 4, "matrix": [3, 3], "x": 78, "y": 120}, + {"flags": 4, "matrix": [3, 2], "x": 52, "y": 120}, + {"flags": 4, "matrix": [3, 1], "x": 26, "y": 120}, + {"flags": 4, "matrix": [3, 0], "x": 0, "y": 120}, + {"flags": 4, "matrix": [2, 0], "x": 0, "y": 90}, + {"flags": 4, "matrix": [2, 1], "x": 26, "y": 90}, + {"flags": 4, "matrix": [2, 2], "x": 52, "y": 90}, + {"flags": 4, "matrix": [2, 3], "x": 78, "y": 90}, + {"flags": 4, "matrix": [2, 4], "x": 104, "y": 90}, + {"flags": 4, "matrix": [2, 5], "x": 130, "y": 90}, + {"flags": 4, "matrix": [2, 6], "x": 156, "y": 90}, + {"flags": 4, "matrix": [1, 6], "x": 156, "y": 60}, + {"flags": 4, "matrix": [1, 5], "x": 130, "y": 60}, + {"flags": 4, "matrix": [1, 4], "x": 104, "y": 60}, + {"flags": 4, "matrix": [1, 3], "x": 78, "y": 60}, + {"flags": 4, "matrix": [1, 2], "x": 52, "y": 60}, + {"flags": 4, "matrix": [1, 1], "x": 26, "y": 60}, + {"flags": 4, "matrix": [1, 0], "x": 0, "y": 60}, + {"flags": 4, "matrix": [0, 0], "x": 0, "y": 30}, + {"flags": 4, "matrix": [0, 1], "x": 26, "y": 30}, + {"flags": 4, "matrix": [0, 2], "x": 52, "y": 30}, + {"flags": 4, "matrix": [0, 3], "x": 78, "y": 30}, + {"flags": 4, "matrix": [0, 4], "x": 104, "y": 30}, + {"flags": 4, "matrix": [0, 5], "x": 130, "y": 30}, + {"flags": 4, "matrix": [0, 6], "x": 156, "y": 30}, + {"flags": 2, "x": 114, "y": 30}, + {"flags": 2, "x": 114, "y": 80}, + {"flags": 2, "x": 114, "y": 130}, + {"flags": 2, "x": 129, "y": 180}, + {"flags": 2, "x": 149, "y": 195}, + {"flags": 2, "x": 164, "y": 210}, + {"flags": 2, "x": 179, "y": 190}, + {"flags": 2, "x": 189, "y": 175}, + {"flags": 2, "x": 24, "y": 160}, + {"flags": 2, "x": 219, "y": 160}, + {"flags": 2, "x": 219, "y": 160}, + {"flags": 4, "matrix": [10, 3], "x": 146, "y": 150}, + {"flags": 4, "matrix": [10, 4], "x": 120, "y": 150}, + {"flags": 4, "matrix": [10, 5], "x": 94, "y": 150}, + {"flags": 4, "matrix": [10, 6], "x": 68, "y": 150}, + {"flags": 4, "matrix": [9, 6], "x": 68, "y": 120}, + {"flags": 4, "matrix": [9, 5], "x": 94, "y": 120}, + {"flags": 4, "matrix": [9, 4], "x": 120, "y": 120}, + {"flags": 4, "matrix": [9, 3], "x": 146, "y": 120}, + {"flags": 4, "matrix": [9, 2], "x": 172, "y": 120}, + {"flags": 4, "matrix": [9, 1], "x": 198, "y": 120}, + {"flags": 4, "matrix": [9, 0], "x": 224, "y": 120}, + {"flags": 4, "matrix": [8, 0], "x": 224, "y": 90}, + {"flags": 4, "matrix": [8, 1], "x": 198, "y": 90}, + {"flags": 4, "matrix": [8, 2], "x": 172, "y": 90}, + {"flags": 4, "matrix": [8, 3], "x": 146, "y": 90}, + {"flags": 4, "matrix": [8, 4], "x": 120, "y": 90}, + {"flags": 4, "matrix": [8, 5], "x": 94, "y": 90}, + {"flags": 4, "matrix": [8, 6], "x": 68, "y": 90}, + {"flags": 4, "matrix": [7, 6], "x": 68, "y": 60}, + {"flags": 4, "matrix": [7, 5], "x": 94, "y": 60}, + {"flags": 4, "matrix": [7, 4], "x": 120, "y": 60}, + {"flags": 4, "matrix": [7, 3], "x": 146, "y": 60}, + {"flags": 4, "matrix": [7, 2], "x": 172, "y": 60}, + {"flags": 4, "matrix": [7, 1], "x": 198, "y": 60}, + {"flags": 4, "matrix": [7, 0], "x": 224, "y": 60}, + {"flags": 4, "matrix": [6, 0], "x": 224, "y": 30}, + {"flags": 4, "matrix": [6, 1], "x": 198, "y": 30}, + {"flags": 4, "matrix": [6, 2], "x": 172, "y": 30}, + {"flags": 4, "matrix": [6, 3], "x": 146, "y": 30}, + {"flags": 4, "matrix": [6, 4], "x": 120, "y": 30}, + {"flags": 4, "matrix": [6, 5], "x": 94, "y": 30}, + {"flags": 4, "matrix": [6, 6], "x": 68, "y": 30} ] } } diff --git a/keyboards/tzarc/djinn/rev2/rev2.c b/keyboards/tzarc/djinn/rev2/rev2.c deleted file mode 100644 index f55e0c224a..0000000000 --- a/keyboards/tzarc/djinn/rev2/rev2.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "rev2.h" diff --git a/keyboards/tzarc/djinn/rev2/rev2.h b/keyboards/tzarc/djinn/rev2/rev2.h deleted file mode 100644 index 1845cb8fdd..0000000000 --- a/keyboards/tzarc/djinn/rev2/rev2.h +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk index 9b81a4bfaf..e7c32e4dc1 100644 --- a/keyboards/tzarc/djinn/rules.mk +++ b/keyboards/tzarc/djinn/rules.mk @@ -2,11 +2,8 @@ CUSTOM_MATRIX = lite SERIAL_DRIVER = usart -WS2812_DRIVER = pwm CIE1931_CURVE = yes -RGB_MATRIX_DRIVER = WS2812 - EEPROM_DRIVER = spi AUDIO_DRIVER = pwm_software |