aboutsummaryrefslogtreecommitdiff
path: root/quantum/split_common/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/split_common/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/split_common/matrix.c')
-rw-r--r--quantum/split_common/matrix.c35
1 files changed, 25 insertions, 10 deletions
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c
index 5bad9db08..cd5a024c3 100644
--- a/quantum/split_common/matrix.c
+++ b/quantum/split_common/matrix.c
@@ -45,6 +45,19 @@ uint8_t thisHand, thatHand;
45// user-defined overridable functions 45// user-defined overridable functions
46__attribute__((weak)) void matrix_slave_scan_user(void) {} 46__attribute__((weak)) void matrix_slave_scan_user(void) {}
47 47
48static inline void setPinOutput_writeLow(pin_t pin) {
49 ATOMIC_BLOCK_FORCEON {
50 setPinOutput(pin);
51 writePinLow(pin);
52 }
53}
54
55static inline void setPinInputHigh_atomic(pin_t pin) {
56 ATOMIC_BLOCK_FORCEON {
57 setPinInputHigh(pin);
58 }
59}
60
48// matrix code 61// matrix code
49 62
50#ifdef DIRECT_PINS 63#ifdef DIRECT_PINS
@@ -83,22 +96,23 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
83# if (DIODE_DIRECTION == COL2ROW) 96# if (DIODE_DIRECTION == COL2ROW)
84 97
85static void select_row(uint8_t row) { 98static void select_row(uint8_t row) {
86 setPinOutput(row_pins[row]); 99 setPinOutput_writeLow(row_pins[row]);
87 writePinLow(row_pins[row]);
88} 100}
89 101
90static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); } 102static void unselect_row(uint8_t row) {
103 setPinInputHigh_atomic(row_pins[row]);
104}
91 105
92static void unselect_rows(void) { 106static void unselect_rows(void) {
93 for (uint8_t x = 0; x < ROWS_PER_HAND; x++) { 107 for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
94 setPinInputHigh(row_pins[x]); 108 setPinInputHigh_atomic(row_pins[x]);
95 } 109 }
96} 110}
97 111
98static void init_pins(void) { 112static void init_pins(void) {
99 unselect_rows(); 113 unselect_rows();
100 for (uint8_t x = 0; x < MATRIX_COLS; x++) { 114 for (uint8_t x = 0; x < MATRIX_COLS; x++) {
101 setPinInputHigh(col_pins[x]); 115 setPinInputHigh_atomic(col_pins[x]);
102 } 116 }
103} 117}
104 118
@@ -133,22 +147,23 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
133# elif (DIODE_DIRECTION == ROW2COL) 147# elif (DIODE_DIRECTION == ROW2COL)
134 148
135static void select_col(uint8_t col) { 149static void select_col(uint8_t col) {
136 setPinOutput(col_pins[col]); 150 setPinOutput_writeLow(col_pins[col]);
137 writePinLow(col_pins[col]);
138} 151}
139 152
140static void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); } 153static void unselect_col(uint8_t col) {
154 setPinInputHigh_atomic(col_pins[col]);
155}
141 156
142static void unselect_cols(void) { 157static void unselect_cols(void) {
143 for (uint8_t x = 0; x < MATRIX_COLS; x++) { 158 for (uint8_t x = 0; x < MATRIX_COLS; x++) {
144 setPinInputHigh(col_pins[x]); 159 setPinInputHigh_atomic(col_pins[x]);
145 } 160 }
146} 161}
147 162
148static void init_pins(void) { 163static void init_pins(void) {
149 unselect_cols(); 164 unselect_cols();
150 for (uint8_t x = 0; x < ROWS_PER_HAND; x++) { 165 for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
151 setPinInputHigh(row_pins[x]); 166 setPinInputHigh_atomic(row_pins[x]);
152 } 167 }
153} 168}
154 169