diff options
author | Jack Humbert <jack.humb@gmail.com> | 2019-01-25 19:18:14 -0500 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2019-01-26 11:36:35 -0500 |
commit | 8da9d3330e7904c57b240cfb1b2d3312ad81ccf9 (patch) | |
tree | dd7ff8d6d06a2471e7ebcb39b408657e0fffb379 /keyboards/preonic/rev3/matrix.c | |
parent | 0772b4932c9ab2734e51cdff58a566bf6b3bc922 (diff) | |
download | firmware-8da9d3330e7904c57b240cfb1b2d3312ad81ccf9.tar.gz firmware-8da9d3330e7904c57b240cfb1b2d3312ad81ccf9.tar.bz2 firmware-8da9d3330e7904c57b240cfb1b2d3312ad81ccf9.zip |
use built-in arm stuff
Diffstat (limited to 'keyboards/preonic/rev3/matrix.c')
-rw-r--r-- | keyboards/preonic/rev3/matrix.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/keyboards/preonic/rev3/matrix.c b/keyboards/preonic/rev3/matrix.c index 05f6da71b..db7a4f2a3 100644 --- a/keyboards/preonic/rev3/matrix.c +++ b/keyboards/preonic/rev3/matrix.c @@ -21,10 +21,6 @@ static matrix_col_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 }; - static bool dip_switch[4] = {0, 0, 0, 0}; __attribute__ ((weak)) @@ -53,12 +49,6 @@ void matrix_init(void) { palSetPadMode(GPIOA, 10, PAL_MODE_INPUT_PULLUP); palSetPadMode(GPIOB, 9, PAL_MODE_INPUT_PULLUP); - // 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 palSetPadMode(GPIOB, 11, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOB, 10, PAL_MODE_OUTPUT_PUSHPULL); @@ -110,18 +100,6 @@ uint8_t matrix_scan(void) { } memcpy(last_dip_switch, dip_switch, sizeof(&dip_switch)); - // 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(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_col_t data = 0; |