mirrors/keychron_qmk_firmware
mirrors/keychron_qmk_firmware
0
0
Fork 0
mirror of https://github.com/Keychron/qmk_firmware.git synced 2024-11-28 19:58:48 +06:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing keyboards on develop (#23406)

Browse Source
This commit is contained in:
Joel Challis 2024-04-03 14:01:30 +01:00 committed by GitHub
parent c635733a7f
commit 62af50ceef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keyboards/atreus/feather/info.json → keyboards/atreus/feather/keyboard.json
View File

@ -10,6 +10,9 @@
"bluetooth": true,
"console": false
},
"build": {
"lto": true
},
"bluetooth": {
"driver": "bluefruit_le"
}

4
keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
View File

@ -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){

12
keyboards/cipulot/ec_typek/ec_typek.c
View File

@ -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;
}

2
keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
View File

@ -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 readPort

3
keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h
View File

@ -1,4 +1,7 @@
#pragma once
#include <stdint.h>
// clang-format off
#if defined(__AVR__)

1
keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c
View File

@ -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"

4
keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c
View File

@ -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)