ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2022-06-24 04:11:58 +00:00
commit 0e60b3a620
2 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

34
keyboards/tzarc/djinn/djinn.c
View file

@ -92,6 +92,9 @@ void keyboard_post_init_kb(void) {
#if defined(RGB_MATRIX_ENABLE) #if defined(RGB_MATRIX_ENABLE)
RGB rgb_matrix_hsv_to_rgb(HSV hsv) { RGB rgb_matrix_hsv_to_rgb(HSV hsv) {
float scale; float scale;
# ifdef DJINN_SUPPORTS_3A_FUSE
// The updated BOM on the Djinn has properly-spec'ed fuses -- 1500mA/3000mA hold current
switch (kb_state.current_setting) { switch (kb_state.current_setting) {
default: default:
case USBPD_500MA: case USBPD_500MA:
@ -104,6 +107,19 @@ RGB rgb_matrix_hsv_to_rgb(HSV hsv) {
scale = 1.0f; scale = 1.0f;
break; break;
} }
# else
// The original BOM on the Djinn had wrongly-spec'ed fuses -- 750mA/1500mA hold current
switch (kb_state.current_setting) {
default:
case USBPD_500MA:
case USBPD_1500MA:
scale = 0.35f;
break;
case USBPD_3000MA:
scale = 0.75f;
break;
}
# endif
hsv.v = (uint8_t)(hsv.v * scale); hsv.v = (uint8_t)(hsv.v * scale);
return hsv_to_rgb(hsv); return hsv_to_rgb(hsv);
@ -129,6 +145,9 @@ void housekeeping_task_kb(void) {
static uint8_t current_setting = USBPD_500MA; static uint8_t current_setting = USBPD_500MA;
if (current_setting != kb_state.current_setting) { if (current_setting != kb_state.current_setting) {
current_setting = kb_state.current_setting; current_setting = kb_state.current_setting;
#ifdef DJINN_SUPPORTS_3A_FUSE
// The updated BOM on the Djinn has properly-spec'ed fuses -- 1500mA/3000mA hold current
switch (current_setting) { switch (current_setting) {
default: default:
case USBPD_500MA: case USBPD_500MA:
@ -144,6 +163,21 @@ void housekeeping_task_kb(void) {
writePinHigh(RGB_CURR_3000mA_OK_PIN); writePinHigh(RGB_CURR_3000mA_OK_PIN);
break; break;
} }
#else
// The original BOM on the Djinn had wrongly-spec'ed fuses -- 750mA/1500mA hold current
switch (current_setting) {
default:
case USBPD_500MA:
case USBPD_1500MA:
writePinLow(RGB_CURR_1500mA_OK_PIN);
writePinLow(RGB_CURR_3000mA_OK_PIN);
break;
case USBPD_3000MA:
writePinHigh(RGB_CURR_1500mA_OK_PIN);
writePinLow(RGB_CURR_3000mA_OK_PIN);
break;
}
#endif
// If we've changed the current limit, toggle rgb off and on if it was on, to force a brightness update on all LEDs // If we've changed the current limit, toggle rgb off and on if it was on, to force a brightness update on all LEDs
if (is_keyboard_master() && rgb_matrix_is_enabled()) { if (is_keyboard_master() && rgb_matrix_is_enabled()) {

3
keyboards/tzarc/djinn/keymaps/default/config.h
View file

@ -2,6 +2,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
// Uncomment the following if your board uses 1.5A and 3.0A hold current fuses.
//#define DJINN_SUPPORTS_3A_FUSE
// Encoder settings // Encoder settings
#define ENCODER_RESOLUTION 2 #define ENCODER_RESOLUTION 2