qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-10-24 18:01:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

inital encoder implementation

Browse Source
This commit is contained in:
Jack Humbert
2018-06-03 21:55:07 -04:00
parent 018a0142d2
commit ff4a1ae5d2
11 changed files with 135 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
keyboards/planck/light/rev1/config.h
+3
View File
@@ -41,5 +41,8 @@
#define DRIVER_2_LED_TOTAL 24
#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL
#define NUMBER_OF_ENCODERS 1
#define ENCODERS_PAD_A { F6 }
#define ENCODERS_PAD_B { F7 }
#endif
keyboards/planck/light/rev1/rules.mk
+2 -1
View File
@@ -1,5 +1,6 @@
MIDI_ENABLE = yes
AUDIO_ENABLE = yes # Audio output on port C6
RGB_MATRIX_ENABLE = yes
ENCODER_ENABLE = yes
MCU = at90usb1286
MCU = at90usb1286
keyboards/planck/light/rev2/config.h
+5 -1
View File
@@ -52,8 +52,12 @@
#undef AUDIO_VOICES
#undef C6_AUDIO
#define NUMBER_OF_ENCODERS 1
#define ENCODERS_PAD_A { B12 }
#define ENCODERS_PAD_B { B13 }
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 6
#define DEBOUNCE 0
/* Prevent modifiers from being stuck on after layer changes. */
#define PREVENT_STUCK_MODIFIERS
keyboards/planck/light/rev2/matrix.c
-31
View File
@@ -21,10 +21,6 @@ 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 };
static LINE_TYPE matrix_col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
static LINE_TYPE matrix_row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
@@ -48,12 +44,6 @@ void matrix_init(void) {
printf("matrix init\n");
//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
for (int i = 0; i < MATRIX_COLS; i++) {
setPadMode(matrix_col_pins[i], PAL_MODE_OUTPUT_PUSHPULL);
@@ -69,29 +59,8 @@ void matrix_init(void) {
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) {
// 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
for (int col = 0; col < MATRIX_COLS; col++) {
keyboards/planck/light/rev2/rules.mk
+1
View File
@@ -53,4 +53,5 @@ NKRO_ENABLE = yes # USB Nkey Rollover
CUSTOM_MATRIX = yes # Custom matrix file
AUDIO_ENABLE = yes
RGB_MATRIX_ENABLE = yes
ENCODER_ENABLE = yes
# SERIAL_LINK_ENABLE = yes