diff options
author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/pica40 | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/pica40')
-rw-r--r-- | keyboards/pica40/rev2/info.json | 2 | ||||
-rw-r--r-- | keyboards/pica40/rev2/rev2.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/keyboards/pica40/rev2/info.json b/keyboards/pica40/rev2/info.json index 99540900b9..dbef8254ef 100644 --- a/keyboards/pica40/rev2/info.json +++ b/keyboards/pica40/rev2/info.json @@ -40,7 +40,7 @@ } }, "encoder": { - "rotary": [{ "pin_a": "GP7", "pin_b": "GP7" }] + "rotary": [{ "pin_a": "GP7", "pin_b": "GP7", "resolution": 4 }] }, "usb": { "device_version": "1.0.0", diff --git a/keyboards/pica40/rev2/rev2.h b/keyboards/pica40/rev2/rev2.h index 473011fbb0..95932f7817 100644 --- a/keyboards/pica40/rev2/rev2.h +++ b/keyboards/pica40/rev2/rev2.h @@ -16,7 +16,4 @@ # ifndef ENCODER_MAP_KEY_DELAY # define ENCODER_MAP_KEY_DELAY 2 # endif -# ifndef ENCODER_RESOLUTION -# define ENCODER_RESOLUTION 4 -# endif #endif |