diff options
| -rw-r--r-- | data/mappings/defaults.hjson | 5 | ||||
| -rw-r--r-- | data/schemas/keyboard.jsonschema | 2 | ||||
| -rw-r--r-- | docs/feature_converters.md | 8 | ||||
| -rw-r--r-- | docs/squeezing_avr.md | 1 | ||||
| -rw-r--r-- | platforms/chibios/converters/elite_c_to_liatris/pre_converter.mk | 2 | ||||
| -rw-r--r-- | platforms/chibios/converters/promicro_to_liatris/pre_converter.mk | 2 | 
6 files changed, 18 insertions, 2 deletions
| diff --git a/data/mappings/defaults.hjson b/data/mappings/defaults.hjson index 93da6161d6..090cbe4be9 100644 --- a/data/mappings/defaults.hjson +++ b/data/mappings/defaults.hjson @@ -74,6 +74,11 @@              "processor": "RP2040",              "bootloader": "rp2040",              "board": "QMK_PM2040" +        }, +        "liatris": { +            "processor": "RP2040", +            "bootloader": "rp2040", +            "board": "QMK_PM2040"          }      }  } diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 2afc1ed516..2845af14f3 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -35,7 +35,7 @@          },          "development_board": {              "type": "string", -            "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4", "helios"] +            "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4", "helios", "liatris"]          },          "pin_compatible": {              "type": "string", diff --git a/docs/feature_converters.md b/docs/feature_converters.md index 9baac14e97..3871f77ee0 100644 --- a/docs/feature_converters.md +++ b/docs/feature_converters.md @@ -21,11 +21,13 @@ Currently the following converters are available:  | `promicro` | `rp2040_ce`       |  | `promicro` | `elite_pi`        |  | `promicro` | `helios`          | +| `promicro` | `liatris`         |  | `promicro` | `michi`           |  | `elite_c`  | `stemcell`        |  | `elite_c`  | `rp2040_ce`       |  | `elite_c`  | `elite_pi`        |  | `elite_c`  | `helios`          | +| `elite_c`  | `liatris`         |  See below for more in depth information on each converter. @@ -88,6 +90,7 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co  | [customMK Bonsai C4](https://shop.custommk.com/products/bonsai-c4-microcontroller-board) | `bonsai_c4`       |  | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040)         | `elite_pi`        |  | [0xCB Helios](https://keeb.supply/products/0xcb-helios)                                  | `helios`          | +| [Liatris](https://splitkb.com/products/liatris)                                          | `liatris`         |  | [Michi](https://github.com/ci-bus/michi-promicro-rp2040)                                 | `michi`           |  Converter summary: @@ -104,6 +107,7 @@ Converter summary:  | `rp2040_ce`       | `-e CONVERT_TO=rp2040_ce`       | `CONVERT_TO=rp2040_ce`       | `#ifdef CONVERT_TO_RP2040_CE`       |  | `elite_pi`        | `-e CONVERT_TO=elite_pi`        | `CONVERT_TO=elite_pi`        | `#ifdef CONVERT_TO_ELITE_PI`        |  | `helios`          | `-e CONVERT_TO=helios`          | `CONVERT_TO=helios`          | `#ifdef CONVERT_TO_HELIOS`          | +| `liatris`         | `-e CONVERT_TO=liatris`         | `CONVERT_TO=liatris`         | `#ifdef CONVERT_TO_LIATRIS`         |  | `michi`           | `-e CONVERT_TO=michi`           | `CONVERT_TO=michi`           | `#ifdef CONVERT_TO_MICHI`           |  ### Proton C :id=proton_c @@ -168,7 +172,7 @@ The Bonsai C4 only has one on-board LED (B2), and by default, both the Pro Micro  #define B0 PAL_LINE(GPIOA, 9)  ``` -### RP2040 Community Edition - Elite-Pi and Helios :id=rp2040_ce +### RP2040 Community Edition - Elite-Pi, Helios, and Liatris :id=rp2040_ce  Feature set currently identical to [Adafruit KB2040](#kb2040). @@ -185,6 +189,7 @@ If a board currently supported in QMK uses an [Elite-C](https://keeb.io/products  | [STeMCell](https://github.com/megamind4089/STeMCell)                             | `stemcell`        |  | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | `elite_pi`        |  | [0xCB Helios](https://keeb.supply/products/0xcb-helios)                          | `helios`          | +| [Liatris](https://splitkb.com/products/liatris)                                  | `liatris`         |  Converter summary: @@ -194,6 +199,7 @@ Converter summary:  | `rp2040_ce`       | `-e CONVERT_TO=rp2040_ce`       | `CONVERT_TO=rp2040_ce`       | `#ifdef CONVERT_TO_RP2040_CE`       |  | `elite_pi`        | `-e CONVERT_TO=elite_pi`        | `CONVERT_TO=elite_pi`        | `#ifdef CONVERT_TO_ELITE_PI`        |  | `helios`          | `-e CONVERT_TO=helios`          | `CONVERT_TO=helios`          | `#ifdef CONVERT_TO_HELIOS`          | +| `liatris`         | `-e CONVERT_TO=liatris`         | `CONVERT_TO=liatris`         | `#ifdef CONVERT_TO_LIATRIS`         |  ### STeMCell :id=stemcell_elite diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md index 62db7f2471..ce9e43cdae 100644 --- a/docs/squeezing_avr.md +++ b/docs/squeezing_avr.md @@ -194,6 +194,7 @@ That said, there are a number of Pro Micro replacements with ARM controllers:  * [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622)  * [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040)  * [0xCB Helios](https://keeb.supply/products/0xcb-helios) ([Open Source](https://github.com/0xCB-dev/0xCB-Helios), DIY/PCBA/Shop) +* [Liatris](https://splitkb.com/products/liatris)  * [Michi](https://github.com/ci-bus/michi-promicro-rp2040)  There are other, non-Pro Micro compatible boards out there. The most popular being: diff --git a/platforms/chibios/converters/elite_c_to_liatris/pre_converter.mk b/platforms/chibios/converters/elite_c_to_liatris/pre_converter.mk new file mode 100644 index 0000000000..b38823fa5f --- /dev/null +++ b/platforms/chibios/converters/elite_c_to_liatris/pre_converter.mk @@ -0,0 +1,2 @@ +CONVERTER:=platforms/chibios/converters/elite_c_to_rp2040_ce +ACTIVE_CONVERTER:=rp2040_ce diff --git a/platforms/chibios/converters/promicro_to_liatris/pre_converter.mk b/platforms/chibios/converters/promicro_to_liatris/pre_converter.mk new file mode 100644 index 0000000000..7b3130a5e9 --- /dev/null +++ b/platforms/chibios/converters/promicro_to_liatris/pre_converter.mk @@ -0,0 +1,2 @@ +CONVERTER:=platforms/chibios/converters/promicro_to_rp2040_ce +ACTIVE_CONVERTER:=rp2040_ce | 
