~ruther/qmk_firmware

66d56a948043c6acce7ba14ff96b61551f0b8939 — QMK Bot 2 years ago 36ce81d + 3ee17cd
Merge remote-tracking branch 'origin/master' into develop
M keyboards/tzarc/djinn/djinn_portscan_matrix.c => keyboards/tzarc/djinn/djinn_portscan_matrix.c +1 -1
@@ 114,4 114,4 @@ void matrix_wait_for_interrupt(void) {
        writePinHigh(col_pins[i]);
        setPinInputHigh(col_pins[i]);
    }
}
\ No newline at end of file
}

M keyboards/tzarc/djinn/djinn_usbpd.c => keyboards/tzarc/djinn/djinn_usbpd.c +1 -1
@@ 25,4 25,4 @@ void usbpd_update(void) {
            kb_state.current_setting = allowance;
        }
    }
}
\ No newline at end of file
}

M keyboards/tzarc/djinn/keymaps/default/config.h => keyboards/tzarc/djinn/keymaps/default/config.h +2 -2
@@ 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
\ No newline at end of file
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH

M keyboards/tzarc/djinn/keymaps/via/config.h => keyboards/tzarc/djinn/keymaps/via/config.h +2 -2
@@ 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
\ No newline at end of file
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH

M keyboards/tzarc/ghoul/config.h => keyboards/tzarc/ghoul/config.h +2 -3
@@ 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

M keyboards/tzarc/ghoul/rev1/rp2040/config.h => keyboards/tzarc/ghoul/rev1/rp2040/config.h +0 -1
@@ 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

M keyboards/tzarc/ghoul/rev1/stm32/config.h => keyboards/tzarc/ghoul/rev1/stm32/config.h +0 -1
@@ 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