diff options
| author | Drashna Jael're <drashna@live.com> | 2022-03-25 16:19:22 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-03-25 16:19:22 -0700 |
| commit | 53ff570bf068e04740f187163774327839dfa68b (patch) | |
| tree | 5429e069fc593d484b0b479de422b51ac239be83 /keyboards/ergodox_ez | |
| parent | e8171efc7158ba4ebb24827680b19b775d366b1a (diff) | |
| parent | efc9c525b19b33c6e09057218ea64f07f45f9555 (diff) | |
Remerge 0.16.x' into firmware21
Diffstat (limited to 'keyboards/ergodox_ez')
| -rw-r--r-- | keyboards/ergodox_ez/config.h | 3 | ||||
| -rw-r--r-- | keyboards/ergodox_ez/matrix.c | 2 | ||||
| -rw-r--r-- | keyboards/ergodox_ez/rules.mk | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index d1b954043e..12ab7c5a6a 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -200,6 +200,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION + //#define DEBUG_MATRIX_SCAN_RATE diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c index 41919a7000..ddfbc6100e 100644 --- a/keyboards/ergodox_ez/matrix.c +++ b/keyboards/ergodox_ez/matrix.c @@ -76,7 +76,7 @@ void matrix_init_custom(void) { // Reads and stores a row, returning // whether a change occurred. static inline bool store_raw_matrix_row(uint8_t index) { - matrix_row_t temp = read_cols(index); + matrix_row_t temp = 0x3F & read_cols(index); if (raw_matrix[index] != temp) { raw_matrix[index] = temp; return true; diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk index b706209c9b..30a64b2e49 100644 --- a/keyboards/ergodox_ez/rules.mk +++ b/keyboards/ergodox_ez/rules.mk @@ -36,3 +36,5 @@ MOUSE_SHARED_EP = no # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no + +MOUSE_SHARED_EP = no |