From 2d8b621854786836907cac403ca6e3dc8c50a150 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Thu, 27 Apr 2023 00:19:46 +0200 Subject: [PATCH] Fix LED mapping --- keyboards/ciaanh/kanagawa/ansi/ansi.c | 53 +++++++--------------- keyboards/ciaanh/kanagawa/config.h | 14 +++--- keyboards/ciaanh/kanagawa/iso/iso.c | 63 +++++++-------------------- 3 files changed, 39 insertions(+), 91 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/ansi.c b/keyboards/ciaanh/kanagawa/ansi/ansi.c index 9eef1c8015c..879f68dc186 100644 --- a/keyboards/ciaanh/kanagawa/ansi/ansi.c +++ b/keyboards/ciaanh/kanagawa/ansi/ansi.c @@ -16,50 +16,29 @@ { // LED Index to Physical Position - - /*00*/{ 0,157}, /*01*/{ 0,145}, /*02*/{ 0,134}, /*03*/{ 0,122}, /*04*/{ 0,105}, - /*05*/{ 0, 93}, /*06*/{ 0, 81}, /*07*/{ 0, 70}, /*08*/{ 0, 52}, /*09*/{ 0, 41}, - /*10*/{ 0, 29}, /*11*/{ 0, 17}, /*12*/{ 0, 0}, - - /*13*/{ 14,157}, /*14*/{ 14,140}, /*15*/{ 14,128}, /*16*/{ 14,116}, /*17*/{ 14,105}, - /*18*/{ 14, 93}, /*19*/{ 14, 81}, /*20*/{ 14, 70}, /*21*/{ 14, 58}, /*22*/{ 14, 47}, - /*23*/{ 14, 35}, /*24*/{ 14, 23}, /*25*/{ 14, 12}, /*26*/{ 14, 0}, - - - /*27*/{ 28,157}, /*28*/{ 28,148}, /*29*/{ 28,134}, /*30*/{ 28,122}, /*31*/{ 28,111}, - /*32*/{ 28, 99}, /*33*/{ 28, 87}, /*34*/{ 28, 76}, /*35*/{ 28, 64}, /*36*/{ 28, 52}, - /*37*/{ 28, 41}, /*38*/{ 28, 29}, /*39*/{ 28, 17}, /*40*/{ 28, 3}, - - - /*41*/{ 42,156}, /*42*/{ 42,137}, /*43*/{ 42,125}, /*44*/{ 42,113}, /*45*/{ 42,102}, - /*46*/{ 42, 90}, /*47*/{ 42, 79}, /*48*/{ 42, 67}, /*49*/{ 42, 55}, /*50*/{ 42, 44}, - /*51*/{ 42, 32}, /*52*/{ 42, 20}, /*53*/{ 42, 4}, - - - /*54*/{ 56,147}, /*55*/{ 56,131}, /*56*/{ 56,119}, /*57*/{ 56,108}, /*58*/{ 56, 96}, - /*59*/{ 56, 84}, /*60*/{ 56, 73}, /*61*/{ 56, 61}, /*62*/{ 56, 49}, /*63*/{ 56, 38}, - /*64*/{ 56, 26}, /*65*/{ 56, 7}, - - /*66*/{ 14,186}, - /*67*/{ 28,186}, - /*68*/{ 42,186}, - - /*69*/{ 74,177}, - /*70*/{ 60,166}, /*71*/{ 74,166}, /*72*/{ 74,154}, /*73*/{ 70,140}, /*74*/{ 70,128}, - /*75*/{ 70,116}, /*76*/{ 77, 95}, /*77*/{ 77, 68}, /*78*/{ 70, 58}, /*79*/{ 70, 26}, - /*80*/{ 70, 13}, /*81*/{ 70, 0} + {189, 0}, {175, 0}, {161, 0}, {147, 0}, {126, 0}, {112, 0}, { 98, 0}, { 84, 0}, { 63, 0}, { 49, 0}, { 35, 0}, { 21, 0}, { 0, 0}, + {189, 12}, {168, 12}, {154, 12}, {140, 12}, {126, 12}, {112, 12}, { 98, 12}, { 84, 12}, { 70, 12}, { 56, 12}, { 42, 12}, { 28, 12}, { 14, 12}, { 0, 12}, + {189, 23}, {179, 23}, {161, 23}, {147, 23}, {133, 23}, {119, 23}, {105, 23}, { 91, 23}, { 77, 23}, { 63, 23}, { 49, 23}, { 35, 23}, { 21, 23}, { 4, 23}, + {187, 35}, {165, 35}, {151, 35}, {137, 35}, {123, 35}, {109, 35}, { 95, 35}, { 81, 35}, { 67, 35}, { 53, 35}, { 39, 35}, { 25, 35}, { 5, 35}, + {177, 47}, {158, 47}, {144, 47}, {130, 47}, {116, 47}, {102, 47}, { 88, 47}, { 74, 47}, { 60, 47}, { 46, 47}, { 32, 47}, { 9, 47}, +{224, 12}, +{224, 23}, +{224, 35}, + {214, 61}, + {200, 49}, {200, 61}, {186, 61}, {168, 58}, {154, 58}, {140, 58}, {114, 64}, { 82, 64}, { 70, 58}, { 32, 58}, { 16, 58}, { 0, 58}, + }, { // LED Index to Flag 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, - 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, + 4, 4, 4, 1, 1, 1, 4, 4, 1, 1, 1, 1, }}; #endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 495ea65c7dc..d35884fb1b4 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -17,13 +17,15 @@ /* RGB Defines */ # define RGB_DI_PIN GP4 -#ifdef KEYBOARD_ciaanh_kanagawa_ansi -# define RGB_MATRIX_LED_COUNT 82 -#endif +# ifdef KEYBOARD_ciaanh_kanagawa_ansi +# define RGB_MATRIX_LED_COUNT 82 +# endif -#ifdef KEYBOARD_ciaanh_kanagawa_iso -# define RGB_MATRIX_LED_COUNT 83 -#endif +# ifdef KEYBOARD_ciaanh_kanagawa_iso +# define RGB_MATRIX_LED_COUNT 83 +# endif + +# define RGB_MATRIX_CENTER { 73, 32 } /* Enable Framebuffer and keypress effects */ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/ciaanh/kanagawa/iso/iso.c b/keyboards/ciaanh/kanagawa/iso/iso.c index 02210c2f752..43fd253b96b 100644 --- a/keyboards/ciaanh/kanagawa/iso/iso.c +++ b/keyboards/ciaanh/kanagawa/iso/iso.c @@ -15,62 +15,29 @@ { // LED Index to Physical Position - {0,157}, {0,145}, {0,134}, {0,122}, {0,105}, {0,93}, {0,81}, {0,70}, {0,52}, {0,41}, {0,29}, {0,17}, {0,0}, - {14,157}, {14,140}, {14,128}, {14,116}, {14,105}, {14,93}, {14,81}, {14,70}, {14,58}, {14,47}, {14,35}, {14,23}, {14,12}, {14,0}, - {28,157}, {35,148}, {28,134}, {28,122}, {28,111}, {28,99}, {28,87}, {28,76}, {28,64}, {28,52}, {28,41}, {28,29}, {28,17}, {28,3}, - {42,148}, {42,137}, {42,125}, {42,113}, {42,102}, {42,90}, {42,79}, {42,67}, {42,55}, {42,44}, {42,32}, {42,20}, {42,4}, - {56,131}, {56,119}, {56,108}, {56,96}, {56,84}, {56,73}, {56,61}, {56,49}, {56,38}, {56,26}, {56,15}, {56,1}, -{14,186}, -{28,186}, -{42,186}, - {60,166}, {56,147}, -{74,177}, {74,166}, {74,154}, {70,140}, {70,128}, {70,116}, {77,95}, {77,68}, {70,58}, {70,26}, {70,13}, {70,0} + {189, 0}, {175, 0}, {161, 0}, {147, 0}, {126, 0}, {112, 0}, { 98, 0}, { 84, 0}, { 63, 0}, { 49, 0}, { 35, 0}, { 21, 0}, { 0, 0}, + {189, 12}, {168, 12}, {154, 12}, {140, 12}, {126, 12}, {112, 12}, { 98, 12}, { 84, 12}, { 70, 12}, { 56, 12}, { 42, 12}, { 28, 12}, { 14, 12}, { 0, 12}, + {189, 23}, {179, 23}, {161, 23}, {147, 23}, {133, 23}, {119, 23}, {105, 23}, { 91, 23}, { 77, 23}, { 63, 23}, { 49, 23}, { 35, 23}, { 21, 23}, { 4, 23}, + {187, 35}, {165, 35}, {151, 35}, {137, 35}, {123, 35}, {109, 35}, { 95, 35}, { 81, 35}, { 67, 35}, { 53, 35}, { 39, 35}, { 25, 35}, { 5, 35}, + {177, 47}, {158, 47}, {144, 47}, {130, 47}, {116, 47}, {102, 47}, { 88, 47}, { 74, 47}, { 60, 47}, { 46, 47}, { 32, 47}, { 18, 47}, { 2, 47}, +{224, 12}, +{224, 23}, +{224, 35}, + {214, 61}, + {200, 49}, {200, 61}, {186, 61}, {168, 58}, {154, 58}, {140, 58}, {114, 64}, { 82, 64}, { 70, 58}, { 32, 58}, { 16, 58}, { 0, 58}, - // LED Index to Physical Position - - /*00*/{ 0,157}, /*01*/{ 0,145}, /*02*/{ 0,134}, /*03*/{ 0,122}, /*04*/{ 0,105}, - /*05*/{ 0, 93}, /*06*/{ 0, 81}, /*07*/{ 0, 70}, /*08*/{ 0, 52}, /*09*/{ 0, 41}, - /*10*/{ 0, 29}, /*11*/{ 0, 17}, /*12*/{ 0, 0}, - - /*13*/{ 14,157}, /*14*/{ 14,140}, /*15*/{ 14,128}, /*16*/{ 14,116}, /*17*/{ 14,105}, - /*18*/{ 14, 93}, /*19*/{ 14, 81}, /*20*/{ 14, 70}, /*21*/{ 14, 58}, /*22*/{ 14, 47}, - /*23*/{ 14, 35}, /*24*/{ 14, 23}, /*25*/{ 14, 12}, /*26*/{ 14, 0}, - - - /*27*/{ 28,157}, /*28*/{ 28,148}, /*29*/{ 28,134}, /*30*/{ 28,122}, /*31*/{ 28,111}, - /*32*/{ 28, 99}, /*33*/{ 28, 87}, /*34*/{ 28, 76}, /*35*/{ 28, 64}, /*36*/{ 28, 52}, - /*37*/{ 28, 41}, /*38*/{ 28, 29}, /*39*/{ 28, 17}, /*40*/{ 28, 3}, - - - /*41*/{ 42,156}, /*42*/{ 42,137}, /*43*/{ 42,125}, /*44*/{ 42,113}, /*45*/{ 42,102}, - /*46*/{ 42, 90}, /*47*/{ 42, 79}, /*48*/{ 42, 67}, /*49*/{ 42, 55}, /*50*/{ 42, 44}, - /*51*/{ 42, 32}, /*52*/{ 42, 20}, /*53*/{ 42, 4}, - - - /*54*/{ 56,147}, /*55*/{ 56,131}, /*56*/{ 56,119}, /*57*/{ 56,108}, /*58*/{ 56, 96}, - /*59*/{ 56, 84}, /*60*/{ 56, 73}, /*61*/{ 56, 61}, /*62*/{ 56, 49}, /*63*/{ 56, 38}, - /*64*/{ 56, 26}, /*65*/{ 56, 15}, /*66*/{ 56, 1}, - - /*67*/{ 14,186}, - /*68*/{ 28,186}, - /*69*/{ 42,186}, - - /*70*/{ 74,177}, - /*71*/{ 60,166}, /*72*/{ 74,166}, /*73*/{ 74,154}, /*74*/{ 70,140}, /*75*/{ 70,128}, - /*76*/{ 70,116}, /*77*/{ 77, 95}, /*78*/{ 77, 68}, /*79*/{ 70, 58}, /*80*/{ 70, 26}, - /*81*/{ 70, 13}, /*82*/{ 70, 0} }, { // LED Index to Flag 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, - 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, + 4, 4, 4, 1, 1, 1, 4, 4, 1, 1, 1, 1, }}; #endif \ No newline at end of file