|
@ -21,10 +21,6 @@ static matrix_row_t matrix_debouncing[MATRIX_COLS]; |
|
|
static bool debouncing = false; |
|
|
static bool debouncing = false; |
|
|
static uint16_t debouncing_time = 0; |
|
|
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 }; |
|
|
|
|
|
|
|
|
|
|
|
static LINE_TYPE matrix_col_pins[MATRIX_COLS] = MATRIX_COL_PINS; |
|
|
static LINE_TYPE matrix_col_pins[MATRIX_COLS] = MATRIX_COL_PINS; |
|
|
static LINE_TYPE matrix_row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; |
|
|
static LINE_TYPE matrix_row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; |
|
|
|
|
|
|
|
@ -48,12 +44,6 @@ void matrix_init(void) { |
|
|
printf("matrix init\n"); |
|
|
printf("matrix init\n"); |
|
|
//debug_matrix = true; |
|
|
//debug_matrix = true; |
|
|
|
|
|
|
|
|
// encoder setup |
|
|
|
|
|
palSetPadMode(GPIOB, 12, PAL_MODE_INPUT_PULLUP); |
|
|
|
|
|
palSetPadMode(GPIOB, 13, PAL_MODE_INPUT_PULLUP); |
|
|
|
|
|
|
|
|
|
|
|
encoder_state = (palReadPad(GPIOB, 12) << 0) | (palReadPad(GPIOB, 13) << 1); |
|
|
|
|
|
|
|
|
|
|
|
// actual matrix setup |
|
|
// actual matrix setup |
|
|
for (int i = 0; i < MATRIX_COLS; i++) { |
|
|
for (int i = 0; i < MATRIX_COLS; i++) { |
|
|
setPadMode(matrix_col_pins[i], PAL_MODE_OUTPUT_PUSHPULL); |
|
|
setPadMode(matrix_col_pins[i], PAL_MODE_OUTPUT_PUSHPULL); |
|
@ -69,29 +59,8 @@ void matrix_init(void) { |
|
|
matrix_init_quantum(); |
|
|
matrix_init_quantum(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
__attribute__ ((weak)) |
|
|
|
|
|
void encoder_update(bool clockwise) { } |
|
|
|
|
|
|
|
|
|
|
|
#ifndef ENCODER_RESOLUTION |
|
|
|
|
|
#define ENCODER_RESOLUTION 4 |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
#define COUNTRECLOCKWISE 0 |
|
|
|
|
|
#define CLOCKWISE 1 |
|
|
|
|
|
|
|
|
|
|
|
uint8_t matrix_scan(void) { |
|
|
uint8_t matrix_scan(void) { |
|
|
|
|
|
|
|
|
// encoder on B12 and B13 |
|
|
|
|
|
encoder_state <<= 2; |
|
|
|
|
|
encoder_state |= (palReadPad(GPIOB, 12) << 0) | (palReadPad(GPIOB, 13) << 1); |
|
|
|
|
|
encoder_value += encoder_LUT[encoder_state & 0xF]; |
|
|
|
|
|
if (encoder_value >= ENCODER_RESOLUTION) { |
|
|
|
|
|
encoder_update(COUNTRECLOCKWISE); |
|
|
|
|
|
} |
|
|
|
|
|
if (encoder_value <= -ENCODER_RESOLUTION) { // direction is arbitrary here, but this clockwise |
|
|
|
|
|
encoder_update(CLOCKWISE); |
|
|
|
|
|
} |
|
|
|
|
|
encoder_value %= ENCODER_RESOLUTION; |
|
|
|
|
|
|
|
|
|
|
|
// actual matrix |
|
|
// actual matrix |
|
|
for (int col = 0; col < MATRIX_COLS; col++) { |
|
|
for (int col = 0; col < MATRIX_COLS; col++) { |
|
|