forked from qmk/qmk_firmware
-
Notifications
You must be signed in to change notification settings - Fork 107
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bastard Keyboards: upstream recent changes (qmk#18903)
* bastardkb: cleanup blackpill configuration Fixes #17 * bastardkb: fix splinky configuration The pinout of the splinky changed between the last beta batch, and the production one. This commit updates the keyboard definition to support the new pinout by default, while offering backward compatibility. Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production pinout. Fixes #15 * bastardkb: add support for STeMCell * Update scylla/tbkmini/skeletyl outdated readmes * bastardkb/dilemma: enable circular scroll * bastardkb/dilemma: add initial version of the `via` keymap * bastardkb/dilemma/assembled: add new keyboard Fixes #20 * bastardkb/dilemma: remove elite-c * Initial support for the Dilemma 3x5+3 Assembled RGB * Address code review comments * Address more comments * Address review comments * Address more nits * bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
- Loading branch information
Showing
139 changed files
with
2,792 additions
and
300 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,4 +39,4 @@ | |
#define RGB_DI_PIN D3 | ||
|
||
/* PMW3360 settings. */ | ||
#define PMW33XX_CS_PIN B0 | ||
#define POINTING_DEVICE_CS_PIN B0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,4 +33,4 @@ | |
#define RGB_DI_PIN D3 | ||
|
||
/* PMW3360 settings. */ | ||
#define PMW33XX_CS_PIN F0 | ||
#define POINTING_DEVICE_CS_PIN F0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# Splinky controller | ||
|
||
The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040. | ||
|
||
See https://github.com/plut0nium/0xB2/#releases to figure out the right version | ||
for you (v2 and v3) supported. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
# Intentionally blank so that QMK detects this folder as a valid keyboard | ||
# parameter. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* | ||
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly) | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#pragma once | ||
|
||
/* Key matrix configuration. */ | ||
#define MATRIX_COL_PINS \ | ||
{ GP28, GP21, GP6, GP7, GP8 } | ||
|
||
/* SPI & PMW3360 settings. */ | ||
#define SPI_SCK_PIN GP22 | ||
#define SPI_MOSI_PIN GP23 | ||
#define POINTING_DEVICE_CS_PIN GP16 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
# Intentionally blank so that QMK detects this folder as a valid keyboard | ||
# parameter. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/* | ||
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly) | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#pragma once | ||
|
||
/* Key matrix configuration. */ | ||
#define MATRIX_ROW_PINS \ | ||
{ F7, C6, D4, B5 } | ||
#define MATRIX_COL_PINS \ | ||
{ F5, B6, D7, E6, B4 } | ||
|
||
/* Handedness. */ | ||
#define MASTER_RIGHT | ||
|
||
// To use the handedness pin, resistors need to be installed on the adapter PCB. | ||
// If so, uncomment the following code, and undefine MASTER_RIGHT above. | ||
// #define A0 PAL_LINE(GPIOA, 0) | ||
// #define SPLIT_HAND_PIN A0 | ||
// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. | ||
|
||
/* serial.c configuration (for split keyboard). */ | ||
#define SOFT_SERIAL_PIN D2 | ||
|
||
/* RGB settings. */ | ||
#define RGB_DI_PIN D3 | ||
#define WS2812_PWM_DRIVER PWMD2 | ||
#define WS2812_PWM_CHANNEL 4 | ||
#define WS2812_PWM_PAL_MODE 1 | ||
#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 | ||
#define WS2812_DMA_CHANNEL 3 | ||
|
||
/* CRC. */ | ||
#define CRC8_USE_TABLE | ||
#define CRC8_OPTIMIZE_SPEED | ||
|
||
/* SPI config for pmw3360 sensor. */ | ||
#define SPI_DRIVER SPID1 | ||
#define SPI_SCK_PIN B1 | ||
#define SPI_SCK_PAL_MODE 5 | ||
#define SPI_MOSI_PIN B2 | ||
#define SPI_MOSI_PAL_MODE 5 | ||
#define SPI_MISO_PIN B3 | ||
#define SPI_MISO_PAL_MODE 5 | ||
|
||
/* PMW3360 settings. */ | ||
#define A1 PAL_LINE(GPIOA, 1) | ||
#define POINTING_DEVICE_CS_PIN A1 | ||
#define PMW3360_CS_MODE 3 | ||
#define PMW3360_CS_DIVISOR 64 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
/* | ||
* Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly) | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#define HAL_USE_PWM TRUE | ||
#define HAL_USE_SERIAL TRUE | ||
#define HAL_USE_SPI TRUE | ||
|
||
#include_next <halconf.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"keyboard_name": "Charybdis Nano (3x5) STeMCell", | ||
"usb": { | ||
"device_version": "2.0.0" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
/* | ||
* Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly) | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#include_next <mcuconf.h> | ||
|
||
#undef STM32_SPI_USE_SPI1 | ||
#define STM32_SPI_USE_SPI1 TRUE | ||
|
||
#undef STM32_SERIAL_USE_USART1 | ||
#define STM32_SERIAL_USE_USART1 FALSE | ||
|
||
#undef STM32_PWM_USE_TIM2 | ||
#define STM32_PWM_USE_TIM2 TRUE | ||
|
||
#undef STM32_ST_USE_TIMER | ||
#define STM32_ST_USE_TIMER 5 |
Oops, something went wrong.