From f021d3c4bb50b4804777fa0fc3fac7cb2372796a Mon Sep 17 00:00:00 2001 From: Petr Sedlacek Date: Thu, 1 Feb 2024 09:49:57 +0100 Subject: [Keyboard] Add Cantor Pro Frood v2 --- keyboards/42keebs/cantor_pro_frood/README.md | 31 +++++++++++++++++++++++++ keyboards/42keebs/cantor_pro_frood/config.h | 13 +++++++---- keyboards/42keebs/cantor_pro_frood/info.json | 3 +-- keyboards/42keebs/cantor_pro_frood/readme.md | 31 ------------------------- keyboards/42keebs/cantor_pro_frood/rules.mk | 1 + keyboards/42keebs/cantor_pro_frood/v1/info.json | 5 ++++ keyboards/42keebs/cantor_pro_frood/v1/rules.mk | 0 keyboards/42keebs/cantor_pro_frood/v1/v1.h | 6 +++++ keyboards/42keebs/cantor_pro_frood/v2/info.json | 8 +++++++ keyboards/42keebs/cantor_pro_frood/v2/rules.mk | 0 keyboards/42keebs/cantor_pro_frood/v2/v2.h | 0 11 files changed, 61 insertions(+), 37 deletions(-) create mode 100644 keyboards/42keebs/cantor_pro_frood/README.md delete mode 100644 keyboards/42keebs/cantor_pro_frood/readme.md create mode 100644 keyboards/42keebs/cantor_pro_frood/v1/info.json create mode 100644 keyboards/42keebs/cantor_pro_frood/v1/rules.mk create mode 100644 keyboards/42keebs/cantor_pro_frood/v1/v1.h create mode 100644 keyboards/42keebs/cantor_pro_frood/v2/info.json create mode 100644 keyboards/42keebs/cantor_pro_frood/v2/rules.mk create mode 100644 keyboards/42keebs/cantor_pro_frood/v2/v2.h diff --git a/keyboards/42keebs/cantor_pro_frood/README.md b/keyboards/42keebs/cantor_pro_frood/README.md new file mode 100644 index 0000000000..a76a3e0899 --- /dev/null +++ b/keyboards/42keebs/cantor_pro_frood/README.md @@ -0,0 +1,31 @@ +# Cantor Pro Frood + +![Cantor Pro Frood](https://42keebs.eu/wp-content/uploads/2022/09/2024-02-01-15-01-58-551-scaled.jpg) + +The Cantor Pro Frood keyboard is a 42 key diodeless split keyboard, designed with simplicity in mind. It based on the original [Cantor](https://github.com/diepala/cantor) by [Diego Palacios](https://github.com/diepala), itself inspired by the popular [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. + +Cantor Pro Frood, as the name suggests, uses the powerful but affordable [42. Keebs Frood](https://github.com/piit79/Frood) RP2040-based controller instead of the STM32-based Black Pill. Apart from this main change, it also has a slightly smaller (narrower) form factor thanks to the smaller controller. It also includes a FR4 and laser cut switch and bottom plates. + +* Keyboard Maintainer: [piit79](https://github.com/piit79) +* Hardware Supported: 42. Keebs Frood RP2040-based MCU +* Hardware Availability: [42. Keebs](https://42keebs.eu/shop/kits/pro-micro-based/cantor-pro-frood-40-low-profile-hotswap-split-ergo-kit/) + +Make example for this keyboard (after setting up your build environment): + + qmk compile -kb 42keebs/cantor_pro_frood -km vial + +To flash the firmware .uf2 file, reset the Frood to the bootloader mode (see below) which will present it as a USB mass storage device (a.k.a. USB flash) and copy the file to the device. + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 4 ways: + +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. For the right side, hold the top right key and plug the keyboard. +* **Physical reset button**: + * Press and hold the BOOT button. + * Press and release the RESET button. + * Release the BOOT button. +* **Double-tap the RESET button** +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/42keebs/cantor_pro_frood/config.h b/keyboards/42keebs/cantor_pro_frood/config.h index bf388864b8..c52ad7a418 100644 --- a/keyboards/42keebs/cantor_pro_frood/config.h +++ b/keyboards/42keebs/cantor_pro_frood/config.h @@ -10,8 +10,13 @@ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 -#define SERIAL_USART_FULL_DUPLEX -#define SERIAL_USART_TX_PIN GP8 -#define SERIAL_USART_RX_PIN GP9 - #define SPLIT_HAND_PIN GP19 + +/************************************************** +** Include headers specific to keyboard revision ** +**************************************************/ +#if defined(KEYBOARD_42keebs_cantor_pro_frood_v1) +# include "v1.h" +#elif defined(KEYBOARD_42keebs_cantor_pro_frood_v2) +# include "v2.h" +#endif diff --git a/keyboards/42keebs/cantor_pro_frood/info.json b/keyboards/42keebs/cantor_pro_frood/info.json index a9d3e7277b..53fb0325b2 100644 --- a/keyboards/42keebs/cantor_pro_frood/info.json +++ b/keyboards/42keebs/cantor_pro_frood/info.json @@ -15,8 +15,7 @@ "bootloader": "rp2040", "usb": { "vid": "0x1209", - "pid": "0x4204", - "device_version": "1.0.0" + "pid": "0x4204" }, "bootmagic": { "matrix": [4, 5] diff --git a/keyboards/42keebs/cantor_pro_frood/readme.md b/keyboards/42keebs/cantor_pro_frood/readme.md deleted file mode 100644 index 48d8ff19de..0000000000 --- a/keyboards/42keebs/cantor_pro_frood/readme.md +++ /dev/null @@ -1,31 +0,0 @@ -# Cantor Pro Frood - -![cantor](https://i.imgur.com/Uvxm3zVh.jpg) - -The Cantor Pro Frood keyboard is a 42 key diodeless split keyboard, designed with simplicity in mind. It based on the original [Cantor](https://github.com/diepala/cantor) by [Diego Palacios](https://github.com/diepala), itself inspired by the popular [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. - -Cantor Pro Frood, as the name suggests, uses the powerful but affordable [42. Keebs Frood](https://github.com/piit79/Frood) RP2040-based controller instead of the STM32-based Black Pill. Apart from this main change, it also has a slightly smaller (narrower) form factor thanks to the smaller controller. It also includes a FR4 and laser cut switch and bottom plates. - -* Keyboard Maintainer: [piit79](https://github.com/piit79) -* Hardware Supported: 42. Keebs Frood RP2040-based MCU -* Hardware Availability: [42. Keebs](https://42keebs.eu/shop/kits/pro-micro-based/cantor-pro-frood-40-low-profile-hotswap-split-ergo-kit/) - -Make example for this keyboard (after setting up your build environment): - - make 42keebs/cantor_pro_frood:vial - -To flash the firmware .uf2 file, reset the Frood to the bootloader mode (see below) which will present it as a USB mass storage device (a.k.a. USB flash) and copy the file to the device. - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). - -## Bootloader - -Enter the bootloader in 4 ways: - -* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. For the right side, hold the top right key and plug the keyboard. -* **Physical reset button**: - * Press and hold the BOOT button. - * Press and release the RESET button. - * Release the BOOT button. -* **Double-tap the RESET button** -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/42keebs/cantor_pro_frood/rules.mk b/keyboards/42keebs/cantor_pro_frood/rules.mk index 161ec22b16..a31bf5d95f 100644 --- a/keyboards/42keebs/cantor_pro_frood/rules.mk +++ b/keyboards/42keebs/cantor_pro_frood/rules.mk @@ -1 +1,2 @@ +DEFAULT_FOLDER=42keebs/cantor_pro_frood/v2 SERIAL_DRIVER = vendor diff --git a/keyboards/42keebs/cantor_pro_frood/v1/info.json b/keyboards/42keebs/cantor_pro_frood/v1/info.json new file mode 100644 index 0000000000..ad889c2304 --- /dev/null +++ b/keyboards/42keebs/cantor_pro_frood/v1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "1.0.0" + } +} diff --git a/keyboards/42keebs/cantor_pro_frood/v1/rules.mk b/keyboards/42keebs/cantor_pro_frood/v1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/42keebs/cantor_pro_frood/v1/v1.h b/keyboards/42keebs/cantor_pro_frood/v1/v1.h new file mode 100644 index 0000000000..4acb1b0b8a --- /dev/null +++ b/keyboards/42keebs/cantor_pro_frood/v1/v1.h @@ -0,0 +1,6 @@ +// Copyright 2024 piit79 +// SPDX-License-Identifier: GPL-2.0-or-later + +#define SERIAL_USART_FULL_DUPLEX +#define SERIAL_USART_TX_PIN GP8 +#define SERIAL_USART_RX_PIN GP9 diff --git a/keyboards/42keebs/cantor_pro_frood/v2/info.json b/keyboards/42keebs/cantor_pro_frood/v2/info.json new file mode 100644 index 0000000000..f3a757c9c3 --- /dev/null +++ b/keyboards/42keebs/cantor_pro_frood/v2/info.json @@ -0,0 +1,8 @@ +{ + "usb": { + "device_version": "2.0.0" + }, + "split": { + "soft_serial_pin": "GP9" + } +} diff --git a/keyboards/42keebs/cantor_pro_frood/v2/rules.mk b/keyboards/42keebs/cantor_pro_frood/v2/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/42keebs/cantor_pro_frood/v2/v2.h b/keyboards/42keebs/cantor_pro_frood/v2/v2.h new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3