From 62af50ceeff95a49f381130008ed03fdb0cc9362 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 3 Apr 2024 14:01:30 +0100 Subject: [PATCH] Fix failing keyboards on develop (#23406) --- .../atreus/feather/{info.json => keyboard.json} | 3 +++ .../lib/satisfaction75/satisfaction_encoder.c | 4 +++- keyboards/cipulot/ec_typek/ec_typek.c | 12 ++++++------ .../symmetric70_proto/matrix_debug/matrix.c | 2 ++ .../symmetric70_proto/matrix_fast/gpio_extr.h | 3 +++ .../handwired/symmetric70_proto/matrix_fast/matrix.c | 1 + .../matrix_fast/matrix_extension_74hc15x.c | 4 ++++ 7 files changed, 22 insertions(+), 7 deletions(-) rename keyboards/atreus/feather/{info.json => keyboard.json} (90%) diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/keyboard.json similarity index 90% rename from keyboards/atreus/feather/info.json rename to keyboards/atreus/feather/keyboard.json index 19e9654f127..7f5866e502a 100644 --- a/keyboards/atreus/feather/info.json +++ b/keyboards/atreus/feather/keyboard.json @@ -10,6 +10,9 @@ "bluetooth": true, "console": false }, + "build": { + "lto": true + }, "bluetooth": { "driver": "bluefruit_le" } diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c index 074fe262b3b..aab005ebd87 100644 --- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c +++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c @@ -2,8 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "satisfaction_core.h" -#include "backlight.h" #include "eeprom.h" +#ifdef BACKLIGHT_ENABLE +# include "backlight.h" +#endif void pre_encoder_mode_change(void){ if(encoder_mode == ENC_MODE_CLOCK_SET){ diff --git a/keyboards/cipulot/ec_typek/ec_typek.c b/keyboards/cipulot/ec_typek/ec_typek.c index 035c90303ca..7c3874d6b3f 100644 --- a/keyboards/cipulot/ec_typek/ec_typek.c +++ b/keyboards/cipulot/ec_typek/ec_typek.c @@ -101,19 +101,19 @@ layer_state_t layer_state_set_user(layer_state_t state) { */ bool indicators_callback(void) { 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 - 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)) - 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 - 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)) - 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 - sethsv(0, 0, 0, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + rgblight_sethsv_at(0, 0, 0, SCROLL_INDICATOR_INDEX); return true; } diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c index 22d92dd99a1..d6fcb0f7939 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c @@ -14,7 +14,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include "atomic_util.h" #include "util.h" +#include "wait.h" #include "matrix.h" #include "debounce.h" #ifndef readPort diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h b/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h index e31cb5f3a5d..437fa93a201 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h @@ -1,4 +1,7 @@ #pragma once + +#include + // clang-format off #if defined(__AVR__) diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c index 3acbdfbeda6..842df65dbd6 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c @@ -18,6 +18,7 @@ along with this program. If not, see . #ifndef readPort # include "gpio_extr.h" #endif +#include "atomic_util.h" #include "util.h" #include "matrix.h" #include "matrix_extr.h" diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c index bca53da24c2..202454a2215 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c @@ -16,6 +16,10 @@ along with this program. If not, see . */ // clang-format off +#include "atomic_util.h" +#include "gpio.h" +#include "wait.h" + #if defined(MATRIX_EXTENSION_74HC157) # define MATRIX_DEVICES MCU_GPIOa, MCU_GPIOb # define IS_74HC15x(dev) ((dev)==MCU_GPIOa || (dev)==MCU_GPIOb)