Fix failing keyboards on develop (#23406)
This commit is contained in:
parent
c635733a7f
commit
62af50ceef
@ -10,6 +10,9 @@
|
|||||||
"bluetooth": true,
|
"bluetooth": true,
|
||||||
"console": false
|
"console": false
|
||||||
},
|
},
|
||||||
|
"build": {
|
||||||
|
"lto": true
|
||||||
|
},
|
||||||
"bluetooth": {
|
"bluetooth": {
|
||||||
"driver": "bluefruit_le"
|
"driver": "bluefruit_le"
|
||||||
}
|
}
|
@ -2,8 +2,10 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include "satisfaction_core.h"
|
#include "satisfaction_core.h"
|
||||||
#include "backlight.h"
|
|
||||||
#include "eeprom.h"
|
#include "eeprom.h"
|
||||||
|
#ifdef BACKLIGHT_ENABLE
|
||||||
|
# include "backlight.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
void pre_encoder_mode_change(void){
|
void pre_encoder_mode_change(void){
|
||||||
if(encoder_mode == ENC_MODE_CLOCK_SET){
|
if(encoder_mode == ENC_MODE_CLOCK_SET){
|
||||||
|
@ -101,19 +101,19 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
|||||||
*/
|
*/
|
||||||
bool indicators_callback(void) {
|
bool indicators_callback(void) {
|
||||||
if ((eeprom_ec_config.num.enabled) && (host_keyboard_led_state().num_lock))
|
if ((eeprom_ec_config.num.enabled) && (host_keyboard_led_state().num_lock))
|
||||||
sethsv(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]);
|
rgblight_sethsv_at(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, NUM_INDICATOR_INDEX);
|
||||||
else
|
else
|
||||||
sethsv(0, 0, 0, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]);
|
rgblight_sethsv_at(0, 0, 0, NUM_INDICATOR_INDEX);
|
||||||
|
|
||||||
if ((eeprom_ec_config.caps.enabled) && (host_keyboard_led_state().caps_lock))
|
if ((eeprom_ec_config.caps.enabled) && (host_keyboard_led_state().caps_lock))
|
||||||
sethsv(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]);
|
rgblight_sethsv_at(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, CAPS_INDICATOR_INDEX);
|
||||||
else
|
else
|
||||||
sethsv(0, 0, 0, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]);
|
rgblight_sethsv_at(0, 0, 0, CAPS_INDICATOR_INDEX);
|
||||||
|
|
||||||
if ((eeprom_ec_config.scroll.enabled) && (host_keyboard_led_state().scroll_lock))
|
if ((eeprom_ec_config.scroll.enabled) && (host_keyboard_led_state().scroll_lock))
|
||||||
sethsv(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]);
|
rgblight_sethsv_at(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, SCROLL_INDICATOR_INDEX);
|
||||||
else
|
else
|
||||||
sethsv(0, 0, 0, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]);
|
rgblight_sethsv_at(0, 0, 0, SCROLL_INDICATOR_INDEX);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,9 @@ GNU General Public License for more details.
|
|||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
#include "atomic_util.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
#include "wait.h"
|
||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
#include "debounce.h"
|
#include "debounce.h"
|
||||||
#ifndef readPort
|
#ifndef readPort
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
// clang-format off
|
// clang-format off
|
||||||
|
|
||||||
#if defined(__AVR__)
|
#if defined(__AVR__)
|
||||||
|
@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#ifndef readPort
|
#ifndef readPort
|
||||||
# include "gpio_extr.h"
|
# include "gpio_extr.h"
|
||||||
#endif
|
#endif
|
||||||
|
#include "atomic_util.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
#include "matrix_extr.h"
|
#include "matrix_extr.h"
|
||||||
|
@ -16,6 +16,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
*/
|
*/
|
||||||
// clang-format off
|
// clang-format off
|
||||||
|
|
||||||
|
#include "atomic_util.h"
|
||||||
|
#include "gpio.h"
|
||||||
|
#include "wait.h"
|
||||||
|
|
||||||
#if defined(MATRIX_EXTENSION_74HC157)
|
#if defined(MATRIX_EXTENSION_74HC157)
|
||||||
# define MATRIX_DEVICES MCU_GPIOa, MCU_GPIOb
|
# define MATRIX_DEVICES MCU_GPIOa, MCU_GPIOb
|
||||||
# define IS_74HC15x(dev) ((dev)==MCU_GPIOa || (dev)==MCU_GPIOb)
|
# define IS_74HC15x(dev) ((dev)==MCU_GPIOa || (dev)==MCU_GPIOb)
|
||||||
|
Loading…
Reference in New Issue
Block a user