diff options
| author | leah-splitkb <103112489+leah-splitkb@users.noreply.github.com> | 2023-03-10 21:47:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-10 12:47:10 -0800 |
| commit | 46bbb81dd2aeee48ed571e78d8315bf94cc3cce8 (patch) | |
| tree | bd5880713e9c576de78495fe166da83335a058be | |
| parent | e933e0411f442fa411d3d5ec488180fee241e2ef (diff) | |
Add RP2040 Community Edition alias for Liatris (#19966)
| -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 @@ | |||
| 74 | "processor": "RP2040", | 74 | "processor": "RP2040", |
| 75 | "bootloader": "rp2040", | 75 | "bootloader": "rp2040", |
| 76 | "board": "QMK_PM2040" | 76 | "board": "QMK_PM2040" |
| 77 | }, | ||
| 78 | "liatris": { | ||
| 79 | "processor": "RP2040", | ||
| 80 | "bootloader": "rp2040", | ||
| 81 | "board": "QMK_PM2040" | ||
| 77 | } | 82 | } |
| 78 | } | 83 | } |
| 79 | } | 84 | } |
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 @@ | |||
| 35 | }, | 35 | }, |
| 36 | "development_board": { | 36 | "development_board": { |
| 37 | "type": "string", | 37 | "type": "string", |
| 38 | "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"] | 38 | "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"] |
| 39 | }, | 39 | }, |
| 40 | "pin_compatible": { | 40 | "pin_compatible": { |
| 41 | "type": "string", | 41 | "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: | |||
| 21 | | `promicro` | `rp2040_ce` | | 21 | | `promicro` | `rp2040_ce` | |
| 22 | | `promicro` | `elite_pi` | | 22 | | `promicro` | `elite_pi` | |
| 23 | | `promicro` | `helios` | | 23 | | `promicro` | `helios` | |
| 24 | | `promicro` | `liatris` | | ||
| 24 | | `promicro` | `michi` | | 25 | | `promicro` | `michi` | |
| 25 | | `elite_c` | `stemcell` | | 26 | | `elite_c` | `stemcell` | |
| 26 | | `elite_c` | `rp2040_ce` | | 27 | | `elite_c` | `rp2040_ce` | |
| 27 | | `elite_c` | `elite_pi` | | 28 | | `elite_c` | `elite_pi` | |
| 28 | | `elite_c` | `helios` | | 29 | | `elite_c` | `helios` | |
| 30 | | `elite_c` | `liatris` | | ||
| 29 | 31 | ||
| 30 | See below for more in depth information on each converter. | 32 | See below for more in depth information on each converter. |
| 31 | 33 | ||
| @@ -88,6 +90,7 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co | |||
| 88 | | [customMK Bonsai C4](https://shop.custommk.com/products/bonsai-c4-microcontroller-board) | `bonsai_c4` | | 90 | | [customMK Bonsai C4](https://shop.custommk.com/products/bonsai-c4-microcontroller-board) | `bonsai_c4` | |
| 89 | | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | `elite_pi` | | 91 | | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | `elite_pi` | |
| 90 | | [0xCB Helios](https://keeb.supply/products/0xcb-helios) | `helios` | | 92 | | [0xCB Helios](https://keeb.supply/products/0xcb-helios) | `helios` | |
| 93 | | [Liatris](https://splitkb.com/products/liatris) | `liatris` | | ||
| 91 | | [Michi](https://github.com/ci-bus/michi-promicro-rp2040) | `michi` | | 94 | | [Michi](https://github.com/ci-bus/michi-promicro-rp2040) | `michi` | |
| 92 | 95 | ||
| 93 | Converter summary: | 96 | Converter summary: |
| @@ -104,6 +107,7 @@ Converter summary: | |||
| 104 | | `rp2040_ce` | `-e CONVERT_TO=rp2040_ce` | `CONVERT_TO=rp2040_ce` | `#ifdef CONVERT_TO_RP2040_CE` | | 107 | | `rp2040_ce` | `-e CONVERT_TO=rp2040_ce` | `CONVERT_TO=rp2040_ce` | `#ifdef CONVERT_TO_RP2040_CE` | |
| 105 | | `elite_pi` | `-e CONVERT_TO=elite_pi` | `CONVERT_TO=elite_pi` | `#ifdef CONVERT_TO_ELITE_PI` | | 108 | | `elite_pi` | `-e CONVERT_TO=elite_pi` | `CONVERT_TO=elite_pi` | `#ifdef CONVERT_TO_ELITE_PI` | |
| 106 | | `helios` | `-e CONVERT_TO=helios` | `CONVERT_TO=helios` | `#ifdef CONVERT_TO_HELIOS` | | 109 | | `helios` | `-e CONVERT_TO=helios` | `CONVERT_TO=helios` | `#ifdef CONVERT_TO_HELIOS` | |
| 110 | | `liatris` | `-e CONVERT_TO=liatris` | `CONVERT_TO=liatris` | `#ifdef CONVERT_TO_LIATRIS` | | ||
| 107 | | `michi` | `-e CONVERT_TO=michi` | `CONVERT_TO=michi` | `#ifdef CONVERT_TO_MICHI` | | 111 | | `michi` | `-e CONVERT_TO=michi` | `CONVERT_TO=michi` | `#ifdef CONVERT_TO_MICHI` | |
| 108 | 112 | ||
| 109 | ### Proton C :id=proton_c | 113 | ### 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 | |||
| 168 | #define B0 PAL_LINE(GPIOA, 9) | 172 | #define B0 PAL_LINE(GPIOA, 9) |
| 169 | ``` | 173 | ``` |
| 170 | 174 | ||
| 171 | ### RP2040 Community Edition - Elite-Pi and Helios :id=rp2040_ce | 175 | ### RP2040 Community Edition - Elite-Pi, Helios, and Liatris :id=rp2040_ce |
| 172 | 176 | ||
| 173 | Feature set currently identical to [Adafruit KB2040](#kb2040). | 177 | Feature set currently identical to [Adafruit KB2040](#kb2040). |
| 174 | 178 | ||
| @@ -185,6 +189,7 @@ If a board currently supported in QMK uses an [Elite-C](https://keeb.io/products | |||
| 185 | | [STeMCell](https://github.com/megamind4089/STeMCell) | `stemcell` | | 189 | | [STeMCell](https://github.com/megamind4089/STeMCell) | `stemcell` | |
| 186 | | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | `elite_pi` | | 190 | | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | `elite_pi` | |
| 187 | | [0xCB Helios](https://keeb.supply/products/0xcb-helios) | `helios` | | 191 | | [0xCB Helios](https://keeb.supply/products/0xcb-helios) | `helios` | |
| 192 | | [Liatris](https://splitkb.com/products/liatris) | `liatris` | | ||
| 188 | 193 | ||
| 189 | Converter summary: | 194 | Converter summary: |
| 190 | 195 | ||
| @@ -194,6 +199,7 @@ Converter summary: | |||
| 194 | | `rp2040_ce` | `-e CONVERT_TO=rp2040_ce` | `CONVERT_TO=rp2040_ce` | `#ifdef CONVERT_TO_RP2040_CE` | | 199 | | `rp2040_ce` | `-e CONVERT_TO=rp2040_ce` | `CONVERT_TO=rp2040_ce` | `#ifdef CONVERT_TO_RP2040_CE` | |
| 195 | | `elite_pi` | `-e CONVERT_TO=elite_pi` | `CONVERT_TO=elite_pi` | `#ifdef CONVERT_TO_ELITE_PI` | | 200 | | `elite_pi` | `-e CONVERT_TO=elite_pi` | `CONVERT_TO=elite_pi` | `#ifdef CONVERT_TO_ELITE_PI` | |
| 196 | | `helios` | `-e CONVERT_TO=helios` | `CONVERT_TO=helios` | `#ifdef CONVERT_TO_HELIOS` | | 201 | | `helios` | `-e CONVERT_TO=helios` | `CONVERT_TO=helios` | `#ifdef CONVERT_TO_HELIOS` | |
| 202 | | `liatris` | `-e CONVERT_TO=liatris` | `CONVERT_TO=liatris` | `#ifdef CONVERT_TO_LIATRIS` | | ||
| 197 | 203 | ||
| 198 | ### STeMCell :id=stemcell_elite | 204 | ### STeMCell :id=stemcell_elite |
| 199 | 205 | ||
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: | |||
| 194 | * [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622) | 194 | * [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622) |
| 195 | * [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | 195 | * [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) |
| 196 | * [0xCB Helios](https://keeb.supply/products/0xcb-helios) ([Open Source](https://github.com/0xCB-dev/0xCB-Helios), DIY/PCBA/Shop) | 196 | * [0xCB Helios](https://keeb.supply/products/0xcb-helios) ([Open Source](https://github.com/0xCB-dev/0xCB-Helios), DIY/PCBA/Shop) |
| 197 | * [Liatris](https://splitkb.com/products/liatris) | ||
| 197 | * [Michi](https://github.com/ci-bus/michi-promicro-rp2040) | 198 | * [Michi](https://github.com/ci-bus/michi-promicro-rp2040) |
| 198 | 199 | ||
| 199 | There are other, non-Pro Micro compatible boards out there. The most popular being: | 200 | 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 @@ | |||
| 1 | CONVERTER:=platforms/chibios/converters/elite_c_to_rp2040_ce | ||
| 2 | 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 @@ | |||
| 1 | CONVERTER:=platforms/chibios/converters/promicro_to_rp2040_ce | ||
| 2 | ACTIVE_CONVERTER:=rp2040_ce | ||
