From a6521b8521f56f39c3aa5054bf04307190de9035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF=E3=83=BC=E3=83=9A?= =?UTF-8?q?=E3=83=BC=E3=83=91=E3=83=BC?= <76888457+filterpaper@users.noreply.github.com> Date: Fri, 17 Nov 2023 01:48:24 +0800 Subject: [PATCH 1/4] [Doc] Improve converter references (#21801) --- docs/feature_converters.md | 41 +++++++++++++------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/docs/feature_converters.md b/docs/feature_converters.md index b1abfa373ad..11bdbed576b 100644 --- a/docs/feature_converters.md +++ b/docs/feature_converters.md @@ -1,12 +1,10 @@ # Converters -Since many drop-in replacement controllers now exist, we've done our best to make them easy to use in existing designs. +This page documents the automated process for converting keyboards to use drop-in replacement controllers. This process is designed to be easy to use and can be completed in a few simple steps. -This page documents the handy automated process for converting keyboards. +## Supported Converters -### Supported Converters - -Currently the following converters are available: +The following converters are available at this time: | From | To | |------------|-------------------| @@ -28,14 +26,10 @@ Currently the following converters are available: | `elite_c` | `helios` | | `elite_c` | `liatris` | -See below for more in depth information on each converter. ## Overview -Each converter category is broken down by its declared `pin compatibility`. -This ensures that only valid combinations are attempted. - -You can generate the firmware by appending `-e CONVERT_TO=` to your compile/flash command. For example: +Each converter category is broken down by its declared `pin compatibility`. This ensures that only valid combinations are attempted. You can generate the firmware by appending `-e CONVERT_TO=` to your compile/flash command. For example: ```sh qmk flash -c -kb keebio/bdn9/rev1 -km default -e CONVERT_TO=proton_c @@ -59,14 +53,12 @@ Once a converter is enabled, it exposes the `CONVERT_TO_` flag ### Pin Compatibility -To ensure compatibility, provide validation, and power future workflows, a keyboard should declare its `pin compatibility`. For legacy reasons, this is currently assumed to be `promicro`. +To ensure compatibility, provide validation, and enable future workflows, a keyboard should declare its `pin compatibility`. For legacy reasons, this is currently assumed to be `promicro`. The following pin compatibility interfaces are currently defined: -Currently the following pin compatibility interfaces are defined: - -| Pinout | Notes | -|------------|-----------------------------------| -| `promicro` | Includes RX/TX LEDs | -| `elite_c` | Includes bottom row pins, no LEDs | +| Pin Compatibility | Notes | +|-------------------|-----------------------------------| +| `promicro` | Includes RX/TX LEDs | +| `elite_c` | Includes bottom row pins, no LEDs | To declare the base for conversions, add this line to your keyboard's `rules.mk`: @@ -140,7 +132,7 @@ The following defaults are based on what has been implemented for [RP2040](platf ### SparkFun Pro Micro - RP2040, Blok, Bit-C PRO and Michi :id=promicro_rp2040 -Currently identical to [Adafruit KB2040](#kb2040). +Feature set is identical to [Adafruit KB2040](#kb2040). ### STeMCell :id=stemcell @@ -150,9 +142,7 @@ There are two versions of STeMCell available, with different pinouts: - v2.0.0 (pre-release v1.0.1, v1.0.2) Default official firmware only supports v2.0.0 STeMCell. -STeMCell has support to swap UART and I2C pins, to enable single-wire uart communication in STM chips. - -The following additional flags has to be used while compiling, based on the pin used for split communication. +STeMCell has support to swap UART and I2C pins to enable single-wire uart communication in STM chips. The following additional flags has to be used while compiling, based on the pin used for split communication: | Split Pin | Compile flags | |-----------|---------------| @@ -173,11 +163,8 @@ The Bonsai C4 only has one on-board LED (B2), and by default, both the Pro Micro ### RP2040 Community Edition - Elite-Pi, Helios, and Liatris :id=rp2040_ce -Feature set currently identical to [Adafruit KB2040](#kb2040). +Feature set is identical to [Adafruit KB2040](#kb2040). VBUS detection is enabled by default for superior split keyboard support. For more information, refer to the [Community Edition pinout](platformdev_rp2040.md#rp2040_ce) docs. -Enables VBUS detection by default for superior split keyboard support. - -For more information, refer to the [RP2040 Community Edition](platformdev_rp2040.md#rp2040_ce) docs. ## Elite-C @@ -202,8 +189,8 @@ Converter summary: ### STeMCell :id=stemcell_elite -Currently identical to [STeMCell](#stemcell) with support for the additional bottom row of pins. +Identical to [Pro Micro - STeMCell](#stemcell) with support for the additional bottom row of pins. ### RP2040 Community Edition :id=rp2040_ce_elite -Currently identical to [RP2040 Community Edition](#rp2040_ce), with support for the additional bottom row of pins. +Identical to [Pro Micro - RP2040 Community Edition](#rp2040_ce) with support for the additional bottom row of pins. From 2fd763c57196e5f12c6eb3fb5d87f8d72c177112 Mon Sep 17 00:00:00 2001 From: toril940 Date: Thu, 16 Nov 2023 19:20:19 +0000 Subject: [PATCH 2/4] Rename main keyboard to correct name lol --- .../toril940/mariviper_v23/{mariorion_v25.c => mariviper_v23.c} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/toril940/mariviper_v23/{mariorion_v25.c => mariviper_v23.c} (100%) diff --git a/keyboards/toril940/mariviper_v23/mariorion_v25.c b/keyboards/toril940/mariviper_v23/mariviper_v23.c similarity index 100% rename from keyboards/toril940/mariviper_v23/mariorion_v25.c rename to keyboards/toril940/mariviper_v23/mariviper_v23.c From fff5c7782fc4c0ea6d61594fa395d929f3a382c5 Mon Sep 17 00:00:00 2001 From: toril940 Date: Thu, 16 Nov 2023 21:07:53 +0000 Subject: [PATCH 3/4] Trying to fix the config, just an update --- keyboards/toril940/mariviper_v23/config.h | 4 +- keyboards/toril940/mariviper_v23/info.json | 278 +++++++++--------- .../toril940/mariviper_v23/mariviper_v23.c | 17 +- 3 files changed, 150 insertions(+), 149 deletions(-) diff --git a/keyboards/toril940/mariviper_v23/config.h b/keyboards/toril940/mariviper_v23/config.h index 8fc90c238b0..d6572b593be 100644 --- a/keyboards/toril940/mariviper_v23/config.h +++ b/keyboards/toril940/mariviper_v23/config.h @@ -14,6 +14,4 @@ #define LED_DRIVER_COUNT 1 #define LED_MATRIX_LED_COUNT 8 #define LED_DRIVER_1_LED_TOTAL 8 -#define LED_DRIVER_ADDR_1 0b1110100 - -#define LED_CAPS_LOCK_PIN B11 \ No newline at end of file +#define LED_DRIVER_ADDR_1 0b1110100 \ No newline at end of file diff --git a/keyboards/toril940/mariviper_v23/info.json b/keyboards/toril940/mariviper_v23/info.json index 3ef8348e294..654bc94f77f 100644 --- a/keyboards/toril940/mariviper_v23/info.json +++ b/keyboards/toril940/mariviper_v23/info.json @@ -42,14 +42,14 @@ }, "driver": "is31fl3731", "layout": [ - {"x": 0, "y": -1, "flags": "0x08"}, - {"x": 1, "y": -1, "flags": "0x08"}, - {"x": 2, "y": -1, "flags": "0x08"}, - {"x": 3, "y": -1, "flags": "0x08"}, - {"x": 4, "y": -1, "flags": "0x08"}, - {"x": 5, "y": -1, "flags": "0x08"}, - {"x": 6, "y": -1, "flags": "0x08"}, - {"x": 7, "y": -1, "flags": "0x08"} + {"x": 0, "y": -1, "flags": 8}, + {"x": 1, "y": -1, "flags": 8}, + {"x": 2, "y": -1, "flags": 8}, + {"x": 3, "y": -1, "flags": 8}, + {"x": 4, "y": -1, "flags": 8}, + {"x": 5, "y": -1, "flags": 8}, + {"x": 6, "y": -1, "flags": 8}, + {"x": 7, "y": -1, "flags": 8} ] }, "matrix_pins": { @@ -68,21 +68,21 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 0}, - {"matrix": [0, 1], "x": 1}, - {"matrix": [0, 2], "x": 2}, - {"matrix": [0, 3], "x": 3}, - {"matrix": [0, 4], "x": 4}, - {"matrix": [0, 5], "x": 5}, - {"matrix": [0, 6], "x": 6}, - {"matrix": [0, 7], "x": 7}, - {"matrix": [0, 8], "x": 8}, - {"matrix": [0, 9], "x": 9}, - {"matrix": [0, 10], "x": 10}, - {"matrix": [0, 11], "x": 11}, - {"matrix": [0, 12], "x": 12}, - {"matrix": [0, 13], "x": 13}, - {"matrix": [0, 14], "x": 14}, + {"matrix": [0, 0], "x": 0, "y":0}, + {"matrix": [0, 1], "x": 1, "y":0}, + {"matrix": [0, 2], "x": 2, "y":0}, + {"matrix": [0, 3], "x": 3, "y":0}, + {"matrix": [0, 4], "x": 4, "y":0}, + {"matrix": [0, 5], "x": 5, "y":0}, + {"matrix": [0, 6], "x": 6, "y":0}, + {"matrix": [0, 7], "x": 7, "y":0}, + {"matrix": [0, 8], "x": 8, "y":0}, + {"matrix": [0, 9], "x": 9, "y":0}, + {"matrix": [0, 10], "x": 10, "y":0}, + {"matrix": [0, 11], "x": 11, "y":0}, + {"matrix": [0, 12], "x": 12, "y":0}, + {"matrix": [0, 13], "x": 13, "y":0}, + {"matrix": [0, 14], "x": 14, "y":0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1}, @@ -138,20 +138,20 @@ }, "LAYOUT_tkl_ansi": { "layout": [ - {"matrix": [0, 0], "x": 0}, - {"matrix": [0, 1], "x": 1}, - {"matrix": [0, 2], "x": 2}, - {"matrix": [0, 3], "x": 3}, - {"matrix": [0, 4], "x": 4}, - {"matrix": [0, 5], "x": 5}, - {"matrix": [0, 6], "x": 6}, - {"matrix": [0, 7], "x": 7}, - {"matrix": [0, 8], "x": 8}, - {"matrix": [0, 9], "x": 9}, - {"matrix": [0, 10], "x": 10}, - {"matrix": [0, 11], "x": 11}, - {"matrix": [0, 12], "x": 12}, - {"matrix": [0, 13], "x": 13, "w": 2}, + {"matrix": [0, 0], "x": 0, "y":0}, + {"matrix": [0, 1], "x": 1, "y":0}, + {"matrix": [0, 2], "x": 2, "y":0}, + {"matrix": [0, 3], "x": 3, "y":0}, + {"matrix": [0, 4], "x": 4, "y":0}, + {"matrix": [0, 5], "x": 5, "y":0}, + {"matrix": [0, 6], "x": 6, "y":0}, + {"matrix": [0, 7], "x": 7, "y":0}, + {"matrix": [0, 8], "x": 8, "y":0}, + {"matrix": [0, 9], "x": 9, "y":0}, + {"matrix": [0, 10], "x": 10, "y":0}, + {"matrix": [0, 11], "x": 11, "y":0}, + {"matrix": [0, 12], "x": 12, "y":0}, + {"matrix": [0, 13], "x": 13, "y":0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1}, @@ -203,21 +203,21 @@ }, "LAYOUT_tkl_ansi_split_bs_rshift": { "layout": [ - {"matrix": [0, 0], "x": 0}, - {"matrix": [0, 1], "x": 1}, - {"matrix": [0, 2], "x": 2}, - {"matrix": [0, 3], "x": 3}, - {"matrix": [0, 4], "x": 4}, - {"matrix": [0, 5], "x": 5}, - {"matrix": [0, 6], "x": 6}, - {"matrix": [0, 7], "x": 7}, - {"matrix": [0, 8], "x": 8}, - {"matrix": [0, 9], "x": 9}, - {"matrix": [0, 10], "x": 10}, - {"matrix": [0, 11], "x": 11}, - {"matrix": [0, 12], "x": 12}, - {"matrix": [0, 13], "x": 13}, - {"matrix": [0, 14], "x": 14}, + {"matrix": [0, 0], "x": 0, "y":0}, + {"matrix": [0, 1], "x": 1, "y":0}, + {"matrix": [0, 2], "x": 2, "y":0}, + {"matrix": [0, 3], "x": 3, "y":0}, + {"matrix": [0, 4], "x": 4, "y":0}, + {"matrix": [0, 5], "x": 5, "y":0}, + {"matrix": [0, 6], "x": 6, "y":0}, + {"matrix": [0, 7], "x": 7, "y":0}, + {"matrix": [0, 8], "x": 8, "y":0}, + {"matrix": [0, 9], "x": 9, "y":0}, + {"matrix": [0, 10], "x": 10, "y":0}, + {"matrix": [0, 11], "x": 11, "y":0}, + {"matrix": [0, 12], "x": 12, "y":0}, + {"matrix": [0, 13], "x": 13, "y":0}, + {"matrix": [0, 14], "x": 14, "y":0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1}, @@ -270,20 +270,20 @@ }, "LAYOUT_tkl_ansi_tsangan": { "layout": [ - {"matrix": [0, 0], "x": 0}, - {"matrix": [0, 1], "x": 1}, - {"matrix": [0, 2], "x": 2}, - {"matrix": [0, 3], "x": 3}, - {"matrix": [0, 4], "x": 4}, - {"matrix": [0, 5], "x": 5}, - {"matrix": [0, 6], "x": 6}, - {"matrix": [0, 7], "x": 7}, - {"matrix": [0, 8], "x": 8}, - {"matrix": [0, 9], "x": 9}, - {"matrix": [0, 10], "x": 10}, - {"matrix": [0, 11], "x": 11}, - {"matrix": [0, 12], "x": 12}, - {"matrix": [0, 13], "x": 13, "w": 2}, + {"matrix": [0, 0], "x": 0, "y":0}, + {"matrix": [0, 1], "x": 1, "y":0}, + {"matrix": [0, 2], "x": 2, "y":0}, + {"matrix": [0, 3], "x": 3, "y":0}, + {"matrix": [0, 4], "x": 4, "y":0}, + {"matrix": [0, 5], "x": 5, "y":0}, + {"matrix": [0, 6], "x": 6, "y":0}, + {"matrix": [0, 7], "x": 7, "y":0}, + {"matrix": [0, 8], "x": 8, "y":0}, + {"matrix": [0, 9], "x": 9, "y":0}, + {"matrix": [0, 10], "x": 10, "y":0}, + {"matrix": [0, 11], "x": 11, "y":0}, + {"matrix": [0, 12], "x": 12, "y":0}, + {"matrix": [0, 13], "x": 13, "y":0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1}, @@ -334,21 +334,21 @@ }, "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": { "layout": [ - {"matrix": [0, 0], "x": 0}, - {"matrix": [0, 1], "x": 1}, - {"matrix": [0, 2], "x": 2}, - {"matrix": [0, 3], "x": 3}, - {"matrix": [0, 4], "x": 4}, - {"matrix": [0, 5], "x": 5}, - {"matrix": [0, 6], "x": 6}, - {"matrix": [0, 7], "x": 7}, - {"matrix": [0, 8], "x": 8}, - {"matrix": [0, 9], "x": 9}, - {"matrix": [0, 10], "x": 10}, - {"matrix": [0, 11], "x": 11}, - {"matrix": [0, 12], "x": 12}, - {"matrix": [0, 13], "x": 13}, - {"matrix": [0, 14], "x": 14}, + {"matrix": [0, 0], "x": 0, "y":0}, + {"matrix": [0, 1], "x": 1, "y":0}, + {"matrix": [0, 2], "x": 2, "y":0}, + {"matrix": [0, 3], "x": 3, "y":0}, + {"matrix": [0, 4], "x": 4, "y":0}, + {"matrix": [0, 5], "x": 5, "y":0}, + {"matrix": [0, 6], "x": 6, "y":0}, + {"matrix": [0, 7], "x": 7, "y":0}, + {"matrix": [0, 8], "x": 8, "y":0}, + {"matrix": [0, 9], "x": 9, "y":0}, + {"matrix": [0, 10], "x": 10, "y":0}, + {"matrix": [0, 11], "x": 11, "y":0}, + {"matrix": [0, 12], "x": 12, "y":0}, + {"matrix": [0, 13], "x": 13, "y":0}, + {"matrix": [0, 14], "x": 14, "y":0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1}, @@ -400,20 +400,20 @@ }, "LAYOUT_tkl_iso": { "layout": [ - {"matrix": [0, 0], "x": 0}, - {"matrix": [0, 1], "x": 1}, - {"matrix": [0, 2], "x": 2}, - {"matrix": [0, 3], "x": 3}, - {"matrix": [0, 4], "x": 4}, - {"matrix": [0, 5], "x": 5}, - {"matrix": [0, 6], "x": 6}, - {"matrix": [0, 7], "x": 7}, - {"matrix": [0, 8], "x": 8}, - {"matrix": [0, 9], "x": 9}, - {"matrix": [0, 10], "x": 10}, - {"matrix": [0, 11], "x": 11}, - {"matrix": [0, 12], "x": 12}, - {"matrix": [0, 13], "x": 13, "w": 2}, + {"matrix": [0, 0], "x": 0, "y":0}, + {"matrix": [0, 1], "x": 1, "y":0}, + {"matrix": [0, 2], "x": 2, "y":0}, + {"matrix": [0, 3], "x": 3, "y":0}, + {"matrix": [0, 4], "x": 4, "y":0}, + {"matrix": [0, 5], "x": 5, "y":0}, + {"matrix": [0, 6], "x": 6, "y":0}, + {"matrix": [0, 7], "x": 7, "y":0}, + {"matrix": [0, 8], "x": 8, "y":0}, + {"matrix": [0, 9], "x": 9, "y":0}, + {"matrix": [0, 10], "x": 10, "y":0}, + {"matrix": [0, 11], "x": 11, "y":0}, + {"matrix": [0, 12], "x": 12, "y":0}, + {"matrix": [0, 13], "x": 13, "y":0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1}, @@ -466,21 +466,21 @@ }, "LAYOUT_tkl_iso_split_bs_rshift": { "layout": [ - {"matrix": [0, 0], "x": 0}, - {"matrix": [0, 1], "x": 1}, - {"matrix": [0, 2], "x": 2}, - {"matrix": [0, 3], "x": 3}, - {"matrix": [0, 4], "x": 4}, - {"matrix": [0, 5], "x": 5}, - {"matrix": [0, 6], "x": 6}, - {"matrix": [0, 7], "x": 7}, - {"matrix": [0, 8], "x": 8}, - {"matrix": [0, 9], "x": 9}, - {"matrix": [0, 10], "x": 10}, - {"matrix": [0, 11], "x": 11}, - {"matrix": [0, 12], "x": 12}, - {"matrix": [0, 13], "x": 13}, - {"matrix": [0, 14], "x": 14}, + {"matrix": [0, 0], "x": 0, "y":0}, + {"matrix": [0, 1], "x": 1, "y":0}, + {"matrix": [0, 2], "x": 2, "y":0}, + {"matrix": [0, 3], "x": 3, "y":0}, + {"matrix": [0, 4], "x": 4, "y":0}, + {"matrix": [0, 5], "x": 5, "y":0}, + {"matrix": [0, 6], "x": 6, "y":0}, + {"matrix": [0, 7], "x": 7, "y":0}, + {"matrix": [0, 8], "x": 8, "y":0}, + {"matrix": [0, 9], "x": 9, "y":0}, + {"matrix": [0, 10], "x": 10, "y":0}, + {"matrix": [0, 11], "x": 11, "y":0}, + {"matrix": [0, 12], "x": 12, "y":0}, + {"matrix": [0, 13], "x": 13, "y":0}, + {"matrix": [0, 14], "x": 14, "y":0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1}, @@ -534,20 +534,20 @@ }, "LAYOUT_tkl_iso_tsangan": { "layout": [ - {"matrix": [0, 0], "x": 0}, - {"matrix": [0, 1], "x": 1}, - {"matrix": [0, 2], "x": 2}, - {"matrix": [0, 3], "x": 3}, - {"matrix": [0, 4], "x": 4}, - {"matrix": [0, 5], "x": 5}, - {"matrix": [0, 6], "x": 6}, - {"matrix": [0, 7], "x": 7}, - {"matrix": [0, 8], "x": 8}, - {"matrix": [0, 9], "x": 9}, - {"matrix": [0, 10], "x": 10}, - {"matrix": [0, 11], "x": 11}, - {"matrix": [0, 12], "x": 12}, - {"matrix": [0, 13], "x": 13, "w": 2}, + {"matrix": [0, 0], "x": 0, "y":0}, + {"matrix": [0, 1], "x": 1, "y":0}, + {"matrix": [0, 2], "x": 2, "y":0}, + {"matrix": [0, 3], "x": 3, "y":0}, + {"matrix": [0, 4], "x": 4, "y":0}, + {"matrix": [0, 5], "x": 5, "y":0}, + {"matrix": [0, 6], "x": 6, "y":0}, + {"matrix": [0, 7], "x": 7, "y":0}, + {"matrix": [0, 8], "x": 8, "y":0}, + {"matrix": [0, 9], "x": 9, "y":0}, + {"matrix": [0, 10], "x": 10, "y":0}, + {"matrix": [0, 11], "x": 11, "y":0}, + {"matrix": [0, 12], "x": 12, "y":0}, + {"matrix": [0, 13], "x": 13, "y":0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1}, @@ -599,21 +599,21 @@ }, "LAYOUT_tkl_iso_tsangan_split_bs_rshift": { "layout": [ - {"matrix": [0, 0], "x": 0}, - {"matrix": [0, 1], "x": 1}, - {"matrix": [0, 2], "x": 2}, - {"matrix": [0, 3], "x": 3}, - {"matrix": [0, 4], "x": 4}, - {"matrix": [0, 5], "x": 5}, - {"matrix": [0, 6], "x": 6}, - {"matrix": [0, 7], "x": 7}, - {"matrix": [0, 8], "x": 8}, - {"matrix": [0, 9], "x": 9}, - {"matrix": [0, 10], "x": 10}, - {"matrix": [0, 11], "x": 11}, - {"matrix": [0, 12], "x": 12}, - {"matrix": [0, 13], "x": 13}, - {"matrix": [0, 14], "x": 14}, + {"matrix": [0, 0], "x": 0, "y":0}, + {"matrix": [0, 1], "x": 1, "y":0}, + {"matrix": [0, 2], "x": 2, "y":0}, + {"matrix": [0, 3], "x": 3, "y":0}, + {"matrix": [0, 4], "x": 4, "y":0}, + {"matrix": [0, 5], "x": 5, "y":0}, + {"matrix": [0, 6], "x": 6, "y":0}, + {"matrix": [0, 7], "x": 7, "y":0}, + {"matrix": [0, 8], "x": 8, "y":0}, + {"matrix": [0, 9], "x": 9, "y":0}, + {"matrix": [0, 10], "x": 10, "y":0}, + {"matrix": [0, 11], "x": 11, "y":0}, + {"matrix": [0, 12], "x": 12, "y":0}, + {"matrix": [0, 13], "x": 13, "y":0}, + {"matrix": [0, 14], "x": 14, "y":0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1}, diff --git a/keyboards/toril940/mariviper_v23/mariviper_v23.c b/keyboards/toril940/mariviper_v23/mariviper_v23.c index bfebdbda9e7..30aa54c748f 100644 --- a/keyboards/toril940/mariviper_v23/mariviper_v23.c +++ b/keyboards/toril940/mariviper_v23/mariviper_v23.c @@ -38,6 +38,9 @@ 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); @@ -46,12 +49,12 @@ void matrix_init_kb(void) { matrix_init_user(); } -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); +bool led_matrix_indicators_kb(void) { + bool res = led_update_user(host_keyboard_led_state()); if (res) { - led_matrix_set_value(0, led_state.caps_lock * 255); - led_matrix_set_value(1, led_state.num_lock * 255); - led_matrix_set_value(2, led_state.scroll_lock * 255); + led_matrix_set_value(0, host_keyboard_led_state().caps_lock * 255); + led_matrix_set_value(1, host_keyboard_led_state().num_lock * 255); + led_matrix_set_value(2, host_keyboard_led_state().scroll_lock * 255); } return res; } @@ -67,8 +70,8 @@ layer_state_t layer_state_set_kb(layer_state_t state) { break; case 2: led_matrix_set_value(3, 0); - led_matrix_set_value(4, 255; - led_matrix_set_value(5, 0; + led_matrix_set_value(4, 255); + led_matrix_set_value(5, 0); led_matrix_set_value(6, 0); led_matrix_set_value(7, 0); break; From 624bf9a9ec79fe6aa709c04d8ba8bac6ef34f804 Mon Sep 17 00:00:00 2001 From: toril940 Date: Thu, 16 Nov 2023 22:20:36 +0000 Subject: [PATCH 4/4] 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