diff options
| author | Didier Loiseau <didierloiseau+git@gmail.com> | 2016-09-11 01:26:47 +0200 |
|---|---|---|
| committer | Didier Loiseau <didierloiseau+git@gmail.com> | 2016-09-11 01:26:47 +0200 |
| commit | b9014c757599ca288be07629ad1d00ef66c033f1 (patch) | |
| tree | ba056e704e76327c597e25d1be200c4c991efeb8 /tmk_core/common/matrix.h | |
| parent | 60a826923d5a6b0dbe416b0837608149ab82e470 (diff) | |
| parent | 5010df3d8b68a53c382b853c7c2e45922975b631 (diff) | |
| download | firmware-b9014c757599ca288be07629ad1d00ef66c033f1.tar.gz firmware-b9014c757599ca288be07629ad1d00ef66c033f1.tar.bz2 firmware-b9014c757599ca288be07629ad1d00ef66c033f1.zip | |
Merge remote-tracking branch 'remotes/jackhumbert/master' into bépo
Diffstat (limited to 'tmk_core/common/matrix.h')
| -rw-r--r-- | tmk_core/common/matrix.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h index 0b013fc98..cee3593ee 100644 --- a/tmk_core/common/matrix.h +++ b/tmk_core/common/matrix.h @@ -14,7 +14,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ - #ifndef MATRIX_H #define MATRIX_H @@ -63,10 +62,21 @@ void matrix_print(void); void matrix_power_up(void); void matrix_power_down(void); -/* keyboard-specific setup/loop functionality */ +/* executes code for Quantum */ +void matrix_init_quantum(void); +void matrix_scan_quantum(void); + void matrix_init_kb(void); void matrix_scan_kb(void); +void matrix_init_user(void); +void matrix_scan_user(void); + +#ifdef I2C_SPLIT + void slave_matrix_init(void); + uint8_t slave_matrix_scan(void); +#endif + #ifdef __cplusplus } #endif |