mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-05 23:24:17 -04:00
VIA V3 - The Custom UI Update (#18222)
This commit is contained in:
Wilba
GitHub
parent
0dfb6024d8
commit
a3b6f55c2d
18 changed files with 2 additions and 335 deletions
|
|
@ -3,5 +3,4 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define VIA_CUSTOM_LIGHTING_ENABLE
|
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 2
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 2
|
||||||
|
|
|
||||||
|
|
@ -18,114 +18,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI,
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI,
|
||||||
KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD)
|
KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD)
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(RGB_MATRIX_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 via_qmk_rgblight_get_value(uint8_t *data) {
|
|
||||||
uint8_t *value_id = &(data[0]);
|
|
||||||
uint8_t *value_data = &(data[1]);
|
|
||||||
switch (*value_id) {
|
|
||||||
case id_qmk_rgblight_brightness: {
|
|
||||||
value_data[0] = rgb_matrix_get_val();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_effect: {
|
|
||||||
value_data[0] = rgb_matrix_is_enabled() ? rgb_matrix_get_mode() : 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_effect_speed: {
|
|
||||||
value_data[0] = speed_to_rgblight(rgb_matrix_get_speed());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_color: {
|
|
||||||
value_data[0] = rgb_matrix_get_hue();
|
|
||||||
value_data[1] = rgb_matrix_get_sat();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void via_qmk_rgblight_set_value(uint8_t *data) {
|
|
||||||
uint8_t *value_id = &(data[0]);
|
|
||||||
uint8_t *value_data = &(data[1]);
|
|
||||||
switch (*value_id) {
|
|
||||||
case id_qmk_rgblight_brightness: {
|
|
||||||
rgb_matrix_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), value_data[0]);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_effect: {
|
|
||||||
if (value_data[0] == 0) {
|
|
||||||
rgb_matrix_disable_noeeprom();
|
|
||||||
} else {
|
|
||||||
rgb_matrix_enable_noeeprom();
|
|
||||||
rgb_matrix_mode_noeeprom(value_data[0]);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_effect_speed: {
|
|
||||||
rgb_matrix_set_speed_noeeprom(speed_from_rgblight(value_data[0]));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_color: {
|
|
||||||
rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgblight_get_val());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
|
|
||||||
uint8_t *command_id = &(data[0]);
|
|
||||||
uint8_t *command_data = &(data[1]);
|
|
||||||
switch (*command_id) {
|
|
||||||
case id_lighting_set_value:
|
|
||||||
via_qmk_rgblight_set_value(command_data);
|
|
||||||
break;
|
|
||||||
case id_lighting_get_value:
|
|
||||||
via_qmk_rgblight_get_value(command_data);
|
|
||||||
break;
|
|
||||||
case id_lighting_save:
|
|
||||||
eeconfig_update_rgb_matrix();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
// Unhandled message.
|
|
||||||
*command_id = id_unhandled;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // defined(RGB_MATRIX_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
|
|
||||||
|
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 4
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
|
|
@ -17,7 +17,3 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
||||||
|
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
VIA_ENABLE = yes
|
VIA_ENABLE = yes
|
||||||
LTO_ENABLE = yes
|
LTO_ENABLE = yes
|
||||||
ENCODER_MAP_ENABLE = yes
|
ENCODER_MAP_ENABLE = yes
|
||||||
|
CONSOLE_ENABLE = no
|
||||||
|
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright 2021 Mechlovin' Studio
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
|
||||||
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
/* Copyright 2022 ML
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 2
|
|
||||||
|
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
/* Copyright 2021 datafx
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
#pragma once
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
/* Copyright 2021 datafx
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
|
|
@ -18,7 +18,3 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 2
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 2
|
||||||
|
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,4 @@
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
|
||||||
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
|
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
|
||||||
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
|
|
||||||
#define STM32_ONBOARD_EEPROM_SIZE 2048
|
#define STM32_ONBOARD_EEPROM_SIZE 2048
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,5 @@
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
|
||||||
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
|
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
|
||||||
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
|
|
||||||
#define STM32_ONBOARD_EEPROM_SIZE 2048
|
#define STM32_ONBOARD_EEPROM_SIZE 2048
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright 2022 Terry Mathews
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
#define VIA_CUSTOM_LIGHTING_ENABLE
|
|
||||||
|
|
@ -47,75 +47,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______
|
_______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
||||||
void via_qmk_rgblight_get_value(uint8_t *data) {
|
|
||||||
uint8_t *value_id = &(data[0]);
|
|
||||||
uint8_t *value_data = &(data[1]);
|
|
||||||
switch (*value_id) {
|
|
||||||
case id_qmk_rgblight_brightness: {
|
|
||||||
value_data[0] = rgb_matrix_get_val();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_effect: {
|
|
||||||
value_data[0] = rgb_matrix_get_flags() ? rgb_matrix_get_mode() : 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_effect_speed: {
|
|
||||||
value_data[0] = rgb_matrix_get_speed();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_color: {
|
|
||||||
value_data[0] = rgb_matrix_get_hue();
|
|
||||||
value_data[1] = rgb_matrix_get_sat();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void via_qmk_rgblight_set_value(uint8_t *data) {
|
|
||||||
uint8_t *value_id = &(data[0]);
|
|
||||||
uint8_t *value_data = &(data[1]);
|
|
||||||
switch (*value_id) {
|
|
||||||
case id_qmk_rgblight_brightness: {
|
|
||||||
rgb_matrix_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), value_data[0]);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_effect: {
|
|
||||||
if (value_data[0] == 0) {
|
|
||||||
rgb_matrix_set_flags(LED_FLAG_NONE);
|
|
||||||
} else {
|
|
||||||
rgb_matrix_mode_noeeprom(value_data[0]);
|
|
||||||
rgb_matrix_set_flags(LED_FLAG_MODIFIER|LED_FLAG_UNDERGLOW|LED_FLAG_KEYLIGHT);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_effect_speed: {
|
|
||||||
rgb_matrix_set_speed_noeeprom(value_data[0]);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case id_qmk_rgblight_color: {
|
|
||||||
rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgblight_get_val());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
|
|
||||||
uint8_t *command_id = &(data[0]);
|
|
||||||
uint8_t *command_data = &(data[1]);
|
|
||||||
switch (*command_id) {
|
|
||||||
case id_lighting_set_value:
|
|
||||||
via_qmk_rgblight_set_value(command_data);
|
|
||||||
break;
|
|
||||||
case id_lighting_get_value:
|
|
||||||
via_qmk_rgblight_get_value(command_data);
|
|
||||||
break;
|
|
||||||
case id_lighting_save:
|
|
||||||
eeconfig_update_rgb_matrix();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
// Unhandled message.
|
|
||||||
*command_id = id_unhandled;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -4,12 +4,3 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
|
#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
|
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
/* Copyright 2021 Harrison Chan (Xelus)
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
// Enable RGB Matrix
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
|
|
@ -18,6 +18,3 @@
|
||||||
|
|
||||||
// 3 layers or else it will not fit in EEPROM
|
// 3 layers or else it will not fit in EEPROM
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
||||||
|
|
||||||
// Enable RGB Matrix
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,5 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
// RGB Matrix
|
|
||||||
#define VIA_QMK_RGBLIGHT_ENABLE
|
|
||||||
|
|
||||||
// More layers
|
// More layers
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue