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

This commit is contained in:
QMK Bot 2023-03-26 22:56:50 +00:00
commit 66d56a9480
7 changed files with 8 additions and 11 deletions

View File

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

View File

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

View File

@ -2,11 +2,10 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
#pragma once #pragma once
// Matrix // Matrix
#define MATRIX_SHIFT_REGISTER_COUNT 5 #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_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_COLS 8 // actually defined in info.json: 8 bits per register
// EEPROM configuration // EEPROM configuration
#define EXTERNAL_EEPROM_BYTE_COUNT 8192 #define EXTERNAL_EEPROM_BYTE_COUNT 8192

View File

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

View File

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