summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/issi/is31fl3741.c5
-rw-r--r--drivers/ws2812.h4
-rw-r--r--quantum/process_keycode/process_ucis.c79
-rw-r--r--quantum/process_keycode/process_unicode_common.c2
-rw-r--r--quantum/process_keycode/process_unicodemap.c2
-rw-r--r--quantum/rgb_matrix_drivers.c6
6 files changed, 47 insertions, 51 deletions
diff --git a/drivers/issi/is31fl3741.c b/drivers/issi/is31fl3741.c
index 45d2b40990..ab4b31465b 100644
--- a/drivers/issi/is31fl3741.c
+++ b/drivers/issi/is31fl3741.c
@@ -24,7 +24,6 @@
#include "i2c_master.h"
#include "progmem.h"
-
// This is a 7-bit address, that gets left-shifted and bit 0
// set to 0 for write, 1 for read (as per I2C protocol)
// The address will vary depending on your wiring:
@@ -178,9 +177,9 @@ void IS31FL3741_init(uint8_t addr) {
// Set Pull up & Down for SWx CSy
IS31FL3741_write_register(addr, ISSI_REG_PULLDOWNUP, 0x77);
-// IS31FL3741_update_led_scaling_registers(addr, 0xFF, 0xFF, 0xFF);
+ // IS31FL3741_update_led_scaling_registers(addr, 0xFF, 0xFF, 0xFF);
-// Wait 10ms to ensure the device has woken up.
+ // Wait 10ms to ensure the device has woken up.
wait_ms(10);
}
diff --git a/drivers/ws2812.h b/drivers/ws2812.h
index 370b14f3e8..f179fcb0ef 100644
--- a/drivers/ws2812.h
+++ b/drivers/ws2812.h
@@ -18,12 +18,12 @@
#include "quantum/color.h"
/*
- * Older WS2812s can handle a reset time (TRST) of 50us, but recent
+ * Older WS2812s can handle a reset time (TRST) of 50us, but recent
* component revisions require a minimum of 280us.
*/
#if !defined(WS2812_TRST_US)
-#define WS2812_TRST_US 280
+# define WS2812_TRST_US 280
#endif
/* User Interface
diff --git a/quantum/process_keycode/process_ucis.c b/quantum/process_keycode/process_ucis.c
index 2541d6eb26..12b0aba9bf 100644
--- a/quantum/process_keycode/process_ucis.c
+++ b/quantum/process_keycode/process_ucis.c
@@ -72,8 +72,7 @@ bool process_ucis(uint16_t keycode, keyrecord_t *record) {
return true;
}
- bool special = keycode == KC_SPC || keycode == KC_ENT ||
- keycode == KC_ESC || keycode == KC_BSPC;
+ bool special = keycode == KC_SPC || keycode == KC_ENT || keycode == KC_ESC || keycode == KC_BSPC;
if (qk_ucis_state.count >= UCIS_MAX_SYMBOL_LENGTH && !special) {
return false;
}
@@ -82,49 +81,49 @@ bool process_ucis(uint16_t keycode, keyrecord_t *record) {
qk_ucis_state.count++;
switch (keycode) {
- case KC_BSPC:
- if (qk_ucis_state.count >= 2) {
- qk_ucis_state.count -= 2;
- return true;
- } else {
- qk_ucis_state.count--;
- return false;
- }
+ case KC_BSPC:
+ if (qk_ucis_state.count >= 2) {
+ qk_ucis_state.count -= 2;
+ return true;
+ } else {
+ qk_ucis_state.count--;
+ return false;
+ }
- case KC_SPC:
- case KC_ENT:
- case KC_ESC:
- for (uint8_t i = 0; i < qk_ucis_state.count; i++) {
- register_code(KC_BSPC);
- unregister_code(KC_BSPC);
- wait_ms(UNICODE_TYPE_DELAY);
- }
+ case KC_SPC:
+ case KC_ENT:
+ case KC_ESC:
+ for (uint8_t i = 0; i < qk_ucis_state.count; i++) {
+ register_code(KC_BSPC);
+ unregister_code(KC_BSPC);
+ wait_ms(UNICODE_TYPE_DELAY);
+ }
- if (keycode == KC_ESC) {
- qk_ucis_state.in_progress = false;
- qk_ucis_cancel();
- return false;
- }
+ if (keycode == KC_ESC) {
+ qk_ucis_state.in_progress = false;
+ qk_ucis_cancel();
+ return false;
+ }
- uint8_t i;
- bool symbol_found = false;
- for (i = 0; ucis_symbol_table[i].symbol; i++) {
- if (is_uni_seq(ucis_symbol_table[i].symbol)) {
- symbol_found = true;
- register_ucis(ucis_symbol_table[i].code_points);
- break;
+ uint8_t i;
+ bool symbol_found = false;
+ for (i = 0; ucis_symbol_table[i].symbol; i++) {
+ if (is_uni_seq(ucis_symbol_table[i].symbol)) {
+ symbol_found = true;
+ register_ucis(ucis_symbol_table[i].code_points);
+ break;
+ }
+ }
+ if (symbol_found) {
+ qk_ucis_success(i);
+ } else {
+ qk_ucis_symbol_fallback();
}
- }
- if (symbol_found) {
- qk_ucis_success(i);
- } else {
- qk_ucis_symbol_fallback();
- }
- qk_ucis_state.in_progress = false;
- return false;
+ qk_ucis_state.in_progress = false;
+ return false;
- default:
- return true;
+ default:
+ return true;
}
}
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index bea34c31ea..84c44d9874 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -257,7 +257,7 @@ void send_unicode_string(const char *str) {
while (*str) {
int32_t code_point = 0;
- str = decode_utf8(str, &code_point);
+ str = decode_utf8(str, &code_point);
if (code_point >= 0) {
register_unicode(code_point);
diff --git a/quantum/process_keycode/process_unicodemap.c b/quantum/process_keycode/process_unicodemap.c
index 789a90445b..fcf676c24e 100644
--- a/quantum/process_keycode/process_unicodemap.c
+++ b/quantum/process_keycode/process_unicodemap.c
@@ -22,7 +22,7 @@ __attribute__((weak)) uint16_t unicodemap_index(uint16_t keycode) {
uint16_t index = keycode - QK_UNICODEMAP_PAIR;
bool shift = unicode_saved_mods & MOD_MASK_SHIFT;
- bool caps = IS_HOST_LED_ON(USB_LED_CAPS_LOCK);
+ bool caps = IS_HOST_LED_ON(USB_LED_CAPS_LOCK);
if (shift ^ caps) {
index >>= 7;
}
diff --git a/quantum/rgb_matrix_drivers.c b/quantum/rgb_matrix_drivers.c
index 2225936086..37bc20ef53 100644
--- a/quantum/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix_drivers.c
@@ -23,7 +23,7 @@
* be here if shared between boards.
*/
-#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FL3737) || defined(IS31FL3741)
+#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FL3737) || defined(IS31FL3741)
# include "i2c_master.h"
@@ -100,9 +100,7 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
.set_color_all = IS31FL3737_set_color_all,
};
# else
-static void flush(void) {
- IS31FL3741_update_pwm_buffers(DRIVER_ADDR_1, DRIVER_ADDR_2);
-}
+static void flush(void) { IS31FL3741_update_pwm_buffers(DRIVER_ADDR_1, DRIVER_ADDR_2); }
const rgb_matrix_driver_t rgb_matrix_driver = {
.init = init,