summaryrefslogtreecommitdiffstats
path: root/quantum/encoder.c
diff options
context:
space:
mode:
Diffstat (limited to 'quantum/encoder.c')
-rw-r--r--quantum/encoder.c122
1 files changed, 74 insertions, 48 deletions
diff --git a/quantum/encoder.c b/quantum/encoder.c
index ddf6234ab8..4aeb3d0cde 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -16,84 +16,110 @@
*/
#include "encoder.h"
+#ifdef SPLIT_KEYBOARD
+# include "split_util.h"
+#endif
// for memcpy
#include <string.h>
-
#ifndef ENCODER_RESOLUTION
- #define ENCODER_RESOLUTION 4
-#endif
-
-#ifndef NUMBER_OF_ENCODERS
- #error "Number of encoders not defined by NUMBER_OF_ENCODERS"
+# define ENCODER_RESOLUTION 4
#endif
#if !defined(ENCODERS_PAD_A) || !defined(ENCODERS_PAD_B)
- #error "No encoder pads defined by ENCODERS_PAD_A and ENCODERS_PAD_B"
+# error "No encoder pads defined by ENCODERS_PAD_A and ENCODERS_PAD_B"
#endif
-static pin_t encoders_pad_a[NUMBER_OF_ENCODERS] = ENCODERS_PAD_A;
-static pin_t encoders_pad_b[NUMBER_OF_ENCODERS] = ENCODERS_PAD_B;
+#define NUMBER_OF_ENCODERS (sizeof(encoders_pad_a) / sizeof(pin_t))
+static pin_t encoders_pad_a[] = ENCODERS_PAD_A;
+static pin_t encoders_pad_b[] = ENCODERS_PAD_B;
-static int8_t encoder_LUT[] = { 0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0 };
+static int8_t encoder_LUT[] = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
-static uint8_t encoder_state[NUMBER_OF_ENCODERS] = {0};
+static uint8_t encoder_state[NUMBER_OF_ENCODERS] = {0};
+static int8_t encoder_pulses[NUMBER_OF_ENCODERS] = {0};
#ifdef SPLIT_KEYBOARD
-// slave half encoders come over as second set of encoders
-static int8_t encoder_value[NUMBER_OF_ENCODERS * 2] = {0};
+// right half encoders come over as second set of encoders
+static uint8_t encoder_value[NUMBER_OF_ENCODERS * 2] = {0};
+// row offsets for each hand
+static uint8_t thisHand, thatHand;
#else
-static int8_t encoder_value[NUMBER_OF_ENCODERS] = {0};
+static uint8_t encoder_value[NUMBER_OF_ENCODERS] = {0};
#endif
-__attribute__ ((weak))
-void encoder_update_user(int8_t index, bool clockwise) { }
+__attribute__((weak)) void encoder_update_user(int8_t index, bool clockwise) {}
-__attribute__ ((weak))
-void encoder_update_kb(int8_t index, bool clockwise) {
- encoder_update_user(index, clockwise);
-}
+__attribute__((weak)) void encoder_update_kb(int8_t index, bool clockwise) { encoder_update_user(index, clockwise); }
void encoder_init(void) {
- for (int i = 0; i < NUMBER_OF_ENCODERS; i++) {
- setPinInputHigh(encoders_pad_a[i]);
- setPinInputHigh(encoders_pad_b[i]);
+#if defined(SPLIT_KEYBOARD) && defined(ENCODERS_PAD_A_RIGHT) && defined(ENCODERS_PAD_B_RIGHT)
+ if (!isLeftHand) {
+ const pin_t encoders_pad_a_right[] = ENCODERS_PAD_A_RIGHT;
+ const pin_t encoders_pad_b_right[] = ENCODERS_PAD_B_RIGHT;
+ for (uint8_t i = 0; i < NUMBER_OF_ENCODERS; i++) {
+ encoders_pad_a[i] = encoders_pad_a_right[i];
+ encoders_pad_b[i] = encoders_pad_b_right[i];
+ }
+ }
+#endif
+
+ for (int i = 0; i < NUMBER_OF_ENCODERS; i++) {
+ setPinInputHigh(encoders_pad_a[i]);
+ setPinInputHigh(encoders_pad_b[i]);
+
+ encoder_state[i] = (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1);
+ }
- encoder_state[i] = (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1);
- }
+#ifdef SPLIT_KEYBOARD
+ thisHand = isLeftHand ? 0 : NUMBER_OF_ENCODERS;
+ thatHand = NUMBER_OF_ENCODERS - thisHand;
+#endif
}
-void encoder_read(void) {
- for (int i = 0; i < NUMBER_OF_ENCODERS; i++) {
- encoder_state[i] <<= 2;
- encoder_state[i] |= (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1);
- encoder_value[i] += encoder_LUT[encoder_state[i] & 0xF];
- if (encoder_value[i] >= ENCODER_RESOLUTION) {
- encoder_update_kb(i, false);
+static void encoder_update(int8_t index, uint8_t state) {
+ encoder_pulses[index] += encoder_LUT[state & 0xF];
+ if (encoder_pulses[index] >= ENCODER_RESOLUTION) {
+ encoder_value[index]++;
+ encoder_update_kb(index, true);
}
- if (encoder_value[i] <= -ENCODER_RESOLUTION) { // direction is arbitrary here, but this clockwise
- encoder_update_kb(i, true);
+ if (encoder_pulses[index] <= -ENCODER_RESOLUTION) { // direction is arbitrary here, but this clockwise
+ encoder_value[index]--;
+ encoder_update_kb(index, false);
}
- encoder_value[i] %= ENCODER_RESOLUTION;
- }
+ encoder_pulses[index] %= ENCODER_RESOLUTION;
}
-#ifdef SPLIT_KEYBOARD
-void encoder_state_raw(uint8_t* slave_state) {
- memcpy(slave_state, encoder_state, sizeof(encoder_state));
+void encoder_read(void) {
+ for (int i = 0; i < NUMBER_OF_ENCODERS; i++) {
+ encoder_state[i] <<= 2;
+ encoder_state[i] |= (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1);
+#if SPLIT_KEYBOARD
+ encoder_update(i + thisHand, encoder_state[i]);
+#else
+ encoder_update(i, encoder_state[i]);
+#endif
+ }
}
+#ifdef SPLIT_KEYBOARD
+void encoder_state_raw(uint8_t* slave_state) { memcpy(slave_state, &encoder_value[thisHand], sizeof(uint8_t) * NUMBER_OF_ENCODERS); }
+
void encoder_update_raw(uint8_t* slave_state) {
- for (int i = 0; i < NUMBER_OF_ENCODERS; i++) {
- encoder_value[NUMBER_OF_ENCODERS + i] += encoder_LUT[slave_state[i] & 0xF];
- if (encoder_value[NUMBER_OF_ENCODERS + i] >= ENCODER_RESOLUTION) {
- encoder_update_kb(NUMBER_OF_ENCODERS + i, false);
- }
- if (encoder_value[NUMBER_OF_ENCODERS + i] <= -ENCODER_RESOLUTION) { // direction is arbitrary here, but this clockwise
- encoder_update_kb(NUMBER_OF_ENCODERS + i, true);
+ for (int i = 0; i < NUMBER_OF_ENCODERS; i++) {
+ uint8_t index = i + thatHand;
+ int8_t delta = slave_state[i] - encoder_value[index];
+ while (delta > 0) {
+ delta--;
+ encoder_value[index]++;
+ encoder_update_kb(index, true);
+ }
+ while (delta < 0) {
+ delta++;
+ encoder_value[index]--;
+ encoder_update_kb(index, false);
+ }
}
- encoder_value[NUMBER_OF_ENCODERS + i] %= ENCODER_RESOLUTION;
- }
}
#endif