mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-02-24 15:50:48 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
4ad663af8d
@ -20,10 +20,6 @@
|
||||
# include "pin_defs.h"
|
||||
#endif
|
||||
|
||||
/* diode directions */
|
||||
#define COL2ROW 0
|
||||
#define ROW2COL 1
|
||||
|
||||
#ifdef AUDIO_ENABLE
|
||||
# include "song_list.h"
|
||||
#endif
|
||||
|
@ -20,6 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
/* diode directions */
|
||||
#define COL2ROW 0
|
||||
#define ROW2COL 1
|
||||
|
||||
#if (MATRIX_COLS <= 8)
|
||||
typedef uint8_t matrix_row_t;
|
||||
#elif (MATRIX_COLS <= 16)
|
||||
|
Loading…
Reference in New Issue
Block a user