aboutsummaryrefslogtreecommitdiff
path: root/quantum/matrix.c
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2020-11-28 12:02:18 -0800
committerGitHub <noreply@github.com>2020-11-28 12:02:18 -0800
commitc66df1664497546f32662409778731143e45a552 (patch)
treeda73a2d532a27685a31d932b3a44a707d4a3af81 /quantum/matrix.c
parent15385d4113414d42bd062c60c9de5df797d3157f (diff)
downloadqmk_firmware-c66df1664497546f32662409778731143e45a552.tar.gz
qmk_firmware-c66df1664497546f32662409778731143e45a552.zip
2020 November 28 Breaking Changes Update (#11053)
* Branch point for 2020 November 28 Breaking Change * Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183) * Add support for soft serial to ATmega32U2 (#10204) * Change MIDI velocity implementation to allow direct control of velocity value (#9940) * Add ability to build a subset of all keyboards based on platform. * Actually use eeprom_driver_init(). * Make bootloader_jump weak for ChibiOS. (#10417) * Joystick 16-bit support (#10439) * Per-encoder resolutions (#10259) * Share button state from mousekey to pointing_device (#10179) * Add hotfix for chibios keyboards not wake (#10088) * Add advanced/efficient RGB Matrix Indicators (#8564) * Naming change. * Support for STM32 GPIOF,G,H,I,J,K (#10206) * Add milc as a dependency and remove the installed milc (#10563) * ChibiOS upgrade: early init conversions (#10214) * ChibiOS upgrade: configuration file migrator (#9952) * Haptic and solenoid cleanup (#9700) * XD75 cleanup (#10524) * OLED display update interval support (#10388) * Add definition based on currently-selected serial driver. (#10716) * New feature: Retro Tapping per key (#10622) * Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638) * Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530) * Rescale both ChibiOS and AVR backlighting. * Reduce Helix keyboard build variation (#8669) * Minor change to behavior allowing display updates to continue between task ticks (#10750) * Some GPIO manipulations in matrix.c change to atomic. (#10491) * qmk cformat (#10767) * [Keyboard] Update the Speedo firmware for v3.0 (#10657) * Maartenwut/Maarten namechange to evyd13/Evy (#10274) * [quantum] combine repeated lines of code (#10837) * Add step sequencer feature (#9703) * aeboards/ext65 refactor (#10820) * Refactor xelus/dawn60 for Rev2 later (#10584) * add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824) * [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549) * update chibios os usb for the otg driver (#8893) * Remove HD44780 References, Part 4 (#10735) * [Keyboard] Add Valor FRL TKL (+refactor) (#10512) * Fix cursor position bug in oled_write_raw functions (#10800) * Fixup version.h writing when using SKIP_VERSION=yes (#10972) * Allow for certain code in the codebase assuming length of string. (#10974) * Add AT90USB support for serial.c (#10706) * Auto shift: support repeats and early registration (#9826) * Rename ledmatrix.h to match .c file (#7949) * Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231) * Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840) * Merge point for 2020 Nov 28 Breaking Change
Diffstat (limited to 'quantum/matrix.c')
-rw-r--r--quantum/matrix.c35
1 files changed, 25 insertions, 10 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c
index c68c56cac..cab0d2ddc 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -32,6 +32,19 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
32extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values 32extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
33extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values 33extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
34 34
35static inline void setPinOutput_writeLow(pin_t pin) {
36 ATOMIC_BLOCK_FORCEON {
37 setPinOutput(pin);
38 writePinLow(pin);
39 }
40}
41
42static inline void setPinInputHigh_atomic(pin_t pin) {
43 ATOMIC_BLOCK_FORCEON {
44 setPinInputHigh(pin);
45 }
46}
47
35// matrix code 48// matrix code
36 49
37#ifdef DIRECT_PINS 50#ifdef DIRECT_PINS
@@ -70,22 +83,23 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
70# if (DIODE_DIRECTION == COL2ROW) 83# if (DIODE_DIRECTION == COL2ROW)
71 84
72static void select_row(uint8_t row) { 85static void select_row(uint8_t row) {
73 setPinOutput(row_pins[row]); 86 setPinOutput_writeLow(row_pins[row]);
74 writePinLow(row_pins[row]);
75} 87}
76 88
77static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); } 89static void unselect_row(uint8_t row) {
90 setPinInputHigh_atomic(row_pins[row]);
91}
78 92
79static void unselect_rows(void) { 93static void unselect_rows(void) {
80 for (uint8_t x = 0; x < MATRIX_ROWS; x++) { 94 for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
81 setPinInputHigh(row_pins[x]); 95 setPinInputHigh_atomic(row_pins[x]);
82 } 96 }
83} 97}
84 98
85static void init_pins(void) { 99static void init_pins(void) {
86 unselect_rows(); 100 unselect_rows();
87 for (uint8_t x = 0; x < MATRIX_COLS; x++) { 101 for (uint8_t x = 0; x < MATRIX_COLS; x++) {
88 setPinInputHigh(col_pins[x]); 102 setPinInputHigh_atomic(col_pins[x]);
89 } 103 }
90} 104}
91 105
@@ -120,22 +134,23 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
120# elif (DIODE_DIRECTION == ROW2COL) 134# elif (DIODE_DIRECTION == ROW2COL)
121 135
122static void select_col(uint8_t col) { 136static void select_col(uint8_t col) {
123 setPinOutput(col_pins[col]); 137 setPinOutput_writeLow(col_pins[col]);
124 writePinLow(col_pins[col]);
125} 138}
126 139
127static void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); } 140static void unselect_col(uint8_t col) {
141 setPinInputHigh_atomic(col_pins[col]);
142}
128 143
129static void unselect_cols(void) { 144static void unselect_cols(void) {
130 for (uint8_t x = 0; x < MATRIX_COLS; x++) { 145 for (uint8_t x = 0; x < MATRIX_COLS; x++) {
131 setPinInputHigh(col_pins[x]); 146 setPinInputHigh_atomic(col_pins[x]);
132 } 147 }
133} 148}
134 149
135static void init_pins(void) { 150static void init_pins(void) {
136 unselect_cols(); 151 unselect_cols();
137 for (uint8_t x = 0; x < MATRIX_ROWS; x++) { 152 for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
138 setPinInputHigh(row_pins[x]); 153 setPinInputHigh_atomic(row_pins[x]);
139 } 154 }
140} 155}
141 156