Merge remote-tracking branch 'qmk/master' into merge-2024-09-07

This commit is contained in:
Ilya Zhuravlev 2024-09-07 19:49:19 -06:00
commit a780dd1cb1
7600 changed files with 37202 additions and 168275 deletions

View file

@ -19,16 +19,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "ps2.h"
#include "led.h"
bool led_update_kb(led_t led_state)
{
uint8_t ps2_led = 0;
if (led_state.scroll_lock)
ps2_led |= (1<<PS2_LED_SCROLL_LOCK);
if (led_state.num_lock)
ps2_led |= (1<<PS2_LED_NUM_LOCK);
if (led_state.caps_lock)
ps2_led |= (1<<PS2_LED_CAPS_LOCK);
ps2_host_set_led(ps2_led);
bool led_update_kb(led_t led_state) {
if(led_update_user(led_state)) {
uint8_t ps2_led = 0;
if (led_state.scroll_lock)
ps2_led |= (1<<PS2_LED_SCROLL_LOCK);
if (led_state.num_lock)
ps2_led |= (1<<PS2_LED_NUM_LOCK);
if (led_state.caps_lock)
ps2_led |= (1<<PS2_LED_CAPS_LOCK);
ps2_host_set_led(ps2_led);
}
return false;
}

View file

@ -229,7 +229,6 @@ extern "C" {
if (kbd2.isReady()) kbd2.SetReport(0, 0, 2, 0, 1, &usb_led);
if (kbd3.isReady()) kbd3.SetReport(0, 0, 2, 0, 1, &usb_led);
if (kbd4.isReady()) kbd4.SetReport(0, 0, 2, 0, 1, &usb_led);
led_set_user(usb_led);
led_update_kb((led_t){.raw = usb_led});
}
}

View file

@ -10,5 +10,7 @@ void keyboard_post_init_kb(void) {
debug_enable=true;
debug_matrix=true;
debug_keyboard=true;
keyboard_post_init_user();
}
#endif