mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-07-27 11:31:13 +00:00
Merge acaee3bbf4
into 542440eac5
This commit is contained in:
commit
f1fa191b93
@ -37,6 +37,10 @@
|
|||||||
#include "version.h" // for QMK_BUILDDATE used in EEPROM magic
|
#include "version.h" // for QMK_BUILDDATE used in EEPROM magic
|
||||||
#include "nvm_via.h"
|
#include "nvm_via.h"
|
||||||
|
|
||||||
|
#if defined(SECURE_ENABLE)
|
||||||
|
# include "secure.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(AUDIO_ENABLE)
|
#if defined(AUDIO_ENABLE)
|
||||||
# include "audio.h"
|
# include "audio.h"
|
||||||
#endif
|
#endif
|
||||||
@ -322,8 +326,13 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
|
|||||||
uint8_t rows = 28 / ((MATRIX_COLS + 7) / 8);
|
uint8_t rows = 28 / ((MATRIX_COLS + 7) / 8);
|
||||||
uint8_t i = 2;
|
uint8_t i = 2;
|
||||||
for (uint8_t row = 0; row < rows && row + offset < MATRIX_ROWS; row++) {
|
for (uint8_t row = 0; row < rows && row + offset < MATRIX_ROWS; row++) {
|
||||||
#ifdef VIA_INSECURE
|
#if defined(VIA_INSECURE) && !defined(SECURE_ENABLE)
|
||||||
matrix_row_t value = matrix_get_row(row + offset);
|
matrix_row_t value = matrix_get_row(row + offset);
|
||||||
|
#elif !defined(VIA_INSECURE) && defined(SECURE_ENABLE)
|
||||||
|
matrix_row_t value = 0;
|
||||||
|
if (secure_is_unlocked()) {
|
||||||
|
value = matrix_get_row(row + offset);
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
matrix_row_t value = 0;
|
matrix_row_t value = 0;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user