mirror of
https://github.com/qmk/qmk_firmware.git
synced 2026-06-03 14:13:46 -03:00
Fix make test:all failures seen on macOS Tahoe (#26136)
This commit is contained in:
@@ -26,8 +26,8 @@ extern "C" {
|
||||
}
|
||||
|
||||
struct update {
|
||||
int8_t index;
|
||||
bool clockwise;
|
||||
uint8_t index;
|
||||
bool clockwise;
|
||||
};
|
||||
|
||||
uint8_t updates_array_idx = 0;
|
||||
|
||||
@@ -26,8 +26,8 @@ extern "C" {
|
||||
}
|
||||
|
||||
struct update {
|
||||
int8_t index;
|
||||
bool clockwise;
|
||||
uint8_t index;
|
||||
bool clockwise;
|
||||
};
|
||||
|
||||
uint8_t updates_array_idx = 0;
|
||||
|
||||
@@ -26,8 +26,8 @@ extern "C" {
|
||||
}
|
||||
|
||||
struct update {
|
||||
int8_t index;
|
||||
bool clockwise;
|
||||
uint8_t index;
|
||||
bool clockwise;
|
||||
};
|
||||
|
||||
uint8_t updates_array_idx = 0;
|
||||
|
||||
@@ -26,8 +26,8 @@ extern "C" {
|
||||
}
|
||||
|
||||
struct update {
|
||||
int8_t index;
|
||||
bool clockwise;
|
||||
uint8_t index;
|
||||
bool clockwise;
|
||||
};
|
||||
|
||||
uint8_t updates_array_idx = 0;
|
||||
|
||||
@@ -26,8 +26,8 @@ extern "C" {
|
||||
}
|
||||
|
||||
struct update {
|
||||
int8_t index;
|
||||
bool clockwise;
|
||||
uint8_t index;
|
||||
bool clockwise;
|
||||
};
|
||||
|
||||
uint8_t updates_array_idx = 0;
|
||||
|
||||
@@ -26,8 +26,8 @@ extern "C" {
|
||||
}
|
||||
|
||||
struct update {
|
||||
int8_t index;
|
||||
bool clockwise;
|
||||
uint8_t index;
|
||||
bool clockwise;
|
||||
};
|
||||
|
||||
uint8_t updates_array_idx = 0;
|
||||
|
||||
@@ -175,7 +175,7 @@ const key_override_t *clear_active_override(const bool allow_reregister) {
|
||||
|
||||
const key_override_t *const old = active_override;
|
||||
|
||||
const uint8_t mod_free_replacement = clear_mods_from(active_override->replacement);
|
||||
const uint16_t mod_free_replacement = clear_mods_from(active_override->replacement);
|
||||
|
||||
bool unregister_replacement = mod_free_replacement != KC_NO && // KC_NO is never registered
|
||||
mod_free_replacement < SAFE_RANGE; // Custom keycodes are never registered
|
||||
|
||||
@@ -165,6 +165,6 @@ bool process_space_cadet(uint16_t keycode, keyrecord_t *record) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void reset_space_cadet() {
|
||||
void reset_space_cadet(void) {
|
||||
sc_last = 0;
|
||||
}
|
||||
|
||||
@@ -46,12 +46,6 @@
|
||||
# define UNICODE_KEY_WINC KC_RIGHT_ALT
|
||||
#endif
|
||||
|
||||
// Comma-delimited, ordered list of input modes selected for use (e.g. in cycle)
|
||||
// Example: #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_LINUX
|
||||
#ifndef UNICODE_SELECTED_MODES
|
||||
# define UNICODE_SELECTED_MODES -1
|
||||
#endif
|
||||
|
||||
// Whether input mode changes in cycle should be written to EEPROM
|
||||
#ifndef UNICODE_CYCLE_PERSIST
|
||||
# define UNICODE_CYCLE_PERSIST true
|
||||
@@ -66,7 +60,7 @@ unicode_config_t unicode_config;
|
||||
uint8_t unicode_saved_mods;
|
||||
led_t unicode_saved_led_state;
|
||||
|
||||
#if UNICODE_SELECTED_MODES != -1
|
||||
#ifdef UNICODE_SELECTED_MODES
|
||||
static uint8_t selected[] = {UNICODE_SELECTED_MODES};
|
||||
static int8_t selected_count = ARRAY_SIZE(selected);
|
||||
static int8_t selected_index;
|
||||
@@ -136,7 +130,7 @@ static void unicode_play_song(uint8_t mode) {
|
||||
|
||||
void unicode_input_mode_init(void) {
|
||||
eeconfig_read_unicode_mode(&unicode_config);
|
||||
#if UNICODE_SELECTED_MODES != -1
|
||||
#ifdef UNICODE_SELECTED_MODES
|
||||
# if UNICODE_CYCLE_PERSIST
|
||||
// Find input_mode in selected modes
|
||||
int8_t i;
|
||||
@@ -178,7 +172,7 @@ void set_unicode_input_mode(uint8_t mode) {
|
||||
}
|
||||
|
||||
static void cycle_unicode_input_mode(int8_t offset) {
|
||||
#if UNICODE_SELECTED_MODES != -1
|
||||
#ifdef UNICODE_SELECTED_MODES
|
||||
selected_index = (selected_index + offset) % selected_count;
|
||||
if (selected_index < 0) {
|
||||
selected_index += selected_count;
|
||||
|
||||
Reference in New Issue
Block a user