Skip to content

Commit 1d9779d

Browse files
CalcProgrammer1CalcProgrammer1
committed
Add alternate LED name field to KLM overlay type for regional key layouts
1 parent 65615e2 commit 1d9779d

File tree

11 files changed

+1480
-1300
lines changed

11 files changed

+1480
-1300
lines changed

‎Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopDevices.cpp

Lines changed: 242 additions & 149 deletions
Large diffs are not rendered by default.

‎Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.cpp

Lines changed: 160 additions & 160 deletions
Large diffs are not rendered by default.

‎Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp

Lines changed: 112 additions & 112 deletions
Large diffs are not rendered by default.

‎Controllers/DebugController/DebugControllerDetect.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ void DetectDebugControllers()
411411
led dummy_keyboard_led;
412412
dummy_keyboard_led.name = new_kb.GetKeyNameAt(led_idx);
413413
dummy_keyboard->leds.push_back(dummy_keyboard_led);
414+
dummy_keyboard->led_alt_names.push_back(new_kb.GetKeyAltNameAt(led_idx));
414415
}
415416

416417
/*-----------------------------------------------------------------*\
@@ -444,6 +445,7 @@ void DetectDebugControllers()
444445
dummy_keyboard_led.name = dummy_keyboard_underglow_matrix_zone.name + " LED ";
445446
dummy_keyboard_led.name.append(std::to_string(led_idx));
446447
dummy_keyboard->leds.push_back(dummy_keyboard_led);
448+
dummy_keyboard->led_alt_names.push_back("");
447449
}
448450
}
449451

@@ -475,6 +477,7 @@ void DetectDebugControllers()
475477
dummy_keyboard_led.name = "RGB Strip ";
476478
dummy_keyboard_led.name.append(std::to_string(led_idx));
477479
dummy_keyboard->leds.push_back(dummy_keyboard_led);
480+
dummy_keyboard->led_alt_names.push_back("");
478481
}
479482
}
480483

‎Controllers/HYTEKeyboardController/RGBController_HYTEKeyboard.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ keyboard_keymap_overlay_values hyte_keeb_tkl_layout =
4141
}
4242
},
4343
{
44-
/*---------------------------------------------------------------------------------------------------------*\
45-
| Edit Keys - Add additional LEDs for space bar underglow and media keys |
46-
| Zone, Row, Column, Value, Key, OpCode, |
47-
\*---------------------------------------------------------------------------------------------------------*/
48-
{ 0, 5, 4, 109, KEY_EN_SPACE, KEYBOARD_OPCODE_SWAP_ONLY, },
49-
{ 0, 5, 5, 110, KEY_EN_SPACE, KEYBOARD_OPCODE_SWAP_ONLY, },
50-
{ 0, 5, 7, 112, KEY_EN_SPACE, KEYBOARD_OPCODE_SWAP_ONLY, },
51-
{ 0, 5, 8, 113, KEY_EN_SPACE, KEYBOARD_OPCODE_SWAP_ONLY, },
52-
{ 0, 0, 0, 77, KEY_EN_MEDIA_STOP, KEYBOARD_OPCODE_INSERT_ROW, },
53-
{ 0, 0, 1, 78, KEY_EN_MEDIA_PREVIOUS, KEYBOARD_OPCODE_SWAP_ONLY, },
54-
{ 0, 0, 2, 79, KEY_EN_MEDIA_PLAY_PAUSE, KEYBOARD_OPCODE_SWAP_ONLY, },
55-
{ 0, 0, 3, 98, KEY_EN_MEDIA_NEXT, KEYBOARD_OPCODE_SWAP_ONLY, },
56-
{ 0, 0, 4, 100, KEY_EN_MEDIA_MUTE, KEYBOARD_OPCODE_SWAP_ONLY, },
44+
/*-------------------------------------------------------------------------------------------------------------------------------------*\
45+
| Edit Keys - Add additional LEDs for space bar underglow and media keys |
46+
| Zone, Row, Column, Value, Name, Alternate Name, OpCode |
47+
\*-------------------------------------------------------------------------------------------------------------------------------------*/
48+
{ 0, 5, 4, 109, KEY_EN_SPACE, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
49+
{ 0, 5, 5, 110, KEY_EN_SPACE, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
50+
{ 0, 5, 7, 112, KEY_EN_SPACE, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
51+
{ 0, 5, 8, 113, KEY_EN_SPACE, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
52+
{ 0, 0, 0, 77, KEY_EN_MEDIA_STOP, KEY_EN_UNUSED, KEYBOARD_OPCODE_INSERT_ROW, },
53+
{ 0, 0, 1, 78, KEY_EN_MEDIA_PREVIOUS, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
54+
{ 0, 0, 2, 79, KEY_EN_MEDIA_PLAY_PAUSE, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
55+
{ 0, 0, 3, 98, KEY_EN_MEDIA_NEXT, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
56+
{ 0, 0, 4, 100, KEY_EN_MEDIA_MUTE, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
5757
}
5858
};
5959

‎Controllers/MintakaKeyboardController/RGBController_MintakaKeyboard.cpp

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,26 @@ layout_values mintaka_offset_values =
3434
},
3535
{
3636
{ KEYBOARD_LAYOUT_ISO_QWERTY, {
37-
{ 0, 1, 11, 0, KEY_EN_QUOTE, KEYBOARD_OPCODE_SWAP_ONLY, },
38-
{ 0, 1, 12, 0, KEY_ES_OPEN_QUESTION_MARK, KEYBOARD_OPCODE_SWAP_ONLY, },
39-
40-
{ 0, 2, 11, 0, KEY_ES_TILDE, KEYBOARD_OPCODE_SWAP_ONLY, },
41-
{ 0, 2, 12, 0, KEY_EN_PLUS, KEYBOARD_OPCODE_SWAP_ONLY, },
42-
43-
{ 0, 3, 10, 0, KEY_ES_ENIE, KEYBOARD_OPCODE_SWAP_ONLY, },
44-
{ 0, 3, 11, 0, KEY_EN_LEFT_BRACKET, KEYBOARD_OPCODE_SWAP_ONLY, },
45-
{ 0, 3, 12, 0, KEY_EN_RIGHT_BRACKET, KEYBOARD_OPCODE_SWAP_ONLY, },
46-
47-
{ 0, 4, 1, 0, KEY_NORD_ANGLE_BRACKET, KEYBOARD_OPCODE_SWAP_ONLY, },
48-
{ 0, 4, 11, 0, KEY_NORD_HYPHEN, KEYBOARD_OPCODE_SWAP_ONLY, },
49-
50-
{ 0, 5, 11, 0, KEY_EN_MENU, KEYBOARD_OPCODE_SWAP_ONLY, },
51-
{ 0, 5, 12, 0, KEY_EN_RIGHT_CONTROL, KEYBOARD_OPCODE_SWAP_ONLY, },
52-
{ 0, 5, 13, 0, KEY_EN_RIGHT_FUNCTION, KEYBOARD_OPCODE_SWAP_ONLY, },
37+
/*-------------------------------------------------------------------------------------------------------------------------------------*\
38+
| Edit Keys |
39+
| Zone, Row, Column, Value, Name, Alternate Name, OpCode |
40+
\*-------------------------------------------------------------------------------------------------------------------------------------*/
41+
{ 0, 1, 11, 0, KEY_EN_QUOTE, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
42+
{ 0, 1, 12, 0, KEY_ES_OPEN_QUESTION_MARK, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
43+
44+
{ 0, 2, 11, 0, KEY_ES_TILDE, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
45+
{ 0, 2, 12, 0, KEY_EN_PLUS, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
46+
47+
{ 0, 3, 10, 0, KEY_ES_ENIE, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
48+
{ 0, 3, 11, 0, KEY_EN_LEFT_BRACKET, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
49+
{ 0, 3, 12, 0, KEY_EN_RIGHT_BRACKET, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
50+
51+
{ 0, 4, 1, 0, KEY_NORD_ANGLE_BRACKET, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
52+
{ 0, 4, 11, 0, KEY_NORD_HYPHEN, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
53+
54+
{ 0, 5, 11, 0, KEY_EN_MENU, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
55+
{ 0, 5, 12, 0, KEY_EN_RIGHT_CONTROL, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
56+
{ 0, 5, 13, 0, KEY_EN_RIGHT_FUNCTION, KEY_EN_UNUSED, KEYBOARD_OPCODE_SWAP_ONLY, },
5357
}}
5458
}
5559
};

0 commit comments

Comments
 (0)