Make default layer size 16-bit (#15286)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
This commit is contained in:
parent
cfcd647b2e
commit
0da6562c4d
293 changed files with 1249 additions and 1309 deletions
|
@ -115,7 +115,7 @@ void tap_dance_process_keycode(uint16_t keycode) {
|
|||
}
|
||||
|
||||
__attribute__ ((weak))
|
||||
void layer_state_set_rgb(uint32_t state) {}
|
||||
void layer_state_set_rgb(layer_state_t state) {}
|
||||
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
layer_state_set_rgb(state);
|
||||
|
|
|
@ -23,8 +23,8 @@
|
|||
#include "quantum.h"
|
||||
#include "333fred.h"
|
||||
|
||||
void layer_state_set_rgb(uint32_t state) {
|
||||
switch (biton32(state)) {
|
||||
void layer_state_set_rgb(layer_state_t state) {
|
||||
switch (get_highest_layer(state)) {
|
||||
case BASE:
|
||||
// purple
|
||||
rgblight_sethsv_noeeprom(210, 255, 20);
|
||||
|
|
|
@ -59,7 +59,7 @@ __attribute__ ((weak)) void matrix_scan_keymap(void) { }
|
|||
__attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
|
||||
return true;
|
||||
}
|
||||
__attribute__ ((weak)) uint32_t layer_state_set_keymap (uint32_t state) {
|
||||
__attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
__attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) { }
|
||||
|
@ -627,7 +627,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
|||
state = layer_state_set_keymap (state);
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
// Change RGB lighting depending on the last layer activated
|
||||
rgblight_change( biton32(state) );
|
||||
rgblight_change( get_highest_layer(state) );
|
||||
#endif
|
||||
return state;
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
}
|
||||
|
||||
__attribute__((weak))
|
||||
uint32_t layer_state_set_keymap(uint32_t state) {
|
||||
layer_state_t layer_state_set_keymap(layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
|
||||
|
|
|
@ -31,4 +31,4 @@ enum layers_user {
|
|||
};
|
||||
|
||||
bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
|
||||
uint32_t layer_state_set_keymap(uint32_t state);
|
||||
layer_state_t layer_state_set_keymap(layer_state_t state);
|
||||
|
|
|
@ -18,7 +18,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
|
|||
return true;
|
||||
}
|
||||
__attribute__ ((weak))
|
||||
uint32_t layer_state_set_keymap (uint32_t state) {
|
||||
layer_state_t layer_state_set_keymap (layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
__attribute__ ((weak))
|
||||
|
@ -107,4 +107,3 @@ layer_state_t layer_state_set_user (layer_state_t state) {
|
|||
void led_set_user(uint8_t usb_led) {
|
||||
led_set_keymap(usb_led);
|
||||
}
|
||||
|
||||
|
|
|
@ -382,7 +382,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
|
|||
static char text[CALC_BUFFER_SIZE + 1]; // Used to store input and then output when ready to print
|
||||
static char backspaceText[CALC_BUFFER_SIZE + 1]; // Pretty dumb waste of memory because only backspace characters, used with send_string to backspace and remove input
|
||||
|
||||
if((biton32(layer_state) == CALC_LAYER && CALC_FORCE_NUM_LOCK_INSIDE_CALC) || (biton32(layer_state) != CALC_LAYER && CALC_FORCE_NUM_LOCK_OUTSIDE_CALC))
|
||||
if((get_highest_layer(layer_state) == CALC_LAYER && CALC_FORCE_NUM_LOCK_INSIDE_CALC) || (get_highest_layer(layer_state) != CALC_LAYER && CALC_FORCE_NUM_LOCK_OUTSIDE_CALC))
|
||||
{
|
||||
bool numpadKeyPressed = record->event.pressed &&
|
||||
!(get_mods() & MODS_SHIFT_MASK) &&
|
||||
|
@ -397,7 +397,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
|
|||
}
|
||||
}
|
||||
|
||||
if(biton32(layer_state) != CALC_LAYER) { return true; }
|
||||
if(get_highest_layer(layer_state) != CALC_LAYER) { return true; }
|
||||
|
||||
int action = process_input(keycode, get_mods(), record->event);
|
||||
switch(action)
|
||||
|
@ -457,4 +457,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
|
|||
send_string(characterToSend);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
|||
return layer_state_set_keymap(state);
|
||||
}
|
||||
|
||||
__attribute__((weak)) uint32_t layer_state_set_keymap(uint32_t state) { return state; }
|
||||
__attribute__((weak)) layer_state_t layer_state_set_keymap(layer_state_t state) { return state; }
|
||||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
bool process_record_user_result = process_record_keymap(keycode, record) && process_record_edvorakjp_swap_scln(keycode, record) && process_record_edvorakjp_config(keycode, record) && process_record_layer(keycode, record) && process_record_ime(keycode, record);
|
||||
|
|
|
@ -68,7 +68,7 @@ enum tap_dance_code {
|
|||
void matrix_init_user(void);
|
||||
void matrix_init_keymap(void);
|
||||
layer_state_t layer_state_set_user(layer_state_t state);
|
||||
uint32_t layer_state_set_keymap(uint32_t state);
|
||||
layer_state_t layer_state_set_keymap(layer_state_t state);
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record);
|
||||
bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ __attribute__ ((weak))
|
|||
void matrix_scan_keymap(void) {}
|
||||
|
||||
__attribute__ ((weak))
|
||||
uint32_t layer_state_set_keymap (uint32_t state) {
|
||||
layer_state_t layer_state_set_keymap (layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ void tap_dance_mouse_btns (qk_tap_dance_state_t *state, void *user_data) {
|
|||
|
||||
// counting on all the qwerty layers to be less than dvorak_on_bepo
|
||||
int on_qwerty(){
|
||||
uint8_t deflayer = (biton32(default_layer_state));
|
||||
uint8_t deflayer = (get_highest_layer(default_layer_state));
|
||||
return (deflayer < _DVORAK_BP);
|
||||
}
|
||||
|
||||
|
@ -58,7 +58,7 @@ static void switch_default_layer(uint8_t layer) {
|
|||
|
||||
// so the keyboard remembers which layer it's in after power disconnect.
|
||||
/*
|
||||
uint32_t default_layer_state_set_kb(uint32_t state) {
|
||||
layer_state_t default_layer_state_set_kb(layer_state_t state) {
|
||||
eeconfig_update_default_layer(state);
|
||||
return state;
|
||||
}
|
||||
|
|
|
@ -117,7 +117,7 @@ void matrix_scan_user(void){
|
|||
}
|
||||
|
||||
__attribute__ ((weak))
|
||||
uint32_t layer_state_set_keymap (uint32_t state) {
|
||||
layer_state_t layer_state_set_keymap (layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
|
||||
|
@ -133,12 +133,12 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
|||
|
||||
|
||||
__attribute__ ((weak))
|
||||
uint32_t default_layer_state_set_keymap (uint32_t state) {
|
||||
layer_state_t default_layer_state_set_keymap (layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
|
||||
// Runs state check and changes underglow color and animation
|
||||
uint32_t default_layer_state_set_user(uint32_t state) {
|
||||
layer_state_t default_layer_state_set_user(layer_state_t state) {
|
||||
state = default_layer_state_set_keymap(state);
|
||||
#if 0
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
|
|
|
@ -65,8 +65,8 @@ void shutdown_keymap(void);
|
|||
void suspend_power_down_keymap(void);
|
||||
void suspend_wakeup_init_keymap(void);
|
||||
void matrix_scan_keymap(void);
|
||||
uint32_t layer_state_set_keymap (uint32_t state);
|
||||
uint32_t default_layer_state_set_keymap (uint32_t state);
|
||||
layer_state_t layer_state_set_keymap (layer_state_t state);
|
||||
layer_state_t default_layer_state_set_keymap (layer_state_t state);
|
||||
void led_set_keymap(uint8_t usb_led);
|
||||
void eeconfig_init_keymap(void);
|
||||
|
||||
|
|
|
@ -84,7 +84,7 @@ void matrix_scan_rgb(void) {
|
|||
layer_state_t layer_state_set_rgb(layer_state_t state) {
|
||||
# ifdef RGBLIGHT_ENABLE
|
||||
if (userspace_config.rgb_layer_change) {
|
||||
switch (biton32(state)) { // _RAISE, _LOWER and _ADJUST use a custom color and the breathing effect
|
||||
switch (get_highest_layer(state)) { // _RAISE, _LOWER and _ADJUST use a custom color and the breathing effect
|
||||
case _RAISE:
|
||||
rgblight_sethsv_noeeprom_green();
|
||||
rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
|
||||
|
@ -98,7 +98,7 @@ layer_state_t layer_state_set_rgb(layer_state_t state) {
|
|||
rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 2);
|
||||
break;
|
||||
default: // Use a solid color for normal layers
|
||||
switch (biton32(default_layer_state)) {
|
||||
switch (get_highest_layer(default_layer_state)) {
|
||||
case _QWERTY:
|
||||
rgblight_sethsv_noeeprom_magenta();
|
||||
break;
|
||||
|
@ -118,7 +118,7 @@ layer_state_t layer_state_set_rgb(layer_state_t state) {
|
|||
rgblight_sethsv_noeeprom_white();
|
||||
break;
|
||||
}
|
||||
biton32(state) == _MODS ? rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING) : rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); // if _MODS layer is on, then breath to denote it
|
||||
get_highest_layer(state) == _MODS ? rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING) : rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); // if _MODS layer is on, then breath to denote it
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -135,7 +135,7 @@ void matrix_scan_indicator(void) {
|
|||
#endif // !INDICATOR_LIGHTS
|
||||
|
||||
void rgblight_fade_helper(bool direction){
|
||||
// true: increase val = fade in
|
||||
// true: increase val = fade in
|
||||
// false: decrease val = fade out
|
||||
for (uint8_t index = 0; index < RGBLIGHT_VAL_STEP ; index++) {
|
||||
direction ? rgblight_increase_val() : rgblight_decrease_val();
|
||||
|
@ -147,10 +147,10 @@ void fadeflash_leds(uint8_t hue, uint8_t sat, uint8_t val){
|
|||
// fade out, set new hue and saturation, fade in, fade out, set old color, fade in
|
||||
// this is used in leader.c
|
||||
// TODO: come up with a better name maybe
|
||||
rgblight_fade_helper(false);
|
||||
rgblight_sethsv_noeeprom(hue, sat, 0);
|
||||
rgblight_fade_helper(true);
|
||||
rgblight_fade_helper(false);
|
||||
rgblight_sethsv_noeeprom(base_hue, base_sat, 0);
|
||||
rgblight_fade_helper(true);
|
||||
rgblight_fade_helper(false);
|
||||
rgblight_sethsv_noeeprom(hue, sat, 0);
|
||||
rgblight_fade_helper(true);
|
||||
rgblight_fade_helper(false);
|
||||
rgblight_sethsv_noeeprom(base_hue, base_sat, 0);
|
||||
rgblight_fade_helper(true);
|
||||
}
|
||||
|
|
|
@ -63,11 +63,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
|
||||
|
||||
__attribute__ ((weak))
|
||||
uint32_t layer_state_set_keymap (uint32_t state) {
|
||||
layer_state_t layer_state_set_keymap (layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
|
||||
uint32_t layer_state_set_user (uint32_t state) {
|
||||
layer_state_t layer_state_set_user (layer_state_t state) {
|
||||
return layer_state_set_keymap (state);
|
||||
}
|
||||
|
||||
|
|
|
@ -137,7 +137,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
};
|
||||
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
switch (biton32(state)) {
|
||||
switch (get_highest_layer(state)) {
|
||||
case _RAISE:
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
rgblight_sethsv_noeeprom (240, 255, 255);
|
||||
|
|
|
@ -23,7 +23,7 @@ bool process_record_oled(uint16_t keycode, keyrecord_t *record) {
|
|||
|
||||
void render_layout_state(void) {
|
||||
oled_write_P(PSTR("Layout: "), false);
|
||||
switch (biton32(default_layer_state)) {
|
||||
switch (get_highest_layer(default_layer_state)) {
|
||||
case _COLEMAK:
|
||||
oled_write_P(PSTR("Colemak"), false);
|
||||
break;
|
||||
|
|
|
@ -95,4 +95,4 @@ void keyboard_post_init_user(void) {
|
|||
// Default functions.
|
||||
__attribute__((weak)) void keyboard_post_init_user_keymap(void) {}
|
||||
|
||||
__attribute__((weak)) uint32_t layer_state_set_user_keymap(uint32_t state) { return state; }
|
||||
__attribute__((weak)) layer_state_t layer_state_set_user_keymap(layer_state_t state) { return state; }
|
||||
|
|
|
@ -169,4 +169,4 @@ enum {
|
|||
|
||||
// Extra stuff that might be needed.
|
||||
void keyboard_post_init_user_keymap(void);
|
||||
uint32_t layer_state_set_user_keymap(uint32_t state);
|
||||
layer_state_t layer_state_set_user_keymap(layer_state_t state);
|
||||
|
|
|
@ -59,7 +59,7 @@ __attribute__ ((weak)) void matrix_scan_keymap(void) { }
|
|||
__attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
|
||||
return true;
|
||||
}
|
||||
__attribute__ ((weak)) uint32_t layer_state_set_keymap (uint32_t state) {
|
||||
__attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
__attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) { }
|
||||
|
@ -551,7 +551,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
|||
state = layer_state_set_keymap (state);
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
// Change RGB lighting depending on the last layer activated
|
||||
rgblight_change( biton32(state) );
|
||||
rgblight_change( get_highest_layer(state) );
|
||||
#endif
|
||||
return state;
|
||||
}
|
||||
|
|
|
@ -49,12 +49,12 @@ bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
|
|||
|
||||
|
||||
__attribute__ ((weak))
|
||||
uint32_t layer_state_set_keymap (uint32_t state) {
|
||||
layer_state_t layer_state_set_keymap (layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
|
||||
__attribute__ ((weak))
|
||||
uint32_t default_layer_state_set_keymap (uint32_t state) {
|
||||
layer_state_t default_layer_state_set_keymap (layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ void matrix_init_user(void) {
|
|||
};
|
||||
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
switch (biton32(state)) {
|
||||
switch (get_highest_layer(state)) {
|
||||
case 0:
|
||||
rgblight_setrgb (0xFF, 0x00, 0x00);
|
||||
break;
|
||||
|
|
|
@ -138,7 +138,7 @@ void matrix_init_user(void) {
|
|||
}
|
||||
}
|
||||
|
||||
uint32_t default_layer_state_set_kb(uint32_t state) {
|
||||
layer_state_t default_layer_state_set_kb(layer_state_t state) {
|
||||
// persist changes to default layers
|
||||
eeconfig_update_default_layer(state);
|
||||
return state;
|
||||
|
|
|
@ -128,7 +128,7 @@ layer_state_t layer_state_set_keymap (layer_state_t state) {
|
|||
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
|
||||
switch (biton32(state)) {
|
||||
switch (get_highest_layer(state)) {
|
||||
case _LOWER:
|
||||
break;
|
||||
case _RAISE:
|
||||
|
@ -231,7 +231,7 @@ void render_status_main(void) {
|
|||
|
||||
// Host Keyboard Layer Status
|
||||
oled_write_P(PSTR("Layer: "), false);
|
||||
switch (biton32(layer_state)) {
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case _BASE:
|
||||
oled_write_P(PSTR("Colemak\n"), false);
|
||||
break;
|
||||
|
|
|
@ -31,7 +31,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
|
|||
return true;
|
||||
}
|
||||
__attribute__ ((weak))
|
||||
uint32_t layer_state_set_keymap (uint32_t state) {
|
||||
layer_state_t layer_state_set_keymap (layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
__attribute__ ((weak))
|
||||
|
@ -300,7 +300,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
|||
#ifdef RGBLIGHT_ENABLE
|
||||
uint8_t default_layer = eeconfig_read_default_layer();
|
||||
if (rgb_layer_change) {
|
||||
switch (biton32(state)) {
|
||||
switch (get_highest_layer(state)) {
|
||||
case _FUNCTION:
|
||||
rgblight_set_blue;
|
||||
rgblight_mode(1);
|
||||
|
@ -377,7 +377,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
|
|||
return true;
|
||||
}
|
||||
__attribute__ ((weak))
|
||||
uint32_t layer_state_set_keymap (uint32_t state) {
|
||||
layer_state_t layer_state_set_keymap (layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
__attribute__ ((weak))
|
||||
|
|
|
@ -37,7 +37,7 @@ static void render_icon(void)
|
|||
|
||||
static void render_layer(void)
|
||||
{
|
||||
uint8_t layer = layer_state ? biton(layer_state) : biton32(default_layer_state);
|
||||
uint8_t layer = layer_state ? get_highest_layer(layer_state) : get_highest_layer(default_layer_state);
|
||||
#ifdef OLED_90ROTATION
|
||||
oled_write_P(PSTR("Layer"), false);
|
||||
#else
|
||||
|
|
|
@ -43,7 +43,7 @@ void matrix_init_user(void) {
|
|||
|
||||
void matrix_scan_user(void) {
|
||||
static uint8_t is_leds_changes = 1;
|
||||
c_lyr = biton32(layer_state);
|
||||
c_lyr = get_highest_layer(layer_state);
|
||||
|
||||
is_leds_changes = is_leds_changes << set_layer_led(c_lyr);
|
||||
is_leds_changes = is_leds_changes << shifted_layer();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue