diff options
| author | QMK Bot <hello@qmk.fm> | 2022-06-24 04:11:58 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-06-24 04:11:58 +0000 |
| commit | 0e60b3a62088a218a8b3e4182ff8dfdd3bf2c84b (patch) | |
| tree | d82e342226ea79c8d84924c1dbe1fc52ae88b086 /keyboards/tzarc/djinn/djinn.c | |
| parent | 7060cb7b267e78ba693a77a3346c77c2d4209b01 (diff) | |
| parent | a8677ed296d2304849318166f006db5b790acd9f (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/tzarc/djinn/djinn.c')
| -rw-r--r-- | keyboards/tzarc/djinn/djinn.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c index 70e011218f..5e5fe44c67 100644 --- a/keyboards/tzarc/djinn/djinn.c +++ b/keyboards/tzarc/djinn/djinn.c @@ -92,6 +92,9 @@ void keyboard_post_init_kb(void) { #if defined(RGB_MATRIX_ENABLE) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { 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) { default: case USBPD_500MA: @@ -104,6 +107,19 @@ RGB rgb_matrix_hsv_to_rgb(HSV hsv) { scale = 1.0f; 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); return hsv_to_rgb(hsv); @@ -129,6 +145,9 @@ void housekeeping_task_kb(void) { static uint8_t current_setting = USBPD_500MA; if (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) { default: case USBPD_500MA: @@ -144,6 +163,21 @@ void housekeeping_task_kb(void) { writePinHigh(RGB_CURR_3000mA_OK_PIN); 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 (is_keyboard_master() && rgb_matrix_is_enabled()) { |