Fixing regression from 942a842a

+ Adding ZONE_EN_KEYBOARD constant char* to KeyNames
+ Replacing declarations of "Keyboard" zone with new constant char*
+ Adding "Keyboard" zone check RGBController_Razer.cpp before hiding keys
This commit is contained in:
Chris 2022-08-02 00:47:19 +10:00 committed by Adam Honse
parent 2fae06a49a
commit 864422b4bc
38 changed files with 153 additions and 149 deletions

View file

@ -23,7 +23,7 @@ static unsigned int matrix_map[5][14] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static zone_type zone_types[] =

View file

@ -405,7 +405,7 @@ void RGBController_AuraKeyboard::SetupZones()
\*-----------------------------------------------------*/
case SCOPE_LAYOUT:
led_names = default_led_names;
led_zones.push_back({"Keyboard", ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&scope_matrix_map}});
led_zones.push_back({ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&scope_matrix_map}});
led_names.insert(led_names.begin() + 7, {KEY_EN_LEFT_WINDOWS, 0x15});
led_names.insert(led_names.begin() + 12, {KEY_EN_LEFT_ALT, 0x1D});
@ -413,8 +413,8 @@ void RGBController_AuraKeyboard::SetupZones()
case SCOPE_RX_LAYOUT:
led_names = default_led_names;
led_zones.push_back({"Keyboard", ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&scope_matrix_map}});
led_zones.push_back({"Logo", ZONE_TYPE_SINGLE, 1});
led_zones.push_back({ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&scope_matrix_map}});
led_zones.push_back({"Logo", ZONE_TYPE_SINGLE, 1});
led_names.insert(led_names.begin() + 7, {KEY_EN_LEFT_WINDOWS, 0x15});
led_names.insert(led_names.begin() + 12, {KEY_EN_LEFT_ALT, 0x1D});
@ -423,9 +423,9 @@ void RGBController_AuraKeyboard::SetupZones()
case SCOPE_TKL_LAYOUT:
led_names = default_tkl_led_names;
led_zones.push_back({"Keyboard", ZONE_TYPE_MATRIX, 86, new matrix_map_type{6, 18, (unsigned int *)&scope_tkl_matrix_map}});
led_zones.push_back({"Logo", ZONE_TYPE_LINEAR, 2});
led_zones.push_back({"Underglow", ZONE_TYPE_LINEAR, 26});
led_zones.push_back({ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, 86, new matrix_map_type{6, 18, (unsigned int *)&scope_tkl_matrix_map}});
led_zones.push_back({"Logo", ZONE_TYPE_LINEAR, 2});
led_zones.push_back({"Underglow", ZONE_TYPE_LINEAR, 26});
led_names.insert(led_names.begin() + 7, {KEY_EN_LEFT_WINDOWS, 0x15});
led_names.insert(led_names.begin() + 12, {KEY_EN_LEFT_ALT, 0x1D});
@ -433,9 +433,9 @@ void RGBController_AuraKeyboard::SetupZones()
case FLARE_LAYOUT:
led_names = default_led_names;
led_zones.push_back({"Keyboard", ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&flare_matrix_map}});
led_zones.push_back({"Logo", ZONE_TYPE_SINGLE, 1});
led_zones.push_back({"Underglow", ZONE_TYPE_SINGLE, 2});
led_zones.push_back({ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&flare_matrix_map}});
led_zones.push_back({"Logo", ZONE_TYPE_SINGLE, 1});
led_zones.push_back({"Underglow", ZONE_TYPE_SINGLE, 2});
led_names.insert(led_names.begin() + 7, {KEY_EN_LEFT_WINDOWS, 0x0D});
led_names.insert(led_names.begin() + 12, {KEY_EN_LEFT_ALT, 0x15});
@ -447,7 +447,7 @@ void RGBController_AuraKeyboard::SetupZones()
case FALCHION_LAYOUT:
led_names = default_65pct_led_names;
led_zones.push_back({"Keyboard", ZONE_TYPE_MATRIX, 68, new matrix_map_type{5, 16, (unsigned int *)&falchion_matrix_map}});
led_zones.push_back({ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, 68, new matrix_map_type{5, 16, (unsigned int *)&falchion_matrix_map}});
break;
}

View file

@ -223,7 +223,7 @@ void RGBController_AuraTUFKeyboard::SetupZones()
int zone_size = 138;
zone keyboard;
keyboard.name = "Keyboard";
keyboard.name = ZONE_EN_KEYBOARD;
keyboard.type = ZONE_TYPE_MATRIX;
keyboard.leds_min = zone_size;
keyboard.leds_max = zone_size;

View file

@ -293,10 +293,10 @@ void RGBController_CorsairK100::SetupZones()
switch(logical_layout)
{
case CORSAIR_TYPE_K100:
selected_zone.push_back({"Keyboard", 119, ZONE_TYPE_MATRIX, led_names_k100, new matrix_map_type{7, 24, (unsigned int *)&matrix_map_k100}});
selected_zone.push_back({"Underglow", 44, ZONE_TYPE_LINEAR, led_names_lightbar});
selected_zone.push_back({"Nameplate", 9, ZONE_TYPE_LINEAR, led_names_nameplate});
selected_zone.push_back({"Logo", 3, ZONE_TYPE_LINEAR, led_names_logo});
selected_zone.push_back({ZONE_EN_KEYBOARD, 119, ZONE_TYPE_MATRIX, led_names_k100, new matrix_map_type{7, 24, (unsigned int *)&matrix_map_k100}});
selected_zone.push_back({"Underglow", 44, ZONE_TYPE_LINEAR, led_names_lightbar});
selected_zone.push_back({"Nameplate", 9, ZONE_TYPE_LINEAR, led_names_nameplate});
selected_zone.push_back({"Logo", 3, ZONE_TYPE_LINEAR, led_names_logo});
break;
}

View file

@ -1,4 +1,3 @@
#include "RGBController_CorsairK55RGBPRO.h"
/*-----------------------------------------*\
| RGBController_CorsairK55RGBPRO.cpp |
| |
@ -6,6 +5,7 @@
\*-----------------------------------------*/
#include "LogManager.h"
#include "RGBController_CorsairK55RGBPRO.h"
using namespace std::chrono_literals;

View file

@ -179,7 +179,7 @@ void RGBController_CorsairK65Mini::SetupZones()
unsigned int zone_size = 0;
zone keyboard_zone;
keyboard_zone.name = "Keyboard";
keyboard_zone.name = ZONE_EN_KEYBOARD;
keyboard_zone.type = ZONE_TYPE_MATRIX;
keyboard_zone.matrix_map = new matrix_map_type;

View file

@ -294,7 +294,7 @@ void RGBController_CorsairK95PlatinumXT::SetupZones()
\*---------------------------------------------------------*/
zone keyboard_zone;
keyboard_zone.name = "Keyboard";
keyboard_zone.name = ZONE_EN_KEYBOARD;
keyboard_zone.type = ZONE_TYPE_MATRIX;
keyboard_zone.matrix_map = new matrix_map_type;
keyboard_zone.matrix_map->height = K95_PLATINUM_XT_HEIGHT;

View file

@ -53,7 +53,7 @@ static unsigned int matrix_map_k95[7][26] =
\*---------------------------------------------------------*/
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static const unsigned int zone_sizes[] =
@ -71,7 +71,7 @@ static const zone_type zone_types[] =
\*---------------------------------------------------------*/
static const char* zone_names_k70_mk2[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static const unsigned int zone_sizes_k70_mk2[] =
@ -89,7 +89,7 @@ static const zone_type zone_types_k70_mk2[] =
\*---------------------------------------------------------*/
static const char* zone_names_k95_platinum[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
"Light Bar"
};
@ -110,7 +110,7 @@ static const zone_type zone_types_k95_platinum[] =
\*---------------------------------------------------------*/
static const char* zone_names_k95[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static const unsigned int zone_sizes_k95[] =

View file

@ -26,7 +26,7 @@ static unsigned int matrix_map[7][24] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static const unsigned int zone_sizes[] =

View file

@ -160,7 +160,7 @@ void RGBController_DarkProjectKeyboard::SetupZones()
| Create the Keyboard zone and add the matix map |
\*-------------------------------------------------*/
zone KB_zone;
KB_zone.name = "Keyboard Zone";
KB_zone.name = ZONE_EN_KEYBOARD;
KB_zone.type = ZONE_TYPE_MATRIX;
KB_zone.leds_min = DARKPROKECTKEYBOARD_TKL_KEYCOUNT;
KB_zone.leds_max = DARKPROKECTKEYBOARD_TKL_KEYCOUNT;

View file

@ -41,7 +41,7 @@ static unsigned int matrix_map_eu[7][21] =
static const char *zone_names[] =
{
"Keyboard"
ZONE_EN_KEYBOARD
};
static zone_type zone_types[] =

View file

@ -32,7 +32,7 @@ static unsigned int matrix_map_tkl[6][19] =
static const char* zone_names[] =
{
"Keyboard"
ZONE_EN_KEYBOARD
};
static zone_type zone_types[] =

View file

@ -37,7 +37,7 @@ static unsigned int underglow_matrix[11][14] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
"Underglow",
"Neuron",
};

View file

@ -398,7 +398,7 @@ void RGBController_EVGAKeyboard::SetupZones()
| Z15 and Z20 |
\*-------------------------------------------------*/
zone KB_zone;
KB_zone.name = "Keyboard Zone";
KB_zone.name = ZONE_EN_KEYBOARD;
KB_zone.type = ZONE_TYPE_MATRIX;
KB_zone.leds_min = EVGA_KEYBOARD_FULL_SIZE_KEYCOUNT;
KB_zone.leds_max = EVGA_KEYBOARD_FULL_SIZE_KEYCOUNT;

View file

@ -25,7 +25,7 @@ static unsigned int matrix_map[6][23] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
"RGB Strip",
"Media Keys"
};

View file

@ -29,7 +29,7 @@ static unsigned int matrix_map[8][22] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static zone_type zone_types[] =

View file

@ -25,7 +25,7 @@ static unsigned int matrix_map[6][23] =
static const char* zone_names[] =
{
"Keyboard"
ZONE_EN_KEYBOARD
};
static zone_type zone_types[] =

View file

@ -25,7 +25,7 @@ static unsigned int matrix_map[6][23] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static zone_type zone_types[] =

View file

@ -27,7 +27,7 @@ static unsigned int matrix_map[6][19] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static zone_type zone_types[] =

View file

@ -613,7 +613,7 @@ void RGBController_KeychronKeyboard::SetupZones()
unsigned int zone_size = 0;
zone keyboard_zone;
keyboard_zone.name = "Keyboard";
keyboard_zone.name = ZONE_EN_KEYBOARD;
keyboard_zone.type = ZONE_TYPE_MATRIX;
keyboard_zone.matrix_map = new matrix_map_type;

View file

@ -59,7 +59,7 @@ using namespace std;
\*------*/
lenovo_zone lenovo_legion_7_gen_6_kbd
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
10,
22,

View file

@ -24,7 +24,7 @@ static unsigned int matrix_map[7][23] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static zone_type zone_types[] =

View file

@ -28,7 +28,7 @@ static unsigned int matrix_map[7][27] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static zone_type zone_types[] =

View file

@ -25,7 +25,7 @@ static unsigned int matrix_map[8][24] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static zone_type zone_types[] =

View file

@ -37,7 +37,7 @@ static unsigned int matrix_map_tkl[7][20] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static zone_type zone_types[] =

View file

@ -24,7 +24,7 @@ static unsigned int matrix_map[7][19] =
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static zone_type zone_types[] =

View file

@ -1372,7 +1372,7 @@ static const razer_key blackwidow_chroma_v2_keymap[] =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_2019_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1406,7 +1406,7 @@ static const razer_device blackwidow_2019_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_chroma_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1440,7 +1440,7 @@ static const razer_device blackwidow_chroma_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_chroma_overwatch_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1474,7 +1474,7 @@ static const razer_device blackwidow_chroma_overwatch_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_chroma_te_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1508,7 +1508,7 @@ static const razer_device blackwidow_chroma_te_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_elite_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1542,7 +1542,7 @@ static const razer_device blackwidow_elite_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_chroma_v2_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1576,7 +1576,7 @@ static const razer_device blackwidow_chroma_v2_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_x_chroma_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1610,7 +1610,7 @@ static const razer_device blackwidow_x_chroma_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_x_chroma_te_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1644,7 +1644,7 @@ static const razer_device blackwidow_x_chroma_te_device =
\*-------------------------------------------------------------*/
static const razer_zone cynosa_chroma_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1678,7 +1678,7 @@ static const razer_device cynosa_chroma_device =
\*-------------------------------------------------------------*/
static const razer_zone cynosa_v2_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1712,7 +1712,7 @@ static const razer_device cynosa_v2_device =
\*-------------------------------------------------------------*/
static const razer_zone cynosa_lite_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_SINGLE,
1,
1
@ -1746,7 +1746,7 @@ static const razer_device cynosa_lite_device =
\*-------------------------------------------------------------*/
static const razer_zone ornata_chroma_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1780,7 +1780,7 @@ static const razer_device ornata_chroma_device =
\*-------------------------------------------------------------*/
static const razer_zone deathstalker_chroma_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_LINEAR,
1,
12
@ -1814,7 +1814,7 @@ static const razer_device deathstalker_chroma_device =
\*-------------------------------------------------------------*/
static const razer_zone huntsman_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1852,7 +1852,7 @@ static const razer_device huntsman_device =
\*-------------------------------------------------------------*/
static const razer_zone huntsman_elite_keyboard_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -1894,7 +1894,7 @@ static const razer_device huntsman_elite_device =
\*-------------------------------------------------------------*/
static const razer_zone huntsman_te_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
18
@ -1932,7 +1932,7 @@ static const razer_device huntsman_te_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -1966,7 +1966,7 @@ static const razer_device blade_stealth_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_late_2016_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2000,7 +2000,7 @@ static const razer_device blade_stealth_late_2016_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_mid_2017_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2034,7 +2034,7 @@ static const razer_device blade_stealth_mid_2017_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_late_2017_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2068,7 +2068,7 @@ static const razer_device blade_stealth_late_2017_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_2019_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2102,7 +2102,7 @@ static const razer_device blade_stealth_2019_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_late_2019_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_SINGLE,
1,
1
@ -2135,7 +2135,7 @@ static const razer_device blade_stealth_late_2019_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_early_2020_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_SINGLE,
1,
1
@ -2169,7 +2169,7 @@ static const razer_device blade_stealth_early_2020_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_late_2016_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2198,13 +2198,12 @@ static const razer_device blade_late_2016_device =
| Razer Blade (QHD) |
| |
| Zone "Keyboard" |
| Zone "Keyboard" |
| Matrix |
| 6 Rows, 16 Columns |
\*-------------------------------------------------------------*/
static const razer_zone blade_qhd_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2238,7 +2237,7 @@ static const razer_device blade_qhd_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2018_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2272,7 +2271,7 @@ static const razer_device blade_15_2018_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2018_mercury_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2306,7 +2305,7 @@ static const razer_device blade_15_2018_mercury_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2018_base_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2340,7 +2339,7 @@ static const razer_device blade_15_2018_base_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2019_advanced_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2374,7 +2373,7 @@ static const razer_device blade_15_2019_advanced_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_mid_2019_mercury_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2408,7 +2407,7 @@ static const razer_device blade_15_mid_2019_mercury_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_mid_2019_base_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_SINGLE,
1,
1
@ -2442,7 +2441,7 @@ static const razer_device blade_15_mid_2019_base_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_early_2020_base_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_LINEAR,
1,
16
@ -2476,7 +2475,7 @@ static const razer_device blade_15_early_2020_base_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_studio_2019_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2510,7 +2509,7 @@ static const razer_device blade_15_studio_2019_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_late_2016_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
25
@ -2544,7 +2543,7 @@ static const razer_device blade_pro_late_2016_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_2017_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
25
@ -2578,7 +2577,7 @@ static const razer_device blade_pro_2017_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_2017_fullhd_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
25
@ -2611,7 +2610,7 @@ static const razer_device blade_pro_2017_fullhd_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_17_2019_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2645,7 +2644,7 @@ static const razer_device blade_pro_17_2019_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_late_2019_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -2679,7 +2678,7 @@ static const razer_device blade_pro_late_2019_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_advanced_2020_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16

View file

@ -197,7 +197,11 @@ void RGBController_Razer::SetupZones()
}
}
if(not_found)
/*-----------------------------------------------------------------*\
| If this is the "Keyboard" zone and key was not found in the map |
| then change the value of the key to hide it from view |
\*-----------------------------------------------------------------*/
if(not_found && zones[zone_id].name == ZONE_EN_KEYBOARD)
{
zones[zone_id].matrix_map->map[row_id * zones[zone_id].matrix_map->width + col_id] = NA;
}

View file

@ -2670,7 +2670,7 @@ static const razer_key tartarus_v2_keymap[] =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_2019_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -2705,7 +2705,7 @@ static const razer_device blackwidow_2019_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_chroma_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -2740,7 +2740,7 @@ static const razer_device blackwidow_chroma_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_chroma_overwatch_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -2775,7 +2775,7 @@ static const razer_device blackwidow_chroma_overwatch_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_v3_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -2810,7 +2810,7 @@ static const razer_device blackwidow_v3_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_chroma_te_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -2845,7 +2845,7 @@ static const razer_device blackwidow_chroma_te_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_elite_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -2880,7 +2880,7 @@ static const razer_device blackwidow_elite_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_chroma_v2_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -2915,7 +2915,7 @@ static const razer_device blackwidow_chroma_v2_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_v3_pro_wired_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -2950,7 +2950,7 @@ static const razer_device blackwidow_v3_pro_wired_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_v3_pro_bluetooth_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -2985,7 +2985,7 @@ static const razer_device blackwidow_v3_pro_bluetooth_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_v3_pro_wireless_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -3020,7 +3020,7 @@ static const razer_device blackwidow_v3_pro_wireless_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_v3_tkl_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
18
@ -3055,7 +3055,7 @@ static const razer_device blackwidow_v3_tkl_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_v3_mini_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
5,
16
@ -3117,7 +3117,7 @@ static const razer_device blackwidow_v3_mini_wireless_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_x_chroma_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -3152,7 +3152,7 @@ static const razer_device blackwidow_x_chroma_device =
\*-------------------------------------------------------------*/
static const razer_zone blackwidow_x_chroma_te_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -3187,7 +3187,7 @@ static const razer_device blackwidow_x_chroma_te_device =
\*-------------------------------------------------------------*/
static const razer_zone cynosa_chroma_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -3222,7 +3222,7 @@ static const razer_device cynosa_chroma_device =
\*-------------------------------------------------------------*/
static const razer_zone cynosa_v2_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -3257,7 +3257,7 @@ static const razer_device cynosa_v2_device =
\*-------------------------------------------------------------*/
static const razer_zone cynosa_lite_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_SINGLE,
1,
1
@ -3292,7 +3292,7 @@ static const razer_device cynosa_lite_device =
\*-------------------------------------------------------------*/
static const razer_zone ornata_chroma_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -3327,7 +3327,7 @@ static const razer_device ornata_chroma_device =
\*-------------------------------------------------------------*/
static const razer_zone deathstalker_chroma_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_LINEAR,
1,
12
@ -3362,7 +3362,7 @@ static const razer_device deathstalker_chroma_device =
\*-------------------------------------------------------------*/
static const razer_zone huntsman_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -3401,7 +3401,7 @@ static const razer_device huntsman_device =
\*-------------------------------------------------------------*/
static const razer_zone huntsman_elite_keyboard_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -3448,7 +3448,7 @@ static const razer_device huntsman_elite_device =
\*-------------------------------------------------------------*/
static const razer_zone huntsman_v2_analog_keyboard_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -3491,7 +3491,7 @@ static const razer_device huntsman_v2_analog_device =
\*-------------------------------------------------------------*/
static const razer_zone huntsman_mini_keyboard_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
5,
15
@ -3526,7 +3526,7 @@ static const razer_device huntsman_mini_device =
\*-------------------------------------------------------------*/
static const razer_zone huntsman_te_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
18
@ -3561,7 +3561,7 @@ static const razer_device huntsman_te_device =
\*-------------------------------------------------------------*/
static const razer_zone huntsman_v2_tkl_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
17
@ -3596,7 +3596,7 @@ static const razer_device huntsman_v2_tkl_device =
\*-------------------------------------------------------------*/
static const razer_zone huntsman_v2_keyboard_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
22
@ -3630,13 +3630,12 @@ static const razer_device huntsman_v2_device =
| Razer Blade (2016) |
| |
| Zone "Keyboard" |
| Zone "Keyboard" |
| Matrix |
| 6 Rows, 16 Columns |
\*-------------------------------------------------------------*/
static const razer_zone blade_2016_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -3671,7 +3670,7 @@ static const razer_device blade_2016_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_late_2016_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -3706,7 +3705,7 @@ static const razer_device blade_late_2016_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2018_advanced_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -3741,7 +3740,7 @@ static const razer_device blade_15_2018_advanced_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2018_base_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -3776,7 +3775,7 @@ static const razer_device blade_15_2018_base_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2018_mercury_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -3811,7 +3810,7 @@ static const razer_device blade_15_2018_mercury_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2019_advanced_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -3846,7 +3845,7 @@ static const razer_device blade_15_2019_advanced_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2019_base_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_SINGLE,
1,
1
@ -3881,7 +3880,7 @@ static const razer_device blade_15_2019_base_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2019_mercury_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -3916,7 +3915,7 @@ static const razer_device blade_15_2019_mercury_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2019_studio_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -3951,7 +3950,7 @@ static const razer_device blade_15_2019_studio_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2020_advanced_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -3986,7 +3985,7 @@ static const razer_device blade_15_2020_advanced_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2020_base_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_LINEAR,
1,
16
@ -4021,7 +4020,7 @@ static const razer_device blade_15_2020_base_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_late_2020_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4056,7 +4055,7 @@ static const razer_device blade_late_2020_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2021_advanced_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4091,7 +4090,7 @@ static const razer_device blade_15_2021_advanced_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2021_base_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_LINEAR,
1,
16
@ -4126,7 +4125,7 @@ static const razer_device blade_15_2021_base_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_15_2021_base_v2_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_LINEAR,
1,
16
@ -4161,7 +4160,7 @@ static const razer_device blade_15_2021_base_v2_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_14_2021_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4196,7 +4195,7 @@ static const razer_device blade_14_2021_device =
\*-------------------------------------------------------------*/
static const razer_zone book_13_2020_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4231,7 +4230,7 @@ static const razer_device book_13_2020_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_2016_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
25
@ -4266,7 +4265,7 @@ static const razer_device blade_pro_2016_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_2017_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
25
@ -4301,7 +4300,7 @@ static const razer_device blade_pro_2017_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_2017_fullhd_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
25
@ -4335,7 +4334,7 @@ static const razer_device blade_pro_2017_fullhd_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_2019_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4370,7 +4369,7 @@ static const razer_device blade_pro_2019_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_late_2019_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4405,7 +4404,7 @@ static const razer_device blade_pro_late_2019_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_17_2020_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4440,7 +4439,7 @@ static const razer_device blade_pro_17_2020_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_pro_17_2021_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4475,7 +4474,7 @@ static const razer_device blade_pro_17_2021_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_2016_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4510,7 +4509,7 @@ static const razer_device blade_stealth_2016_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_late_2016_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4545,7 +4544,7 @@ static const razer_device blade_stealth_late_2016_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_2017_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4580,7 +4579,7 @@ static const razer_device blade_stealth_2017_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_late_2017_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4615,7 +4614,7 @@ static const razer_device blade_stealth_late_2017_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_2019_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
6,
16
@ -4650,7 +4649,7 @@ static const razer_device blade_stealth_2019_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_late_2019_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_SINGLE,
1,
1
@ -4685,7 +4684,7 @@ static const razer_device blade_stealth_late_2019_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_2020_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_SINGLE,
1,
1
@ -4720,7 +4719,7 @@ static const razer_device blade_stealth_2020_device =
\*-------------------------------------------------------------*/
static const razer_zone blade_stealth_late_2020_zone =
{
"Keyboard",
ZONE_EN_KEYBOARD,
ZONE_TYPE_LINEAR,
1,
16

View file

@ -226,7 +226,7 @@ void RGBController_RoccatVulcanAimo::SetupZones()
| Set up zones and leds per zone |
\*---------------------------------------------------------*/
zone new_zone;
new_zone.name = "Keyboard";
new_zone.name = ZONE_EN_KEYBOARD;
new_zone.type = ZONE_TYPE_MATRIX;
new_zone.leds_min = zone_size;
new_zone.leds_max = zone_size;

View file

@ -416,7 +416,7 @@ void RGBController_SinowealthKeyboard::SetupZones()
\*---------------------------------------------------------*/
zone new_zone;
new_zone.name = "Keyboard";
new_zone.name = ZONE_EN_KEYBOARD;
new_zone.type = ZONE_TYPE_MATRIX;
new_zone.leds_min = 86;
new_zone.leds_max = 86;

View file

@ -372,7 +372,7 @@ void RGBController_SinowealthKeyboard16::SetupZones()
\*---------------------------------------------------------*/
zone new_zone;
new_zone.name = "Keyboard";
new_zone.name = ZONE_EN_KEYBOARD;
new_zone.type = ZONE_TYPE_MATRIX;
new_zone.leds_count = sinowealth->GetLEDCount();
new_zone.leds_min = new_zone.leds_count;

View file

@ -33,7 +33,7 @@ static unsigned int matrix_map_tkl[6][19] =
static const char* zone_names[] =
{
"Keyboard"
ZONE_EN_KEYBOARD
};
static zone_type zone_types[] =

View file

@ -55,7 +55,7 @@ void RGBController_SteelSeriesApexTZone::DeviceSaveMode()
void RGBController_SteelSeriesApexTZone::SetupZones()
{
zone curr_zone;
curr_zone.name = "Keyboard Zone";
curr_zone.name = "Keyboard";
curr_zone.type = ZONE_TYPE_LINEAR;
curr_zone.leds_min = 10;
curr_zone.leds_max = 10;

View file

@ -23,7 +23,7 @@ static unsigned int matrix_map[6][23] =
static const char* zone_names[] =
{
"Keyboard"
ZONE_EN_KEYBOARD
};
static zone_type zone_types[] =

View file

@ -28,7 +28,7 @@ static unsigned int matrix_map[ZET_BLADE_OPTICAL_ROWS][ZET_BLADE_OPTICAL_COLUMNS
static const char* zone_names[] =
{
"Keyboard",
ZONE_EN_KEYBOARD,
};
static zone_type zone_types[] =

View file

@ -12,6 +12,7 @@
#include "RGBControllerKeyNames.h"
const char* KEY_EN_UNUSED = "";
const char* ZONE_EN_KEYBOARD = "Keyboard";
const char* KEY_EN_ESCAPE = "Key: Escape";
const char* KEY_EN_F1 = "Key: F1";
@ -135,4 +136,4 @@ const char* KEY_EN_MEDIA_NEXT = "Key: Media Next";
const char* KEY_EN_MEDIA_STOP = "Key: Media Stop";
const char* KEY_EN_MEDIA_MUTE = "Key: Media Mute";
const char* KEY_EN_MEDIA_VOLUME_DOWN = "Key: Media Volume -";
const char* KEY_EN_MEDIA_VOLUME_UP = "Key: Media Volume +";
const char* KEY_EN_MEDIA_VOLUME_UP = "Key: Media Volume +";

View file

@ -12,6 +12,7 @@
#pragma once
extern const char* KEY_EN_UNUSED;
extern const char* ZONE_EN_KEYBOARD;
extern const char* KEY_EN_ESCAPE;
extern const char* KEY_EN_F1;