mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						9634c72d7e
					
				@ -1,77 +0,0 @@
 | 
				
			|||||||
/*
 | 
					 | 
				
			||||||
Copyright 2011 Jun Wako <wakojun@gmail.com>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
This program is free software: you can redistribute it and/or modify
 | 
					 | 
				
			||||||
it under the terms of the GNU General Public License as published by
 | 
					 | 
				
			||||||
the Free Software Foundation, either version 2 of the License, or
 | 
					 | 
				
			||||||
(at your option) any later version.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
This program is distributed in the hope that it will be useful,
 | 
					 | 
				
			||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
					 | 
				
			||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
					 | 
				
			||||||
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
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#include <stdint.h>
 | 
					 | 
				
			||||||
#include <stdbool.h>
 | 
					 | 
				
			||||||
#include "keyboard.h"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#if (MATRIX_COLS <= 8)
 | 
					 | 
				
			||||||
typedef  uint8_t    matrix_row_t;
 | 
					 | 
				
			||||||
#elif (MATRIX_COLS <= 16)
 | 
					 | 
				
			||||||
typedef  uint16_t   matrix_row_t;
 | 
					 | 
				
			||||||
#elif (MATRIX_COLS <= 32)
 | 
					 | 
				
			||||||
typedef  uint32_t   matrix_row_t;
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#error "MATRIX_COLS: invalid value"
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#define MATRIX_IS_ON(row, col)  (matrix_get_row(row) && (1<<col))
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifdef __cplusplus
 | 
					 | 
				
			||||||
extern "C" {
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* number of matrix rows */
 | 
					 | 
				
			||||||
uint8_t matrix_rows(void);
 | 
					 | 
				
			||||||
/* number of matrix columns */
 | 
					 | 
				
			||||||
uint8_t matrix_cols(void);
 | 
					 | 
				
			||||||
/* should be called at early stage of startup before matrix_init.(optional) */
 | 
					 | 
				
			||||||
void matrix_setup(void);
 | 
					 | 
				
			||||||
/* intialize matrix for scaning. */
 | 
					 | 
				
			||||||
void matrix_init(void);
 | 
					 | 
				
			||||||
/* scan all key states on matrix */
 | 
					 | 
				
			||||||
uint8_t matrix_scan(void);
 | 
					 | 
				
			||||||
/* whether modified from previous scan. used after matrix_scan. */
 | 
					 | 
				
			||||||
bool matrix_is_modified(void) __attribute__ ((deprecated));
 | 
					 | 
				
			||||||
/* whether a switch is on */
 | 
					 | 
				
			||||||
bool matrix_is_on(uint8_t row, uint8_t col);
 | 
					 | 
				
			||||||
/* matrix state on row */
 | 
					 | 
				
			||||||
matrix_row_t matrix_get_row(uint8_t row);
 | 
					 | 
				
			||||||
/* print matrix for debug */
 | 
					 | 
				
			||||||
void matrix_print(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* power control */
 | 
					 | 
				
			||||||
void matrix_power_up(void);
 | 
					 | 
				
			||||||
void matrix_power_down(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* 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 __cplusplus
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
@ -1,77 +0,0 @@
 | 
				
			|||||||
/*
 | 
					 | 
				
			||||||
Copyright 2011 Jun Wako <wakojun@gmail.com>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
This program is free software: you can redistribute it and/or modify
 | 
					 | 
				
			||||||
it under the terms of the GNU General Public License as published by
 | 
					 | 
				
			||||||
the Free Software Foundation, either version 2 of the License, or
 | 
					 | 
				
			||||||
(at your option) any later version.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
This program is distributed in the hope that it will be useful,
 | 
					 | 
				
			||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
					 | 
				
			||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
					 | 
				
			||||||
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
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#include <stdint.h>
 | 
					 | 
				
			||||||
#include <stdbool.h>
 | 
					 | 
				
			||||||
#include "keyboard.h"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#if (MATRIX_COLS <= 8)
 | 
					 | 
				
			||||||
typedef  uint8_t    matrix_row_t;
 | 
					 | 
				
			||||||
#elif (MATRIX_COLS <= 16)
 | 
					 | 
				
			||||||
typedef  uint16_t   matrix_row_t;
 | 
					 | 
				
			||||||
#elif (MATRIX_COLS <= 32)
 | 
					 | 
				
			||||||
typedef  uint32_t   matrix_row_t;
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#error "MATRIX_COLS: invalid value"
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#define MATRIX_IS_ON(row, col)  (matrix_get_row(row) && (1<<col))
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifdef __cplusplus
 | 
					 | 
				
			||||||
extern "C" {
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* number of matrix rows */
 | 
					 | 
				
			||||||
uint8_t matrix_rows(void);
 | 
					 | 
				
			||||||
/* number of matrix columns */
 | 
					 | 
				
			||||||
uint8_t matrix_cols(void);
 | 
					 | 
				
			||||||
/* should be called at early stage of startup before matrix_init.(optional) */
 | 
					 | 
				
			||||||
void matrix_setup(void);
 | 
					 | 
				
			||||||
/* intialize matrix for scaning. */
 | 
					 | 
				
			||||||
void matrix_init(void);
 | 
					 | 
				
			||||||
/* scan all key states on matrix */
 | 
					 | 
				
			||||||
uint8_t matrix_scan(void);
 | 
					 | 
				
			||||||
/* whether modified from previous scan. used after matrix_scan. */
 | 
					 | 
				
			||||||
bool matrix_is_modified(void) __attribute__ ((deprecated));
 | 
					 | 
				
			||||||
/* whether a switch is on */
 | 
					 | 
				
			||||||
bool matrix_is_on(uint8_t row, uint8_t col);
 | 
					 | 
				
			||||||
/* matrix state on row */
 | 
					 | 
				
			||||||
matrix_row_t matrix_get_row(uint8_t row);
 | 
					 | 
				
			||||||
/* print matrix for debug */
 | 
					 | 
				
			||||||
void matrix_print(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* power control */
 | 
					 | 
				
			||||||
void matrix_power_up(void);
 | 
					 | 
				
			||||||
void matrix_power_down(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* 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 __cplusplus
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
@ -32,8 +32,6 @@ typedef uint32_t matrix_row_t;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#define MATRIX_ROW_SHIFTER ((matrix_row_t)1)
 | 
					#define MATRIX_ROW_SHIFTER ((matrix_row_t)1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1 << col))
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifdef __cplusplus
 | 
					#ifdef __cplusplus
 | 
				
			||||||
extern "C" {
 | 
					extern "C" {
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user