From 624bf9a9ec79fe6aa709c04d8ba8bac6ef34f804 Mon Sep 17 00:00:00 2001 From: toril940 Date: Thu, 16 Nov 2023 22:20:36 +0000 Subject: [PATCH] FIXED IT ALLLLLLLLLLLL --- keyboards/toril940/mariviper_v23/config.h | 6 +++++ keyboards/toril940/mariviper_v23/halconf.h | 2 ++ keyboards/toril940/mariviper_v23/info.json | 27 +++++++++---------- .../mariviper_v23/keymaps/default/keymap.c | 6 ++--- .../mariviper_v23/keymaps/via/keymap.c | 8 +++--- .../toril940/mariviper_v23/mariviper_v23.c | 11 ++------ keyboards/toril940/mariviper_v23/mcuconf.h | 8 +++++- 7 files changed, 36 insertions(+), 32 deletions(-) diff --git a/keyboards/toril940/mariviper_v23/config.h b/keyboards/toril940/mariviper_v23/config.h index d6572b593be..d94f924006a 100644 --- a/keyboards/toril940/mariviper_v23/config.h +++ b/keyboards/toril940/mariviper_v23/config.h @@ -11,6 +11,12 @@ #define WS2812_DMA_CHANNEL 1 // #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP +#define I2C_DRIVER I2CD2 +#define I2C2_SCL_PIN B13 +#define I2C2_SDA_PIN B14 +#define I2C2_SCL_PAL_MODE 5 +#define I2C2_SDA_PAL_MODE 5 + #define LED_DRIVER_COUNT 1 #define LED_MATRIX_LED_COUNT 8 #define LED_DRIVER_1_LED_TOTAL 8 diff --git a/keyboards/toril940/mariviper_v23/halconf.h b/keyboards/toril940/mariviper_v23/halconf.h index a25bad2c7f9..09e0b18e254 100644 --- a/keyboards/toril940/mariviper_v23/halconf.h +++ b/keyboards/toril940/mariviper_v23/halconf.h @@ -7,4 +7,6 @@ #define HAL_USE_SPI FALSE +#define HAL_USE_I2C TRUE + #include_next \ No newline at end of file diff --git a/keyboards/toril940/mariviper_v23/info.json b/keyboards/toril940/mariviper_v23/info.json index 654bc94f77f..55841d620ec 100644 --- a/keyboards/toril940/mariviper_v23/info.json +++ b/keyboards/toril940/mariviper_v23/info.json @@ -11,7 +11,8 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgblight" : true + "rgblight" : true, + "led_matrix": true }, "indicators": { "caps_lock": "B11", @@ -36,10 +37,7 @@ "driver": "pwm", "pin": "B9" }, - "rgb_matrix": { - "animations": { - "custom_kb": true - }, + "led_matrix": { "driver": "is31fl3731", "layout": [ {"x": 0, "y": -1, "flags": 8}, @@ -63,8 +61,7 @@ "pid": "0x0003", "vid": "0x6108" }, - "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", - "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"], + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso"], "layouts": { "LAYOUT_all": { "layout": [ @@ -136,7 +133,7 @@ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_tkl_ansi": { + "LAYOUT_60_ansi": { "layout": [ {"matrix": [0, 0], "x": 0, "y":0}, {"matrix": [0, 1], "x": 1, "y":0}, @@ -201,7 +198,7 @@ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_tkl_ansi_split_bs_rshift": { + "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y":0}, {"matrix": [0, 1], "x": 1, "y":0}, @@ -268,7 +265,7 @@ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_tkl_ansi_tsangan": { + "LAYOUT_60_ansi_tsangan": { "layout": [ {"matrix": [0, 0], "x": 0, "y":0}, {"matrix": [0, 1], "x": 1, "y":0}, @@ -332,7 +329,7 @@ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": { + "LAYOUT_60_ansi_tsangan_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y":0}, {"matrix": [0, 1], "x": 1, "y":0}, @@ -398,7 +395,7 @@ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_tkl_iso": { + "LAYOUT_60_iso": { "layout": [ {"matrix": [0, 0], "x": 0, "y":0}, {"matrix": [0, 1], "x": 1, "y":0}, @@ -464,7 +461,7 @@ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_tkl_iso_split_bs_rshift": { + "LAYOUT_60_iso_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y":0}, {"matrix": [0, 1], "x": 1, "y":0}, @@ -532,7 +529,7 @@ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_tkl_iso_tsangan": { + "LAYOUT_60_iso_tsangan": { "layout": [ {"matrix": [0, 0], "x": 0, "y":0}, {"matrix": [0, 1], "x": 1, "y":0}, @@ -597,7 +594,7 @@ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_tkl_iso_tsangan_split_bs_rshift": { + "LAYOUT_60_iso_tsangan_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y":0}, {"matrix": [0, 1], "x": 1, "y":0}, diff --git a/keyboards/toril940/mariviper_v23/keymaps/default/keymap.c b/keyboards/toril940/mariviper_v23/keymaps/default/keymap.c index 92d39aaf128..78930d1cd04 100644 --- a/keyboards/toril940/mariviper_v23/keymaps/default/keymap.c +++ b/keyboards/toril940/mariviper_v23/keymaps/default/keymap.c @@ -18,10 +18,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴─────────┴───┴──────────┴────┴────┴────┴────┘ */ [0] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, RGB_TOG, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, RGB_MOD + KC_LSFT, RGB_TOG, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, RGB_MOD, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ) }; diff --git a/keyboards/toril940/mariviper_v23/keymaps/via/keymap.c b/keyboards/toril940/mariviper_v23/keymaps/via/keymap.c index 19d3c4154f1..78930d1cd04 100644 --- a/keyboards/toril940/mariviper_v23/keymaps/via/keymap.c +++ b/keyboards/toril940/mariviper_v23/keymaps/via/keymap.c @@ -18,10 +18,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴─────────┴───┴──────────┴────┴────┴────┴────┘ */ [0] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC -KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, RGB_TOG, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, RGB_MOD -KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + KC_LSFT, RGB_TOG, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, RGB_MOD, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ) }; diff --git a/keyboards/toril940/mariviper_v23/mariviper_v23.c b/keyboards/toril940/mariviper_v23/mariviper_v23.c index 30aa54c748f..56094da3578 100644 --- a/keyboards/toril940/mariviper_v23/mariviper_v23.c +++ b/keyboards/toril940/mariviper_v23/mariviper_v23.c @@ -32,20 +32,13 @@ const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = { { 0, C6_1 }, { 0, C7_1 }, { 0, C8_1 } -} +}; void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - led_matrix_set_value(0, 0); - led_matrix_set_value(1, 0); - led_matrix_set_value(2, 0); - led_matrix_set_value(3, 255); - led_matrix_set_value(4, 255); - led_matrix_set_value(5, 255); - led_matrix_set_value(6, 255); - led_matrix_set_value(7, 255); + led_matrix_enable(); matrix_init_user(); } diff --git a/keyboards/toril940/mariviper_v23/mcuconf.h b/keyboards/toril940/mariviper_v23/mcuconf.h index c2cf95aef2e..96af936f1cf 100644 --- a/keyboards/toril940/mariviper_v23/mcuconf.h +++ b/keyboards/toril940/mariviper_v23/mcuconf.h @@ -6,4 +6,10 @@ #include_next #define STM32_PWM_USE_TIM17 TRUE -#define STM32_TIM17_SUPPRESS_ISR \ No newline at end of file +#define STM32_TIM17_SUPPRESS_ISR + +#undef STM32_I2C_USE_I2C2 +#define STM32_I2C_USE_I2C2 TRUE + +#undef STM32_I2C_USE_DMA +#define STM32_I2C_USE_DMA FALSE \ No newline at end of file