g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2023-03-26 22:56:50 +00:00
parent 36ce81df59 3ee17cd5d3
commit 66d56a9480
7 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/tzarc/djinn/djinn_portscan_matrix.c
View File

@ -114,4 +114,4 @@ void matrix_wait_for_interrupt(void) {
writePinHigh(col_pins[i]);
setPinInputHigh(col_pins[i]);
}
}
}

2
keyboards/tzarc/djinn/djinn_usbpd.c
View File

@ -25,4 +25,4 @@ void usbpd_update(void) {
kb_state.current_setting = allowance;
}
}
}
}

4
keyboards/tzarc/djinn/keymaps/default/config.h
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
@ -60,4 +60,4 @@
#define ENABLE_RGB_MATRIX_SPLASH
#define ENABLE_RGB_MATRIX_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH

4
keyboards/tzarc/djinn/keymaps/via/config.h
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
@ -60,4 +60,4 @@
#define ENABLE_RGB_MATRIX_SPLASH
#define ENABLE_RGB_MATRIX_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH

5
keyboards/tzarc/ghoul/config.h
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

1
keyboards/tzarc/ghoul/rev1/rp2040/config.h
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

1
keyboards/tzarc/ghoul/rev1/stm32/config.h
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