From 0ae76e40c274de3ba658f3327554f4aaf5248a69 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Tue, 7 Jul 2020 16:33:21 -0500 Subject: [PATCH] Add matrix map for Ducky One 2 TKL --- RGBController/RGBController_DuckyKeyboard.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/RGBController/RGBController_DuckyKeyboard.cpp b/RGBController/RGBController_DuckyKeyboard.cpp index e91c30fee..5168e1a21 100644 --- a/RGBController/RGBController_DuckyKeyboard.cpp +++ b/RGBController/RGBController_DuckyKeyboard.cpp @@ -9,6 +9,17 @@ #include "RGBController_DuckyKeyboard.h" +//0xFFFFFFFF indicates an unused entry in matrix +#define NA 0xFFFFFFFF + +static unsigned int matrix_map[6][23] = + { { 0, NA, 12, 18, 24, 30, NA, 42, 48, 54, 60, NA, 66, 72, 78, 84, 90, 96, 102, NA, NA, NA, NA }, + { 1, 7, 13, 19, 25, 31, 37, 43, 49, 55, 61, NA, 67, 73, 85, NA, 91, 97, 103, NA, NA, NA, NA }, + { 2, NA, 8, 14, 20, 26, NA, 32, 38, 44, 50, 56, 62, 68, 74, 86, 92, 98, 104, NA, NA, NA, NA }, + { 3, NA, 9, 15, 21, 27, NA, 33, 39, 45, 51, 57, 63, 69, 87, NA, NA, NA, NA, NA, NA, NA, NA }, + { 4, NA, 16, 22, 28, 34, NA, 40, NA, 46, 52, 58, 64, 70, 82, NA, NA, 100, NA, NA, NA, NA, NA }, + { 5, 11, 17, NA, NA, NA, NA, 41, NA, NA, NA, NA, 65, 77, 83, 89, 95, 101, 107, NA, NA, NA, NA } }; + RGBController_DuckyKeyboard::RGBController_DuckyKeyboard(DuckyKeyboardController* ducky_ptr) { ducky = ducky_ptr; @@ -41,10 +52,10 @@ void RGBController_DuckyKeyboard::SetupZones() new_zone.leds_min = 155; new_zone.leds_max = 155; new_zone.leds_count = 155; - new_zone.matrix_map = NULL;//new matrix_map_type; - //new_zone.matrix_map->height = 6; - //new_zone.matrix_map->width = 23; - //new_zone.matrix_map->map = (unsigned int *)&matrix_map; + new_zone.matrix_map = new matrix_map_type; + new_zone.matrix_map->height = 6; + new_zone.matrix_map->width = 23; + new_zone.matrix_map->map = (unsigned int *)&matrix_map; zones.push_back(new_zone);