commit: 62af50ceeff95a49f381130008ed03fdb0cc9362 parent c635733a7fd48c6692d818ac8621571cbc5f470a Author: Joel Challis <git@zvecr.com> Date: Wed, 3 Apr 2024 14:01:30 +0100 Fix failing keyboards on develop (#23406)Diffstat:
8 files changed, 38 insertions(+), 23 deletions(-)diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/info.json@@ -1,16 +0,0 @@ -{ - "matrix_pins": { - "cols": ["D7", "B5", "D1", "D0", "C6", "B6", "F0", "D2", "D3", "F4", "F1"], - "rows": ["B7", "D6", "C7", "F5"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", - "features": { - "bluetooth": true, - "console": false - }, - "bluetooth": { - "driver": "bluefruit_le" - } -}diff --git a/keyboards/atreus/feather/keyboard.json b/keyboards/atreus/feather/keyboard.json@@ -0,0 +1,19 @@ +{ + "matrix_pins": { + "cols": ["D7", "B5", "D1", "D0", "C6", "B6", "F0", "D2", "D3", "F4", "F1"], + "rows": ["B7", "D6", "C7", "F5"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "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@@ -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@@ -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@@ -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 <http://www.gnu.org/licenses/>. */ +#include "atomic_util.h" #include "util.h" +#include "wait.h" #include "matrix.h" #include "debounce.h" #ifndef readPortdiff --git 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 <stdint.h> + // 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@@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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@@ -16,6 +16,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ // 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)