diff options
author | Wilba <wilba@wilba.tech> | 2022-11-10 07:46:44 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-10 07:46:44 +1100 |
commit | bc6f8dc8b0822e5e03893eacffa42a7badb4c2fa (patch) | |
tree | b1e8a219803f30b7347e479734a5c6e7352a5f30 /keyboards/winry | |
parent | 575b0e33fa47034f5cfaf6f7cd98570268efa0a2 (diff) |
VIA V3 - The Custom UI Update (#18222)
Diffstat (limited to 'keyboards/winry')
-rw-r--r-- | keyboards/winry/winry315/keymaps/via/config.h | 9 | ||||
-rw-r--r-- | keyboards/winry/winry315/winry315.c | 54 |
2 files changed, 0 insertions, 63 deletions
diff --git a/keyboards/winry/winry315/keymaps/via/config.h b/keyboards/winry/winry315/keymaps/via/config.h index 5fc0e02531..de1f70c160 100644 --- a/keyboards/winry/winry315/keymaps/via/config.h +++ b/keyboards/winry/winry315/keymaps/via/config.h @@ -4,12 +4,3 @@ #pragma once #define DYNAMIC_KEYMAP_LAYER_COUNT 8 - -// Enable a limited form of RGB Matrix support in VIA (requires redefining the -// effect list in the VIA JSON, which then becomes not 100% compatible with the -// RGBLIGHT firmwares). -#define VIA_QMK_RGBLIGHT_ENABLE - -// Enable the workaround for the speed parameter mismatch between RGBLIGHT and -// RGB Matrix, so that the speed slider in VIA behaves in a more useful way. -#define VIA_CUSTOM_LIGHTING_ENABLE diff --git a/keyboards/winry/winry315/winry315.c b/keyboards/winry/winry315/winry315.c index d8042606c0..e7901a2e00 100644 --- a/keyboards/winry/winry315/winry315.c +++ b/keyboards/winry/winry315/winry315.c @@ -164,60 +164,6 @@ uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t return 0; } -# if defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) - -// VIA supports only 4 discrete values for effect speed; map these to some -// useful speed values for RGB Matrix. -enum speed_values { - RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects - RGBLIGHT_SPEED_1 = UINT8_MAX / 4, - RGBLIGHT_SPEED_2 = UINT8_MAX / 2, // matches the default value - RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast -}; - -static uint8_t speed_from_rgblight(uint8_t rgblight_speed) { - switch (rgblight_speed) { - case 0: - return RGBLIGHT_SPEED_0; - case 1: - return RGBLIGHT_SPEED_1; - case 2: - default: - return RGBLIGHT_SPEED_2; - case 3: - return RGBLIGHT_SPEED_3; - } -} - -static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) { - if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) { - return 0; - } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) { - return 1; - } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) { - return 2; - } else { - return 3; - } -} - -void raw_hid_receive_kb(uint8_t *data, uint8_t length) { - switch (data[0]) { - case id_lighting_get_value: - if (data[1] == id_qmk_rgblight_effect_speed) { - data[2] = speed_to_rgblight(rgb_matrix_get_speed()); - } - break; - case id_lighting_set_value: - if (data[1] == id_qmk_rgblight_effect_speed) { - rgb_matrix_set_speed_noeeprom(speed_from_rgblight(data[2])); - } - break; - } -} - -# endif // defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) - #endif // defined(RGB_MATRIX_ENABLE) void winry315_set_orientation(uint8_t orientation) { |