qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-07 10:53:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot
2026-09-05 11:31:22 +00:00
parent 7d8ff6e657 00a110fa3c
commit 1d68edcccf
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
keyboards/novelkeys/nk65/config.h
+3
View File
@@ -4,3 +4,6 @@
#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA
#define IS31FL3733_SW_PULLUP IS31FL3733_PUR_0K5_OHM
#define IS31FL3733_CS_PULLDOWN IS31FL3733_PDR_0K5_OHM
keyboards/novelkeys/nk65/nk65.c
+4 -4
View File
@@ -84,7 +84,6 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
{1, SW5_CS2, SW10_CS2, SW6_CS2}, //LB6 - mid indi
{1, SW11_CS2, SW4_CS2, SW12_CS2}, //LB6 - bot indi
};
#endif
/* Indicator LEDS are part of the LED driver
* Top LED is blue only. LED driver 2 RGB 7 Green channel
@@ -97,23 +96,24 @@ bool rgb_matrix_indicators_kb(void) {
}
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(68, RGB_WHITE); //0, 0xFF, 0);
rgb_matrix_set_color(68, RGB_WHITE);
} else {
rgb_matrix_set_color(68, RGB_OFF);
}
layer_state_t state = layer_state|default_layer_state;
if (state & (1UL << 1)) {
rgb_matrix_set_color(69, RGB_WHITE); // 0xFF, 0, 0xFF);
rgb_matrix_set_color(69, RGB_WHITE);
} else {
rgb_matrix_set_color(69, RGB_OFF);
}
if (state & (1UL << 2)) {
rgb_matrix_set_color(70, RGB_WHITE); //0, 0xFF, 0);
rgb_matrix_set_color(70, RGB_WHITE);
} else {
rgb_matrix_set_color(70, RGB_OFF);
}
return true;
}
#endif
util/env-bootstrap.sh
+7
View File
@@ -440,6 +440,13 @@ __EOT__
install_uv() {
# Install `uv` (or update as necessary)
download_url https://astral.sh/uv/install.sh - | TMPDIR="$(posix_ish_path "${TMPDIR:-}")" UV_INSTALL_DIR="$(windows_ish_path "${UV_INSTALL_DIR:-}")" sh
# Workaround for UV installer not pushing UV_TOOL_BIN_DIR into the env when used with their installer
if [ "$(uname -o 2>/dev/null || true)" = "Msys" ]; then
if [ "${UV_NO_MODIFY_PATH:-}" != "1" ]; then
echo -e "#!/bin/sh\n# Workaround for UV installer not pushing UV_TOOL_BIN_DIR into the env when used with their installer\nexport PATH=\"${UV_TOOL_BIN_DIR}:\$PATH\"" > /etc/profile.d/qmk-uv-env.sh
fi
fi
}
setup_paths() {