diff options
author | XScorpion2 <rcalt2vt@gmail.com> | 2019-04-03 18:01:17 -0500 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-04-03 16:01:17 -0700 |
commit | 63177760deaf23bb1f676974cecf211676285604 (patch) | |
tree | a0d60f4f55ef9632a20631c6f96b3f2e4e00367c /quantum/encoder.c | |
parent | 17e7762de7e3fdfc61c20aa61022f47370630c6a (diff) | |
download | qmk_firmware-63177760deaf23bb1f676974cecf211676285604.tar.gz qmk_firmware-63177760deaf23bb1f676974cecf211676285604.zip |
Added encoder support to split common code (#5477)
* Added slave encoder support to split common
* Fixing handwired/xealous/rev1 compile error
* Removed unnecessary ifdef
Diffstat (limited to 'quantum/encoder.c')
-rw-r--r-- | quantum/encoder.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/quantum/encoder.c b/quantum/encoder.c index 6629a098b..ddf6234ab 100644 --- a/quantum/encoder.c +++ b/quantum/encoder.c | |||
@@ -17,6 +17,10 @@ | |||
17 | 17 | ||
18 | #include "encoder.h" | 18 | #include "encoder.h" |
19 | 19 | ||
20 | // for memcpy | ||
21 | #include <string.h> | ||
22 | |||
23 | |||
20 | #ifndef ENCODER_RESOLUTION | 24 | #ifndef ENCODER_RESOLUTION |
21 | #define ENCODER_RESOLUTION 4 | 25 | #define ENCODER_RESOLUTION 4 |
22 | #endif | 26 | #endif |
@@ -35,7 +39,13 @@ static pin_t encoders_pad_b[NUMBER_OF_ENCODERS] = ENCODERS_PAD_B; | |||
35 | static int8_t encoder_LUT[] = { 0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0 }; | 39 | static int8_t encoder_LUT[] = { 0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0 }; |
36 | 40 | ||
37 | static uint8_t encoder_state[NUMBER_OF_ENCODERS] = {0}; | 41 | static uint8_t encoder_state[NUMBER_OF_ENCODERS] = {0}; |
42 | |||
43 | #ifdef SPLIT_KEYBOARD | ||
44 | // slave half encoders come over as second set of encoders | ||
45 | static int8_t encoder_value[NUMBER_OF_ENCODERS * 2] = {0}; | ||
46 | #else | ||
38 | static int8_t encoder_value[NUMBER_OF_ENCODERS] = {0}; | 47 | static int8_t encoder_value[NUMBER_OF_ENCODERS] = {0}; |
48 | #endif | ||
39 | 49 | ||
40 | __attribute__ ((weak)) | 50 | __attribute__ ((weak)) |
41 | void encoder_update_user(int8_t index, bool clockwise) { } | 51 | void encoder_update_user(int8_t index, bool clockwise) { } |
@@ -60,11 +70,30 @@ void encoder_read(void) { | |||
60 | encoder_state[i] |= (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1); | 70 | encoder_state[i] |= (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1); |
61 | encoder_value[i] += encoder_LUT[encoder_state[i] & 0xF]; | 71 | encoder_value[i] += encoder_LUT[encoder_state[i] & 0xF]; |
62 | if (encoder_value[i] >= ENCODER_RESOLUTION) { | 72 | if (encoder_value[i] >= ENCODER_RESOLUTION) { |
63 | encoder_update_kb(i, COUNTRECLOCKWISE); | 73 | encoder_update_kb(i, false); |
64 | } | 74 | } |
65 | if (encoder_value[i] <= -ENCODER_RESOLUTION) { // direction is arbitrary here, but this clockwise | 75 | if (encoder_value[i] <= -ENCODER_RESOLUTION) { // direction is arbitrary here, but this clockwise |
66 | encoder_update_kb(i, CLOCKWISE); | 76 | encoder_update_kb(i, true); |
67 | } | 77 | } |
68 | encoder_value[i] %= ENCODER_RESOLUTION; | 78 | encoder_value[i] %= ENCODER_RESOLUTION; |
69 | } | 79 | } |
70 | } | 80 | } |
81 | |||
82 | #ifdef SPLIT_KEYBOARD | ||
83 | void encoder_state_raw(uint8_t* slave_state) { | ||
84 | memcpy(slave_state, encoder_state, sizeof(encoder_state)); | ||
85 | } | ||
86 | |||
87 | void encoder_update_raw(uint8_t* slave_state) { | ||
88 | for (int i = 0; i < NUMBER_OF_ENCODERS; i++) { | ||
89 | encoder_value[NUMBER_OF_ENCODERS + i] += encoder_LUT[slave_state[i] & 0xF]; | ||
90 | if (encoder_value[NUMBER_OF_ENCODERS + i] >= ENCODER_RESOLUTION) { | ||
91 | encoder_update_kb(NUMBER_OF_ENCODERS + i, false); | ||
92 | } | ||
93 | if (encoder_value[NUMBER_OF_ENCODERS + i] <= -ENCODER_RESOLUTION) { // direction is arbitrary here, but this clockwise | ||
94 | encoder_update_kb(NUMBER_OF_ENCODERS + i, true); | ||
95 | } | ||
96 | encoder_value[NUMBER_OF_ENCODERS + i] %= ENCODER_RESOLUTION; | ||
97 | } | ||
98 | } | ||
99 | #endif | ||