From 56ebd3b8297db4dc2c1e1f36ef522e98468a5988 Mon Sep 17 00:00:00 2001 From: Dasky Date: Thu, 25 Jul 2024 22:51:32 +0100 Subject: Rename promicro_rp2040 converter to sparkfun_pm2040 (#24192) --- docs/ChangeLog/20240825/PR24192.md | 19 ++++++++++++ docs/feature_converters.md | 8 ++--- .../promicro_to_promicro_rp2040/_pin_defs.h | 36 ---------------------- .../promicro_to_promicro_rp2040/converter.mk | 9 ------ .../promicro_to_promicro_rp2040/pre_converter.mk | 2 ++ .../promicro_to_sparkfun_pm2040/_pin_defs.h | 36 ++++++++++++++++++++++ .../promicro_to_sparkfun_pm2040/converter.mk | 9 ++++++ 7 files changed, 70 insertions(+), 49 deletions(-) create mode 100644 docs/ChangeLog/20240825/PR24192.md delete mode 100644 platforms/chibios/converters/promicro_to_promicro_rp2040/_pin_defs.h delete mode 100644 platforms/chibios/converters/promicro_to_promicro_rp2040/converter.mk create mode 100644 platforms/chibios/converters/promicro_to_promicro_rp2040/pre_converter.mk create mode 100644 platforms/chibios/converters/promicro_to_sparkfun_pm2040/_pin_defs.h create mode 100644 platforms/chibios/converters/promicro_to_sparkfun_pm2040/converter.mk diff --git a/docs/ChangeLog/20240825/PR24192.md b/docs/ChangeLog/20240825/PR24192.md new file mode 100644 index 0000000000..31f7a97379 --- /dev/null +++ b/docs/ChangeLog/20240825/PR24192.md @@ -0,0 +1,19 @@ +## Changes requiring user action + +### SparkFun Pro Micro RP2040 converter renamed + +The converter for the SparkFun Pro Micro RP2040 has been renamed. + +from: + +``` +promicro_rp2040 +``` + +to: + +```c +sparkfun_rp2040 +``` + +This change was made to avoid confusion between the clones named ProMicro RP2040 and the SparkFun Pro Micro RP2040. The clones should be using the `rp2040_ce` option. diff --git a/docs/feature_converters.md b/docs/feature_converters.md index 229d1007ab..0021c34e51 100644 --- a/docs/feature_converters.md +++ b/docs/feature_converters.md @@ -10,7 +10,7 @@ The following converters are available at this time: |------------|-------------------| | `promicro` | `proton_c` | | `promicro` | `kb2040` | -| `promicro` | `promicro_rp2040` | +| `promicro` | `sparkfun_pm2040` | | `promicro` | `blok` | | `promicro` | `bit_c_pro` | | `promicro` | `stemcell` | @@ -77,7 +77,7 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co |------------------------------------------------------------------------------------------|-------------------| | [Proton C](https://qmk.fm/proton-c/) | `proton_c` | | [Adafruit KB2040](https://learn.adafruit.com/adafruit-kb2040) | `kb2040` | -| [SparkFun Pro Micro - RP2040](https://www.sparkfun.com/products/18288) | `promicro_rp2040` | +| [SparkFun Pro Micro - RP2040](https://www.sparkfun.com/products/18288) | `sparkfun_pm2040` | | [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622) | `blok` | | [Bit-C PRO](https://nullbits.co/bit-c-pro) | `bit_c_pro` | | [STeMCell](https://github.com/megamind4089/STeMCell) | `stemcell` | @@ -94,7 +94,7 @@ Converter summary: |-------------------|---------------------------------|------------------------------|-------------------------------------| | `proton_c` | `-e CONVERT_TO=proton_c` | `CONVERT_TO=proton_c` | `#ifdef CONVERT_TO_PROTON_C` | | `kb2040` | `-e CONVERT_TO=kb2040` | `CONVERT_TO=kb2040` | `#ifdef CONVERT_TO_KB2040` | -| `promicro_rp2040` | `-e CONVERT_TO=promicro_rp2040` | `CONVERT_TO=promicro_rp2040` | `#ifdef CONVERT_TO_PROMICRO_RP2040` | +| `sparkfun_pm2040` | `-e CONVERT_TO=sparkfun_pm2040` | `CONVERT_TO=sparkfun_pm2040` | `#ifdef CONVERT_TO_SPARKFUN_PM2040` | | `blok` | `-e CONVERT_TO=blok` | `CONVERT_TO=blok` | `#ifdef CONVERT_TO_BLOK` | | `bit_c_pro` | `-e CONVERT_TO=bit_c_pro` | `CONVERT_TO=bit_c_pro` | `#ifdef CONVERT_TO_BIT_C_PRO` | | `stemcell` | `-e CONVERT_TO=stemcell` | `CONVERT_TO=stemcell` | `#ifdef CONVERT_TO_STEMCELL` | @@ -135,7 +135,7 @@ The following defaults are based on what has been implemented for [RP2040](platf | USB Host (e.g. USB-USB converter) | Not supported (USB host code is AVR specific and is not currently supported on ARM) | | [Split keyboards](features/split_keyboard) | Partial via `PIO` vendor driver - heavily dependent on enabled features | -### SparkFun Pro Micro - RP2040, Blok, Bit-C PRO and Michi {#promicro_rp2040 } +### SparkFun Pro Micro - RP2040, Blok, Bit-C PRO and Michi {#sparkfun_pm2040 } Feature set is identical to [Adafruit KB2040](#kb2040). diff --git a/platforms/chibios/converters/promicro_to_promicro_rp2040/_pin_defs.h b/platforms/chibios/converters/promicro_to_promicro_rp2040/_pin_defs.h deleted file mode 100644 index 0a1f4112a3..0000000000 --- a/platforms/chibios/converters/promicro_to_promicro_rp2040/_pin_defs.h +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -// Left side (front) -#define D3 0U -#define D2 1U -// GND -// GND -#define D1 2U -#define D0 3U -#define D4 4U -#define C6 5U -#define D7 6U -#define E6 7U -#define B4 8U -#define B5 9U - -// Right side (front) -// RAW -// GND -// RESET -// VCC -#define F4 29U -#define F5 28U -#define F6 27U -#define F7 26U -#define B1 22U -#define B3 20U -#define B2 23U -#define B6 21U - -// LEDs (Mapped to QT connector to avoid collisions with button/neopixel) -#define D5 17U -#define B0 16U diff --git a/platforms/chibios/converters/promicro_to_promicro_rp2040/converter.mk b/platforms/chibios/converters/promicro_to_promicro_rp2040/converter.mk deleted file mode 100644 index 03863eeb02..0000000000 --- a/platforms/chibios/converters/promicro_to_promicro_rp2040/converter.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Sparkfun Pro Micro RP2040 MCU settings for converting AVR projects -MCU := RP2040 -BOARD := QMK_PM2040 -BOOTLOADER := rp2040 - -# These are defaults based on what has been implemented for RP2040 boards -SERIAL_DRIVER ?= vendor -WS2812_DRIVER ?= vendor -BACKLIGHT_DRIVER ?= software diff --git a/platforms/chibios/converters/promicro_to_promicro_rp2040/pre_converter.mk b/platforms/chibios/converters/promicro_to_promicro_rp2040/pre_converter.mk new file mode 100644 index 0000000000..303d3135ce --- /dev/null +++ b/platforms/chibios/converters/promicro_to_promicro_rp2040/pre_converter.mk @@ -0,0 +1,2 @@ +CONVERTER:=platforms/chibios/converters/promicro_to_sparkfun_pm2040 +ACTIVE_CONVERTER:=sparkfun_pm2040 diff --git a/platforms/chibios/converters/promicro_to_sparkfun_pm2040/_pin_defs.h b/platforms/chibios/converters/promicro_to_sparkfun_pm2040/_pin_defs.h new file mode 100644 index 0000000000..0a1f4112a3 --- /dev/null +++ b/platforms/chibios/converters/promicro_to_sparkfun_pm2040/_pin_defs.h @@ -0,0 +1,36 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +// Left side (front) +#define D3 0U +#define D2 1U +// GND +// GND +#define D1 2U +#define D0 3U +#define D4 4U +#define C6 5U +#define D7 6U +#define E6 7U +#define B4 8U +#define B5 9U + +// Right side (front) +// RAW +// GND +// RESET +// VCC +#define F4 29U +#define F5 28U +#define F6 27U +#define F7 26U +#define B1 22U +#define B3 20U +#define B2 23U +#define B6 21U + +// LEDs (Mapped to QT connector to avoid collisions with button/neopixel) +#define D5 17U +#define B0 16U diff --git a/platforms/chibios/converters/promicro_to_sparkfun_pm2040/converter.mk b/platforms/chibios/converters/promicro_to_sparkfun_pm2040/converter.mk new file mode 100644 index 0000000000..03863eeb02 --- /dev/null +++ b/platforms/chibios/converters/promicro_to_sparkfun_pm2040/converter.mk @@ -0,0 +1,9 @@ +# Sparkfun Pro Micro RP2040 MCU settings for converting AVR projects +MCU := RP2040 +BOARD := QMK_PM2040 +BOOTLOADER := rp2040 + +# These are defaults based on what has been implemented for RP2040 boards +SERIAL_DRIVER ?= vendor +WS2812_DRIVER ?= vendor +BACKLIGHT_DRIVER ?= software -- cgit v1.2.3