Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2023-03-26 22:57:34 +00:00
commit ff342d78d9
7 changed files with 8 additions and 11 deletions

View File

@ -3,7 +3,7 @@
#pragma once
// Uncomment the following if your board uses 1.5A and 3.0A hold current fuses.
//#define DJINN_SUPPORTS_3A_FUSE
// #define DJINN_SUPPORTS_3A_FUSE
// Encoder settings
#define ENCODER_RESOLUTION 2

View File

@ -3,7 +3,7 @@
#pragma once
// Uncomment the following if your board uses 1.5A and 3.0A hold current fuses.
//#define DJINN_SUPPORTS_3A_FUSE
// #define DJINN_SUPPORTS_3A_FUSE
// Encoder settings
#define ENCODER_RESOLUTION 2

View File

@ -2,11 +2,10 @@
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
// Matrix
#define MATRIX_SHIFT_REGISTER_COUNT 5
//#define MATRIX_ROWS 6 // actually defined in info.json: 5 shift registers, plus one row for extras (i.e. encoder pushbutton read)
//#define MATRIX_COLS 8 // actually defined in info.json: 8 bits per register
// #define MATRIX_ROWS 6 // actually defined in info.json: 5 shift registers, plus one row for extras (i.e. encoder pushbutton read)
// #define MATRIX_COLS 8 // actually defined in info.json: 8 bits per register
// EEPROM configuration
#define EXTERNAL_EEPROM_BYTE_COUNT 8192

View File

@ -2,7 +2,6 @@
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
// Matrix configuration
#define SPI_MATRIX_CHIP_SELECT_PIN GP21
#define SPI_MATRIX_DIVISOR 16

View File

@ -2,7 +2,6 @@
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
// Matrix configuration
#define SPI_MATRIX_CHIP_SELECT_PIN C4
#define SPI_MATRIX_DIVISOR 32