[Keyboard] Hadron keymap and config updates (#5632)
* update hadron keymaps, code cleanup * keymap update * refactor custom matrix to use quantum matrix defines * fix wrong pin for matrixpull/5635/head
ishtob
6 years ago
committed by
Drashna Jaelre
parent
93b7fccad6
commit
0a6beab224
@ -1,195 +0,0 @@
|
|||||||
#include <string.h>
|
|
||||||
#include "hal.h"
|
|
||||||
#include "timer.h"
|
|
||||||
#include "wait.h"
|
|
||||||
#include "printf.h"
|
|
||||||
#include "backlight.h"
|
|
||||||
#include "matrix.h"
|
|
||||||
#include "action.h"
|
|
||||||
#include "keycode.h"
|
|
||||||
|
|
||||||
/* matrix state(1:on, 0:off) */
|
|
||||||
static matrix_row_t matrix[MATRIX_ROWS];
|
|
||||||
static matrix_row_t matrix_debouncing[MATRIX_COLS];
|
|
||||||
static bool debouncing = false;
|
|
||||||
static uint16_t debouncing_time = 0;
|
|
||||||
|
|
||||||
static uint8_t encoder_state = 0;
|
|
||||||
static int8_t encoder_value = 0;
|
|
||||||
static int8_t encoder_LUT[] = { 0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0 };
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_init_user(void) {}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_scan_user(void) {}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_init_kb(void) {
|
|
||||||
matrix_init_user();
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_scan_kb(void) {
|
|
||||||
matrix_scan_user();
|
|
||||||
}
|
|
||||||
|
|
||||||
void matrix_init(void) {
|
|
||||||
printf("matrix init\n");
|
|
||||||
//debug_matrix = true;
|
|
||||||
|
|
||||||
// encoder setup
|
|
||||||
palSetPadMode(GPIOB, 13, PAL_MODE_INPUT_PULLUP);
|
|
||||||
palSetPadMode(GPIOB, 14, PAL_MODE_INPUT_PULLUP);
|
|
||||||
|
|
||||||
encoder_state = (palReadPad(GPIOB, 13) << 0) | (palReadPad(GPIOB, 14) << 1);
|
|
||||||
|
|
||||||
// actual matrix setup
|
|
||||||
palSetPadMode(GPIOB, 8, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 2, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 10, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 0, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 1, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 2, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 0, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 3, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 1, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 6, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 7, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 12, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOC, 13, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 11, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 9, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
|
|
||||||
palSetPadMode(GPIOC, 15, PAL_MODE_INPUT_PULLDOWN);
|
|
||||||
palSetPadMode(GPIOC, 14, PAL_MODE_INPUT_PULLDOWN);
|
|
||||||
palSetPadMode(GPIOA, 10, PAL_MODE_INPUT_PULLDOWN);
|
|
||||||
palSetPadMode(GPIOA, 9, PAL_MODE_INPUT_PULLDOWN);
|
|
||||||
palSetPadMode(GPIOA, 8, PAL_MODE_INPUT_PULLDOWN);
|
|
||||||
|
|
||||||
|
|
||||||
memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
|
|
||||||
memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t));
|
|
||||||
|
|
||||||
|
|
||||||
matrix_init_quantum();
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void encoder_update(bool clockwise) { }
|
|
||||||
|
|
||||||
#ifndef ENCODER_RESOLUTION
|
|
||||||
#define ENCODER_RESOLUTION 4
|
|
||||||
#endif
|
|
||||||
|
|
||||||
uint8_t matrix_scan(void) {
|
|
||||||
// encoder on B13 and B14
|
|
||||||
encoder_state <<= 2;
|
|
||||||
encoder_state |= (palReadPad(GPIOB, 13) << 0) | (palReadPad(GPIOB, 14) << 1);
|
|
||||||
encoder_value += encoder_LUT[encoder_state & 0xF];
|
|
||||||
if (encoder_value >= ENCODER_RESOLUTION) {
|
|
||||||
encoder_update(0);
|
|
||||||
}
|
|
||||||
if (encoder_value <= -ENCODER_RESOLUTION) { // direction is arbitrary here, but this clockwise
|
|
||||||
encoder_update(1);
|
|
||||||
}
|
|
||||||
encoder_value %= ENCODER_RESOLUTION;
|
|
||||||
|
|
||||||
// actual matrix
|
|
||||||
for (int col = 0; col < MATRIX_COLS; col++) {
|
|
||||||
matrix_row_t data = 0;
|
|
||||||
|
|
||||||
// strobe col { PB8, PB2, PB10, PA0, PA1, PA2, PB0, PA3, PB1, PA6, PA7, PB1, PA6, PA7, PB12, PC3, PB11, }
|
|
||||||
switch (col) {
|
|
||||||
case 0: palSetPad(GPIOB, 8); break;
|
|
||||||
case 1: palSetPad(GPIOB, 2); break;
|
|
||||||
case 2: palSetPad(GPIOB, 10); break;
|
|
||||||
case 3: palSetPad(GPIOA, 0); break;
|
|
||||||
case 4: palSetPad(GPIOA, 1); break;
|
|
||||||
case 5: palSetPad(GPIOA, 2); break;
|
|
||||||
case 6: palSetPad(GPIOB, 0); break;
|
|
||||||
case 7: palSetPad(GPIOA, 3); break;
|
|
||||||
case 8: palSetPad(GPIOB, 1); break;
|
|
||||||
case 9: palSetPad(GPIOA, 6); break;
|
|
||||||
case 10: palSetPad(GPIOA, 7); break;
|
|
||||||
case 11: palSetPad(GPIOB, 12); break;
|
|
||||||
case 12: palSetPad(GPIOC, 13); break;
|
|
||||||
case 13: palSetPad(GPIOB, 11); break;
|
|
||||||
case 14: palSetPad(GPIOB, 9); break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// need wait to settle pin state
|
|
||||||
wait_us(20);
|
|
||||||
|
|
||||||
// read row data { PC15, PC14, PA10, PA9, PA8 }
|
|
||||||
data = (
|
|
||||||
(palReadPad(GPIOC, 15) << 0 ) |
|
|
||||||
(palReadPad(GPIOC, 14) << 1 ) |
|
|
||||||
(palReadPad(GPIOA, 10) << 2 ) |
|
|
||||||
(palReadPad(GPIOA, 9) << 3 ) |
|
|
||||||
(palReadPad(GPIOA, 8) << 4 )
|
|
||||||
);
|
|
||||||
|
|
||||||
// unstrobe col { PB8, PB2, PB10, PA0, PA1, PA2, PB0, PA3, PB1, PA6, PA7, PB1, PA6, PA7, PB12, PC3, PB11, }
|
|
||||||
switch (col) {
|
|
||||||
case 0: palClearPad(GPIOB, 8); break;
|
|
||||||
case 1: palClearPad(GPIOB, 2); break;
|
|
||||||
case 2: palClearPad(GPIOB, 10); break;
|
|
||||||
case 3: palClearPad(GPIOA, 0); break;
|
|
||||||
case 4: palClearPad(GPIOA, 1); break;
|
|
||||||
case 5: palClearPad(GPIOA, 2); break;
|
|
||||||
case 6: palClearPad(GPIOB, 0); break;
|
|
||||||
case 7: palClearPad(GPIOA, 3); break;
|
|
||||||
case 8: palClearPad(GPIOB, 1); break;
|
|
||||||
case 9: palClearPad(GPIOA, 6); break;
|
|
||||||
case 10: palClearPad(GPIOA, 7); break;
|
|
||||||
case 11: palClearPad(GPIOB, 12); break;
|
|
||||||
case 12: palClearPad(GPIOC, 13); break;
|
|
||||||
case 13: palClearPad(GPIOB, 11); break;
|
|
||||||
case 14: palClearPad(GPIOB, 9); break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (matrix_debouncing[col] != data) {
|
|
||||||
matrix_debouncing[col] = data;
|
|
||||||
debouncing = true;
|
|
||||||
debouncing_time = timer_read();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) {
|
|
||||||
for (int row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
matrix[row] = 0;
|
|
||||||
for (int col = 0; col < MATRIX_COLS; col++) {
|
|
||||||
matrix[row] |= ((matrix_debouncing[col] & (1 << row) ? 1 : 0) << col);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
debouncing = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
matrix_scan_quantum();
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool matrix_is_on(uint8_t row, uint8_t col) {
|
|
||||||
return (matrix[row] & (1<<col));
|
|
||||||
}
|
|
||||||
|
|
||||||
matrix_row_t matrix_get_row(uint8_t row) {
|
|
||||||
return matrix[row];
|
|
||||||
}
|
|
||||||
|
|
||||||
void matrix_print(void) {
|
|
||||||
printf("\nr/c 01234567\n");
|
|
||||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
printf("%X0: ", row);
|
|
||||||
matrix_row_t data = matrix_get_row(row);
|
|
||||||
for (int col = 0; col < MATRIX_COLS; col++) {
|
|
||||||
if (data & (1<<col))
|
|
||||||
printf("1");
|
|
||||||
else
|
|
||||||
printf("0");
|
|
||||||
}
|
|
||||||
printf("\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,57 +1,25 @@
|
|||||||
# project specific files
|
# projecct specific files
|
||||||
SRC = matrix.c
|
|
||||||
|
|
||||||
## chip/board settings
|
|
||||||
# - the next two should match the directories in
|
|
||||||
# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
|
|
||||||
MCU_FAMILY = STM32
|
|
||||||
MCU_SERIES = STM32F3xx
|
|
||||||
|
|
||||||
# Linker script to use
|
|
||||||
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
|
|
||||||
# or <this_dir>/ld/
|
|
||||||
MCU_LDSCRIPT = STM32F303xC
|
|
||||||
|
|
||||||
# Startup code to use
|
|
||||||
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
|
|
||||||
MCU_STARTUP = stm32f3xx
|
|
||||||
|
|
||||||
# Board: it should exist either in <chibios>/os/hal/boards/
|
|
||||||
# or <this_dir>/boards
|
|
||||||
BOARD = GENERIC_STM32_F303XC
|
|
||||||
|
|
||||||
# Cortex version
|
# Cortex version
|
||||||
MCU = cortex-m4
|
MCU = STM32F303
|
||||||
|
|
||||||
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
|
|
||||||
ARMV = 7
|
|
||||||
|
|
||||||
USE_FPU = yes
|
|
||||||
|
|
||||||
# Vector table for application
|
|
||||||
# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
|
|
||||||
# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB
|
|
||||||
# OPT_DEFS = -DCORTEX_VTOR_INIT=0x08005000
|
|
||||||
OPT_DEFS =
|
|
||||||
|
|
||||||
# Options to pass to dfu-util when flashing
|
|
||||||
DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# comment out to disable the options.
|
# comment out to disable the options.
|
||||||
#
|
#
|
||||||
BACKLIGHT_ENABLE = no
|
BACKLIGHT_ENABLE = no
|
||||||
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
|
BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
|
||||||
## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
|
## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
|
||||||
MOUSEKEY_ENABLE = yes # Mouse keys
|
MOUSEKEY_ENABLE = yes # Mouse keys
|
||||||
EXTRAKEY_ENABLE = yes # Audio control and System control
|
EXTRAKEY_ENABLE = yes # Audio control and System control
|
||||||
CONSOLE_ENABLE = no # Console for debug
|
CONSOLE_ENABLE = no # Console for debug
|
||||||
COMMAND_ENABLE = no # Commands for debug and configuration
|
COMMAND_ENABLE = yes # Commands for debug and configuration
|
||||||
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
|
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
|
||||||
NKRO_ENABLE = yes # USB Nkey Rollover
|
NKRO_ENABLE = yes # USB Nkey Rollover
|
||||||
CUSTOM_MATRIX = yes # Custom matrix file
|
CUSTOM_MATRIX = no # Custom matrix file
|
||||||
AUDIO_ENABLE = yes
|
AUDIO_ENABLE = yes
|
||||||
RGBLIGHT_ENABLE = no
|
RGBLIGHT_ENABLE = no
|
||||||
|
RGB_MATRIX_ENABLE = no #WS2812 once arm_rgb is implemented
|
||||||
HAPTIC_ENABLE += DRV2605L
|
HAPTIC_ENABLE += DRV2605L
|
||||||
QWIIC_ENABLE += MICRO_OLED
|
QWIIC_ENABLE += MICRO_OLED
|
||||||
|
ENCODER_ENABLER = yes
|
||||||
# SERIAL_LINK_ENABLE = yes
|
# SERIAL_LINK_ENABLE = yes
|
||||||
|
|||||||
Loading…
Reference in new issue