Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various keyboard fixes #18649

Merged
merged 1 commit into from
Oct 8, 2022
Merged

Various keyboard fixes #18649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keyboards/dailycraft/sandbox/sandbox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "sandbox.h"

#ifdef OLED_ENABLE
bool oled_task_user(void) {
bool oled_task_kb(void) {
if (!oled_task_user()) { return false; }
switch (get_highest_layer(layer_state)) {
case 0:
Expand Down
2 changes: 1 addition & 1 deletion keyboards/duck/jetfire/indicator_leds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ void backlight_init_ports(void);
void backlight_set_state(bool cfg[7]);
void backlight_update_state(void);
void backlight_toggle_rgb(bool enabled);
void backlight_set_rgb(uint8_t cfg[17][3]);
void backlight_set_rgb(uint8_t cfg[RGBLED_NUM][3]);
void backlight_set(uint8_t level);
void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device);
61 changes: 8 additions & 53 deletions keyboards/duck/jetfire/jetfire.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,61 +44,16 @@ uint8_t backlight_state_led = 1<<STATE_LED_LAYER_0;

void backlight_toggle_rgb(bool enabled)
{
uint8_t rgb[RGBLED_NUM][3] = { 0 };

if(enabled) {
uint8_t rgb[RGBLED_NUM][3] = {
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
{backlight_rgb_r, backlight_rgb_g, backlight_rgb_b}
};
backlight_set_rgb(rgb);
} else {
uint8_t rgb[RGBLED_NUM][3] = {
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0}
};
backlight_set_rgb(rgb);
for(uint8_t i = 0; i < RGBLED_NUM; ++i) {
rgb[i][0] = backlight_rgb_r;
rgb[i][1] = backlight_rgb_g;
rgb[i][2] = backlight_rgb_b;
}
}
backlight_set_rgb(rgb);
}

void backlight_set_rgb(uint8_t cfg[RGBLED_NUM][3])
Expand Down
2 changes: 1 addition & 1 deletion keyboards/duck/octagon/v2/indicator_leds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device) {
}

// Port from backlight_set_state
void indicator_leds_set(bool leds[8]) {
void indicator_leds_set(bool leds[7]) {
cli();
send_color(leds[1] ? 255 : 0, leds[2] ? 255 : 0, leds[0] ? 255 : 0, Device_STATUSLED);
send_color(leds[4] ? 255 : 0, leds[3] ? 255 : 0, leds[5] ? 255 : 0, Device_STATUSLED);
Expand Down
2 changes: 1 addition & 1 deletion keyboards/duck/octagon/v2/indicator_leds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "duck_led/duck_led.h"

void indicator_leds_set(bool leds[8]);
void indicator_leds_set(bool leds[7]);
void backlight_toggle_rgb(bool enabled);
void backlight_set_rgb(uint8_t cfg[17][3]);
void backlight_init_ports(void);
Expand Down
2 changes: 1 addition & 1 deletion keyboards/dyz/synthesis60/synthesis60.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#ifdef OLED_ENABLE
bool oled_task_kb(void) {
if (!oled_task_kb()) { return false; }
if (!oled_task_user()) { return false; }
// Host Keyboard Layer Status
oled_write_P(PSTR("Synthesis60\nLayer: "), false);
// Host Keyboard LED Status
Expand Down
2 changes: 1 addition & 1 deletion keyboards/yandrstudio/nz64/nz64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ led_config_t g_led_config = {
};

bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
if (!rgb_matrix_indicators_advanced_kb(led_min, led_max)) {
if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
return false;
}
if (rgb_matrix_is_enabled()) {
Expand Down