[Keymap] Add oled improvements and cnano keymap for drashna (#16133)
This commit is contained in:
		
							parent
							
								
									3555ee0555
								
							
						
					
					
						commit
						941b1d35b8
					
				
					 22 changed files with 797 additions and 189 deletions
				
			
		
							
								
								
									
										38
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/chconf.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										38
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/chconf.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,38 @@
 | 
			
		|||
/* Copyright 2020 QMK
 | 
			
		||||
 *
 | 
			
		||||
 * 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/>.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * This file was auto-generated by:
 | 
			
		||||
 *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#define CH_CFG_ST_FREQUENCY 10000
 | 
			
		||||
 | 
			
		||||
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 | 
			
		||||
 | 
			
		||||
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
 | 
			
		||||
 | 
			
		||||
#define CH_CFG_FACTORY_SEMAPHORES TRUE
 | 
			
		||||
 | 
			
		||||
#define CH_CFG_FACTORY_MAILBOXES TRUE
 | 
			
		||||
 | 
			
		||||
#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
 | 
			
		||||
 | 
			
		||||
#define CH_CFG_FACTORY_PIPES TRUE
 | 
			
		||||
 | 
			
		||||
#include_next <chconf.h>
 | 
			
		||||
							
								
								
									
										109
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										109
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,109 @@
 | 
			
		|||
/*
 | 
			
		||||
 | 
			
		||||
Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
 | 
			
		||||
 | 
			
		||||
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
 | 
			
		||||
 | 
			
		||||
#undef PRODUCT
 | 
			
		||||
#define PRODUCT Charybdis Nano (Blackpill)
 | 
			
		||||
 | 
			
		||||
#undef MATRIX_ROW_PINS
 | 
			
		||||
#define MATRIX_ROW_PINS \
 | 
			
		||||
    { B12, B13, B14, B15 }
 | 
			
		||||
#undef MATRIX_COL_PINS
 | 
			
		||||
#define MATRIX_COL_PINS \
 | 
			
		||||
    { A15, B3, B4, B5, B6 }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#undef MATRIX_ROW_PINS_RIGHT
 | 
			
		||||
#define MATRIX_ROW_PINS_RIGHT \
 | 
			
		||||
    { B12, B13, B14, B15 }
 | 
			
		||||
#undef MATRIX_COL_PINS_RIGHT
 | 
			
		||||
#define MATRIX_COL_PINS_RIGHT \
 | 
			
		||||
    { A15, B3, B4, B5, B6 }
 | 
			
		||||
 | 
			
		||||
#define USB_VBUS_PIN        B10
 | 
			
		||||
#define SPLIT_HAND_PIN      C14  // high = left, low = right
 | 
			
		||||
 | 
			
		||||
// WS2812 RGB LED strip input and number of LEDs
 | 
			
		||||
#undef RGB_DI_PIN
 | 
			
		||||
#define RGB_DI_PIN          A1
 | 
			
		||||
#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
 | 
			
		||||
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 | 
			
		||||
#define WS2812_PWM_DRIVER   PWMD2  // default: PWMD2
 | 
			
		||||
#define WS2812_PWM_CHANNEL  2      // default: 2
 | 
			
		||||
#define WS2812_PWM_PAL_MODE 1      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
 | 
			
		||||
#define WS2812_EXTERNAL_PULLUP
 | 
			
		||||
//#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
 | 
			
		||||
#define WS2812_DMA_STREAM   STM32_DMA1_STREAM7  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 | 
			
		||||
#define WS2812_DMA_CHANNEL  3                   // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 | 
			
		||||
#define WS2812_PWM_TARGET_PERIOD 800000
 | 
			
		||||
 | 
			
		||||
#define DEBUG_LED_PIN     C13
 | 
			
		||||
 | 
			
		||||
/* Audio config */
 | 
			
		||||
#define AUDIO_PIN          B1
 | 
			
		||||
#define AUDIO_PWM_DRIVER   PWMD3
 | 
			
		||||
#define AUDIO_PWM_CHANNEL  4
 | 
			
		||||
#define AUDIO_PWM_PAL_MODE 2
 | 
			
		||||
#define AUDIO_STATE_TIMER  GPTD4
 | 
			
		||||
 | 
			
		||||
/* serial.c configuration for split keyboard */
 | 
			
		||||
#undef SOFT_SERIAL_PIN
 | 
			
		||||
#define SERIAL_USART_FULL_DUPLEX  // Enable full duplex operation mode.
 | 
			
		||||
#define SERIAL_USART_TX_PIN      A2
 | 
			
		||||
#define SERIAL_USART_RX_PIN      A3
 | 
			
		||||
#define SERIAL_USART_DRIVER      SD2
 | 
			
		||||
#define SERIAL_USART_TX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 | 
			
		||||
#define SERIAL_USART_RX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 | 
			
		||||
#define SERIAL_USART_TIMEOUT     100  // USART driver timeout. default 100
 | 
			
		||||
// #define SERIAL_USART_PIN_SWAP // swap RX and TX pins on master
 | 
			
		||||
// To use the highest possible baudrate (3.75Mbit/s) uncomment the following
 | 
			
		||||
// line, this can result in dropped communications so lower the speed if there
 | 
			
		||||
// are many timeouts.
 | 
			
		||||
// #define SERIAL_USART_SPEED (STM32_PCLK2 >> 4)
 | 
			
		||||
 | 
			
		||||
#define CRC8_USE_TABLE
 | 
			
		||||
#define CRC8_OPTIMIZE_SPEED
 | 
			
		||||
 | 
			
		||||
/* spi config for eeprom and pmw3360 sensor */
 | 
			
		||||
#define SPI_DRIVER                           SPID1
 | 
			
		||||
#define SPI_SCK_PIN                          A5
 | 
			
		||||
#define SPI_SCK_PAL_MODE                     5
 | 
			
		||||
#define SPI_MOSI_PIN                         A7
 | 
			
		||||
#define SPI_MOSI_PAL_MODE                    5
 | 
			
		||||
#define SPI_MISO_PIN                         A6
 | 
			
		||||
#define SPI_MISO_PAL_MODE                    5
 | 
			
		||||
 | 
			
		||||
/* eeprom config */
 | 
			
		||||
#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
 | 
			
		||||
#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR    64
 | 
			
		||||
// #define EXTERNAL_EEPROM_BYTE_COUNT           8196
 | 
			
		||||
// #define EXTERNAL_EEPROM_PAGE_SIZE            32
 | 
			
		||||
// #define EXTERNAL_EEPROM_ADDRESS_SIZE         2
 | 
			
		||||
 | 
			
		||||
/* pmw3360 config  */
 | 
			
		||||
#undef PMW3360_CS_PIN
 | 
			
		||||
#define PMW3360_CS_PIN                       B0
 | 
			
		||||
#define PMW3360_SPI_MODE                     3
 | 
			
		||||
#define PMW3360_SPI_DIVISOR                  64
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#        define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200
 | 
			
		||||
#        define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400
 | 
			
		||||
#        define CHARYBDIS_MINIMUM_SNIPING_DPI 200
 | 
			
		||||
#        define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
 | 
			
		||||
							
								
								
									
										26
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,26 @@
 | 
			
		|||
/* Copyright 2020 Nick Brassel (tzarc)
 | 
			
		||||
 *
 | 
			
		||||
 *  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 3 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 <https://www.gnu.org/licenses/>.
 | 
			
		||||
 */
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#define HAL_USE_PWM     TRUE
 | 
			
		||||
#define HAL_USE_SERIAL  TRUE
 | 
			
		||||
#define HAL_USE_I2C     TRUE
 | 
			
		||||
#define HAL_USE_SPI     TRUE
 | 
			
		||||
#define SPI_USE_WAIT    TRUE
 | 
			
		||||
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 | 
			
		||||
#define HAL_USE_GPT     TRUE
 | 
			
		||||
 | 
			
		||||
#include_next <halconf.h>
 | 
			
		||||
							
								
								
									
										100
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										100
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,100 @@
 | 
			
		|||
/*
 | 
			
		||||
 * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
 | 
			
		||||
 * Copyright 2021 Drashna Jael're @drashna
 | 
			
		||||
 *
 | 
			
		||||
 * 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/>.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "drashna.h"
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_charybdis_3x5_wrapper(...) LAYOUT_charybdis_3x5(__VA_ARGS__)
 | 
			
		||||
#define LAYOUT_charybdis_3x5_base( \
 | 
			
		||||
    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
 | 
			
		||||
    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
 | 
			
		||||
    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
 | 
			
		||||
    ) \
 | 
			
		||||
    LAYOUT_charybdis_3x5 ( \
 | 
			
		||||
       K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A, \
 | 
			
		||||
       ALT_T(K11), K12,  K13,     K14,     GUI_T(K15),  LGUI_T(K16),    K17,     K18,     K19, LALT_T(K1A), \
 | 
			
		||||
       CTL_T(K21), K22,  K23,     K24,     K25,                K26,     K27,     K28,     K29, RCTL_T(K2A), \
 | 
			
		||||
                LSFT_T(KC_GRV), KC_SPC,  BK_LWER,              DL_RAIS, RSFT_T(KC_ENT) \
 | 
			
		||||
    )
 | 
			
		||||
#define LAYOUT_charybdis_3x5_base_wrapper(...)       LAYOUT_charybdis_3x5_base(__VA_ARGS__)
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
 | 
			
		||||
    [_DEFAULT_LAYER_1] = LAYOUT_charybdis_3x5_base_wrapper(
 | 
			
		||||
        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
 | 
			
		||||
        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
 | 
			
		||||
        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    [_DEFAULT_LAYER_2] = LAYOUT_charybdis_3x5_base_wrapper(
 | 
			
		||||
        ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
 | 
			
		||||
        ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
 | 
			
		||||
        ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
 | 
			
		||||
    ),
 | 
			
		||||
    [_DEFAULT_LAYER_3] = LAYOUT_charybdis_3x5_base_wrapper(
 | 
			
		||||
        _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
 | 
			
		||||
        _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
 | 
			
		||||
        _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    [_DEFAULT_LAYER_4] = LAYOUT_charybdis_3x5_base_wrapper(
 | 
			
		||||
        _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
 | 
			
		||||
        _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
 | 
			
		||||
        _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    [_MOUSE] = LAYOUT_charybdis_3x5(
 | 
			
		||||
        _______, _______, _______, S_D_MOD, DPI_MOD,    KC_WH_U, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______,    KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6,
 | 
			
		||||
        _______, _______, _______, S_D_RMOD,DPI_RMOD,   KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______,
 | 
			
		||||
                          _______, SNIPING, _______,    _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
    [_LOWER] = LAYOUT_charybdis_3x5_wrapper(
 | 
			
		||||
        _________________LOWER_L1__________________,    _________________LOWER_R1__________________,
 | 
			
		||||
        _________________LOWER_L2__________________,    _________________LOWER_R2__________________,
 | 
			
		||||
        _________________LOWER_L3__________________,    _________________LOWER_R3__________________,
 | 
			
		||||
                          _______, _______, _______,    _______, AUTO_CTN
 | 
			
		||||
    ),
 | 
			
		||||
    [_RAISE] = LAYOUT_charybdis_3x5_wrapper(
 | 
			
		||||
        _________________RAISE_L1__________________,    _________________RAISE_R1__________________,
 | 
			
		||||
        _________________RAISE_L2__________________,    _________________RAISE_R2__________________,
 | 
			
		||||
        _________________RAISE_L3__________________,    _________________RAISE_R3__________________,
 | 
			
		||||
                          REBOOT,  KEYLOCK, _______,    _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
    [_ADJUST] = LAYOUT_charybdis_3x5_wrapper(
 | 
			
		||||
        _________________ADJUST_L1_________________,    _________________ADJUST_R1_________________,
 | 
			
		||||
        _________________ADJUST_L2_________________,    _________________ADJUST_R2_________________,
 | 
			
		||||
        _________________ADJUST_L3_________________,    _________________ADJUST_R3_________________,
 | 
			
		||||
                          EEP_RST, KC_NUKE, _______,    _______, RESET
 | 
			
		||||
    ),
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
void matrix_init_keyemap(void) { setPinInputHigh(A0); }
 | 
			
		||||
 | 
			
		||||
void matrix_scan_keymap(void) {
 | 
			
		||||
    if (!readPin(A0)) {
 | 
			
		||||
        reset_keyboard();
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifdef USB_VBUS_PIN
 | 
			
		||||
bool usb_vbus_state(void) {
 | 
			
		||||
    setPinInputLow(USB_VBUS_PIN);
 | 
			
		||||
    wait_us(5);
 | 
			
		||||
    return readPin(USB_VBUS_PIN);
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
							
								
								
									
										55
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										55
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,55 @@
 | 
			
		|||
/* Copyright 2020 Nick Brassel (tzarc)
 | 
			
		||||
 *
 | 
			
		||||
 *  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 3 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 <https://www.gnu.org/licenses/>.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include_next "mcuconf.h"
 | 
			
		||||
 | 
			
		||||
#undef STM32_I2C_USE_I2C1
 | 
			
		||||
#define STM32_I2C_USE_I2C1 TRUE
 | 
			
		||||
 | 
			
		||||
#undef STM32_I2C_I2C1_RX_DMA_STREAM
 | 
			
		||||
#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
 | 
			
		||||
#undef STM32_I2C_I2C1_TX_DMA_STREAM
 | 
			
		||||
#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
 | 
			
		||||
 | 
			
		||||
#undef STM32_PWM_USE_TIM2
 | 
			
		||||
#define STM32_PWM_USE_TIM2 TRUE
 | 
			
		||||
 | 
			
		||||
#undef STM32_PWM_USE_TIM3
 | 
			
		||||
#define STM32_PWM_USE_TIM3 TRUE
 | 
			
		||||
 | 
			
		||||
#undef STM32_SPI_USE_SPI1
 | 
			
		||||
#define STM32_SPI_USE_SPI1           TRUE
 | 
			
		||||
 | 
			
		||||
#undef STM32_SPI_SPI1_RX_DMA_STREAM
 | 
			
		||||
#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
 | 
			
		||||
#undef STM32_SPI_SPI1_TX_DMA_STREAM
 | 
			
		||||
#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
 | 
			
		||||
 | 
			
		||||
#undef STM32_SERIAL_USE_USART2
 | 
			
		||||
#define STM32_SERIAL_USE_USART2 TRUE
 | 
			
		||||
 | 
			
		||||
#undef STM32_UART_USART2_RX_DMA_STREAM
 | 
			
		||||
#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
 | 
			
		||||
#undef STM32_UART_USART2_TX_DMA_STREAM
 | 
			
		||||
#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
 | 
			
		||||
 | 
			
		||||
#undef STM32_GPT_USE_TIM4
 | 
			
		||||
#define STM32_GPT_USE_TIM4 TRUE
 | 
			
		||||
 | 
			
		||||
#undef STM32_ST_USE_TIMER
 | 
			
		||||
#define STM32_ST_USE_TIMER 5
 | 
			
		||||
							
								
								
									
										22
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,22 @@
 | 
			
		|||
# MCU name
 | 
			
		||||
MCU = STM32F411
 | 
			
		||||
 | 
			
		||||
# Bootloader selection
 | 
			
		||||
BOOTLOADER = stm32-dfu
 | 
			
		||||
 | 
			
		||||
BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
 | 
			
		||||
KEYBOARD_SHARED_EP = yes
 | 
			
		||||
MOUSE_SHARED_EP = yes
 | 
			
		||||
 | 
			
		||||
EEPROM_DRIVER = spi
 | 
			
		||||
WS2812_DRIVER = pwm
 | 
			
		||||
SERIAL_DRIVER = usart
 | 
			
		||||
AUDIO_DRIVER = pwm_hardware
 | 
			
		||||
 | 
			
		||||
AUDIO_SUPPORTED = yes
 | 
			
		||||
AUDIO_ENABLE = yes
 | 
			
		||||
MOUSEKEY_ENABLE = yes
 | 
			
		||||
NKRO_ENABLE = yes
 | 
			
		||||
CONSOLE_ENABLE = yes
 | 
			
		||||
 | 
			
		||||
AUTOCORRECTION_ENABLE = yes
 | 
			
		||||
| 
						 | 
				
			
			@ -16,9 +16,7 @@
 | 
			
		|||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#define TRACKBALL_DPI_OPTIONS { 1200, 1800, 2600, 3400 }
 | 
			
		||||
 | 
			
		||||
#define DEBOUNCE 60
 | 
			
		||||
#define DEBOUNCE 45
 | 
			
		||||
#define ENCODER_DEFAULT_POS 0x3
 | 
			
		||||
 | 
			
		||||
#ifdef OLED_DRIVER_SH1107
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -60,9 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
    ),
 | 
			
		||||
 | 
			
		||||
    [_MOUSE] = LAYOUT_5x6_right(
 | 
			
		||||
        _______, _______, _______, _______, _______, _______,                     DPI_CONFIG, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______,                        KC_WH_U, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______,                        KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______,                        KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, DPI_CONFIG,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______,                        KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
 | 
			
		||||
                          _______, _______,                                                            _______, _______,
 | 
			
		||||
                                            _______, _______,                                 KC_BTN3,
 | 
			
		||||
| 
						 | 
				
			
			@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
                                                     _______, _______,      _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
    [_GAMEPAD] = LAYOUT_5x6_right(
 | 
			
		||||
        KC_ESC,  KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,                        DPI_CONFIG, _______, _______, _______, _______, _______,
 | 
			
		||||
        KC_ESC,  KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,                           _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        KC_F1,   KC_K,    KC_Q,    KC_W,    KC_E,    KC_R,                           _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        KC_TAB,  KC_G,    KC_A,    KC_S,    KC_D,    KC_F,                           _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        KC_LCTL, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_H,                           _______, _______, _______, _______, _______, _______,
 | 
			
		||||
| 
						 | 
				
			
			@ -145,7 +145,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 | 
			
		|||
    [_MEDIA]           = { { _______, _______ }, { _______, _______ } },
 | 
			
		||||
    [_RAISE]           = { { _______, _______ }, { KC_PGDN, KC_PGUP } },
 | 
			
		||||
    [_LOWER]           = { { RGB_MOD, RGB_RMOD}, { RGB_HUD, RGB_HUI } },
 | 
			
		||||
    [_ADJUST]          = { { CK_DOWN, CK_UP   }, { _______, _F______ } },
 | 
			
		||||
    [_ADJUST]          = { { CK_DOWN, CK_UP   }, { _______, _______ } },
 | 
			
		||||
};
 | 
			
		||||
// clang-format on
 | 
			
		||||
#else
 | 
			
		||||
| 
						 | 
				
			
			@ -165,5 +165,49 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 | 
			
		|||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef OLED_ENABLE
 | 
			
		||||
extern uint16_t typing_mode;
 | 
			
		||||
 | 
			
		||||
oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_180; }
 | 
			
		||||
 | 
			
		||||
void oled_render_large_display(void) {
 | 
			
		||||
    if (is_keyboard_left()) {
 | 
			
		||||
        render_wpm_graph(54, 64);
 | 
			
		||||
    } else {
 | 
			
		||||
        oled_advance_page(true);
 | 
			
		||||
        oled_advance_page(true);
 | 
			
		||||
 | 
			
		||||
        static const char PROGMEM logo[] = {
 | 
			
		||||
            0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
 | 
			
		||||
            0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
 | 
			
		||||
            0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
 | 
			
		||||
        };
 | 
			
		||||
        oled_write_P(logo, false);
 | 
			
		||||
 | 
			
		||||
        oled_set_cursor(1, 14);
 | 
			
		||||
        oled_write_ln_P(PSTR("Unicode:"), false);
 | 
			
		||||
        switch (typing_mode) {
 | 
			
		||||
            case KC_WIDE:
 | 
			
		||||
                oled_write_P(PSTR("        Wide"), false);
 | 
			
		||||
                break;
 | 
			
		||||
            case KC_SCRIPT:
 | 
			
		||||
                oled_write_P(PSTR("      Script"), false);
 | 
			
		||||
                break;
 | 
			
		||||
            case KC_BLOCKS:
 | 
			
		||||
                oled_write_P(PSTR("      Blocks"), false);
 | 
			
		||||
                break;
 | 
			
		||||
            case KC_REGIONAL:
 | 
			
		||||
                oled_write_P(PSTR("    Regional"), false);
 | 
			
		||||
                break;
 | 
			
		||||
            case KC_AUSSIE:
 | 
			
		||||
                oled_write_P(PSTR("      Aussie"), false);
 | 
			
		||||
                break;
 | 
			
		||||
            case KC_ZALGO:
 | 
			
		||||
                oled_write_P(PSTR("       Zalgo"), false);
 | 
			
		||||
                break;
 | 
			
		||||
            default:
 | 
			
		||||
                oled_write_P(PSTR("      Normal"), false);
 | 
			
		||||
                break;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,17 +19,21 @@
 | 
			
		|||
#define EE_HANDS
 | 
			
		||||
 | 
			
		||||
#ifdef OLED_ENABLE
 | 
			
		||||
#    define OLED_DISPLAY_128X64
 | 
			
		||||
#    ifdef OLED_DRIVER_SH1107
 | 
			
		||||
#        undef OLED_DISPLAY_128X64
 | 
			
		||||
#        define OLED_DISPLAY_128X128
 | 
			
		||||
#    endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef RGBLIGHT_ENABLE
 | 
			
		||||
#    define RGBLIGHT_SLEEP
 | 
			
		||||
#    define RGBLIGHT_LIMIT_VAL 200
 | 
			
		||||
#    undef RGBLIGHT_LIMIT_VAL
 | 
			
		||||
#    define RGBLIGHT_LIMIT_VAL 120
 | 
			
		||||
#    define RGBLIGHT_HUE_STEP  8
 | 
			
		||||
#    define RGBLIGHT_SAT_STEP  8
 | 
			
		||||
#    define RGBLIGHT_VAL_STEP  8
 | 
			
		||||
#    define RGBLIGHT_SPLIT
 | 
			
		||||
// #    define RGBLIGHT_LAYERS
 | 
			
		||||
#    define RGBLIGHT_LAYERS
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#define KEYLOGGER_LENGTH            10
 | 
			
		||||
| 
						 | 
				
			
			@ -41,3 +45,6 @@
 | 
			
		|||
#define BOOTMAGIC_LITE_COLUMN       7
 | 
			
		||||
#define BOOTMAGIC_LITE_ROW_RIGHT    4
 | 
			
		||||
#define BOOTMAGIC_LITE_COLUMN_RIGHT 7
 | 
			
		||||
 | 
			
		||||
#define I2C1_CLOCK_SPEED 400000
 | 
			
		||||
#define I2C1_DUTY_CYCLE  FAST_DUTY_CYCLE_2
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -121,7 +121,32 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 | 
			
		|||
// clang-format on
 | 
			
		||||
 | 
			
		||||
#ifdef OLED_ENABLE
 | 
			
		||||
oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_180; }
 | 
			
		||||
oled_rotation_t oled_init_keymap(oled_rotation_t rotation) {
 | 
			
		||||
#ifdef OLED_DRIVER_SH1107
 | 
			
		||||
    return OLED_ROTATION_0;
 | 
			
		||||
#else
 | 
			
		||||
    return OLED_ROTATION_180;
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void oled_render_large_display(void) {
 | 
			
		||||
    if (is_keyboard_left()) {
 | 
			
		||||
        render_wpm_graph(54, 64);
 | 
			
		||||
    } else {
 | 
			
		||||
        static const char PROGMEM kyria_logo[] = {
 | 
			
		||||
            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 | 
			
		||||
            0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 | 
			
		||||
            0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 | 
			
		||||
            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
 | 
			
		||||
            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
 | 
			
		||||
            0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 | 
			
		||||
            0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 | 
			
		||||
            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
 | 
			
		||||
        };
 | 
			
		||||
        // clang-format on
 | 
			
		||||
        oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef ENCODER_ENABLE
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,8 +20,10 @@ ifeq ($(strip $(KEYBOARD)), splitkb/kyria/rev1/proton_c)
 | 
			
		|||
    CTPC                   = yes
 | 
			
		||||
    AUTOCORRECTION_ENABLE  = yes
 | 
			
		||||
    CAPS_WORD_ENABLE       = yes
 | 
			
		||||
    DEBUG_MATRIX_SCAN_RATE_ENABLE = api
 | 
			
		||||
else
 | 
			
		||||
    LTO_ENABLE             = yes
 | 
			
		||||
    BOOTLOADER             = qmk-hid
 | 
			
		||||
    BOOTLOADER_SIZE        = 512
 | 
			
		||||
    CUSTOM_UNICODE_ENABLE  = no
 | 
			
		||||
endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue