Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
108684351e
|
@ -48,8 +48,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
/* Encoder pin assignment */
|
||||
#define ENCODERS_PAD_A { C2 }
|
||||
#define ENCODERS_PAD_B { C3 }
|
||||
#define ENCODERS_PAD_A { C3 }
|
||||
#define ENCODERS_PAD_B { C2 }
|
||||
|
||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
|
||||
#define DEBOUNCE 5
|
||||
|
|
|
@ -88,12 +88,14 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
|
|||
encoder_cw.pressed = true;
|
||||
encoder_cw.time = (timer_read() | 1);
|
||||
action_exec(encoder_cw);
|
||||
wait_ms(20);
|
||||
anim_sleep = timer_read32();
|
||||
oled_on();
|
||||
} else {
|
||||
encoder_ccw.pressed = true;
|
||||
encoder_ccw.time = (timer_read() | 1);
|
||||
action_exec(encoder_ccw);
|
||||
wait_ms(20);
|
||||
anim_sleep = timer_read32();
|
||||
oled_on();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue