1 files changed, 37 insertions, 126 deletions
diff --git a/keyboards/dztech/dz40rgb/dz40rgb.c b/keyboards/dztech/dz40rgb/dz40rgb.c
index 34bfc4366..e5e39c92a 100644
--- a/keyboards/dztech/dz40rgb/dz40rgb.c
+++ b/keyboards/dztech/dz40rgb/dz40rgb.c
@@ -52,7 +52,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, E_3,    D_3,    F_3},
    {0, E_2,    D_2,    F_2},
    {0, E_1,    D_1,    F_1},
-        
    {0, E_13,   D_13,   F_13},
    {0, E_14,   D_14,   F_14},
@@ -71,70 +71,25 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 };
-rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+led_config_t g_led_config = { {
+    {  11,  10,   9,   8,   7,   6,   5,   4,   3,   2,   1,   0 },
-    {{0|(11<<4)},   {20.36*11,  0}, 1},
+    {  25,  24,  23,  22,  21,  20,  19,  18,  17,  16,  15,  14 },
-    {{0|(10<<4)},   {20.36*10,  0}, 1},
+    {  39,  38,  37,  36,  35,  34,  33,  32,  31,  30,  29,  28 },
-    {{0|(9<<4)},    {20.36*9,  0}, 1},
+    {  53,  52,  51,  50,  49,  48,  47,  46,  45,  44,  43,  42 }
-    {{0|(8<<4)},    {20.36*8,  0}, 1},
+}, {
-    {{0|(7<<4)},    {20.36*7,  0}, 1},
+    { 223,   0 }, { 203,   0 }, { 183,   0 }, { 162,   0 }, { 142,   0 }, { 122,   0 }, { 101,   0 }, {  81,   0 }, {  61,   0 }, {  40,   0 }, {  20,   0 }, {   0,   0 },
-        {{0|(6<<4)},    { 20.36*6,  0}, 1},
+    { 223,  10 }, {   0,  10 }, { 223,  21 }, { 203,  21 }, { 183,  21 }, { 162,  21 }, { 142,  21 }, { 122,  21 }, { 101,  21 }, {  81,  21 }, {  61,  21 }, {  40,  21 },
-    {{0|(5<<4)},    { 20.36*5,  0}, 1},
+    {  20,  21 }, {   0,  21 }, { 223,  31 }, {   0,  31 }, { 223,  42 }, { 203,  42 }, { 183,  42 }, { 162,  42 }, { 142,  42 }, { 122,  42 }, { 101,  42 }, {  81,  42 },
-    {{0|(4<<4)},    { 20.36*4,  0}, 1},
+    {  61,  42 }, {  40,  42 }, {  20,  42 }, {   0,  42 }, { 223,  53 }, {   0,  53 }, { 223,  63 }, { 203,  63 }, { 183,  63 }, { 162,  63 }, { 142,  63 }, { 122,  63 },
-    {{0|(3<<4)},    { 20.36*3,  0}, 1},
+    { 101,  63 }, {  81,  63 }, {  61,  63 }, {  40,  63 }, {  20,  63 }, {   0,  63 }
-    {{0|(2<<4)},    { 20.36*2,  0}, 1},
+}, {
-    {{0|(1<<4)},    { 20.36*1,  0}, 1},
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    {{0|(0<<4)},    { 20.36*0,  0}, 1},
+    1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4,
-    {{0|(12<<4)},   {20.36*11, 21.33*0.5}, 1},
+    4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    {{0|(13<<4)},  {20.36*0,21.33*0.5}, 1},
+    1, 1, 1, 1, 1, 1
+} };
-    {{1|(11<<4)},   {20.36*11,  21.33}, 1},
-    {{1|(10<<4)},   {20.36*10,  21.33}, 4},
-    {{1|(9<<4)},    {20.36*9,  21.33}, 4},
-    {{1|(8<<4)},    {20.36*8,  21.33}, 4},
-    {{1|(7<<4)},    {20.36*7,  21.33}, 4},
-    {{1|(6<<4)},    { 20.36*6,  21.33}, 4},
-    {{1|(5<<4)},    { 20.36*5,  21.33}, 4},
-    {{1|(4<<4)},    { 20.36*4,  21.33}, 4},
-    {{1|(3<<4)},    { 20.36*3,  21.33}, 4},
-    {{1|(2<<4)},    { 20.36*2,  21.33}, 4},
-    {{1|(1<<4)},    { 20.36*1,  21.33}, 4},
-    {{1|(0<<4)},    { 20.36*0,  21.33}, 1},
-    {{1|(12<<4)},   {20.36*11, 21.33*1.5}, 1},
-    {{1|(13<<4)},  {20.36*0,21.33*1.5}, 1},
-    {{2|(11<<4)},   {20.36*11,  21.33*2}, 1},
-    {{2|(10<<4)},   {20.36*10,  21.33*2}, 4},
-    {{2|(9<<4)},    {20.36*9,  21.33*2}, 4},
-    {{2|(8<<4)},    {20.36*8,  21.33*2}, 4},
-    {{2|(7<<4)},    {20.36*7,  21.33*2}, 4},
-    {{2|(6<<4)},    { 20.36*6,  21.33*2}, 4},
-    {{2|(5<<4)},    { 20.36*5,  21.33*2}, 4},
-    {{2|(4<<4)},    { 20.36*4,  21.33*2}, 4},
-    {{2|(3<<4)},    { 20.36*3,  21.33*2}, 4},
-    {{2|(2<<4)},    { 20.36*2,  21.33*2}, 4},
-    {{2|(1<<4)},    { 20.36*1,  21.33*2}, 4},
-    {{2|(0<<4)},    { 20.36*0,  21.33*2}, 1},
-    {{2|(12<<4)},   {20.36*11, 21.33*2.5}, 1},
-    {{2|(13<<4)},  {20.36*0,21.33*2.5}, 1},
-    {{3|(11<<4)},   {20.36*11,  21.33*3}, 1},
-    {{3|(10<<4)},   {20.36*10,  21.33*3}, 1},
-    {{3|(9<<4)},    {20.36*9,  21.33*3}, 1},
-    {{3|(8<<4)},    {20.36*8,  21.33*3}, 1},
-    {{3|(7<<4)},    {20.36*7,  21.33*3}, 1},
-        {{3|(6<<4)},    { 20.36*6,  21.33*3}, 1},
-    {{3|(5<<4)},    { 20.36*5,  21.33*3}, 1},
-    {{3|(4<<4)},    { 20.36*4,  21.33*3}, 1},
-    {{3|(3<<4)},    { 20.36*3,  21.33*3}, 1},
-    {{3|(2<<4)},    { 20.36*2,  21.33*3}, 1},
-    {{3|(1<<4)},    { 20.36*1,  21.33*3}, 1},
-    {{3|(0<<4)},    { 20.36*0,  21.33*3}, 1}
-};
 #else
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 /* Refer to IS31 manual for these locations
@@ -205,69 +160,25 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 };
-rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+led_config_t g_led_config = { {
+    {  11,  10,   9,   8,   7,   6,   5,   4,   3,   2,   1,   0 },
+    {  25,  24,  23,  22,  21,  20,  19,  18,  17,  16,  15,  14 },
+    {  39,  38,  37,  36,  35,  34,  33,  32,  31,  30,  29,  28 },
+    {  52,  51,  50,  49,  48, NO_LED,  47,  46,  45,  44,  43,  42 }
+}, {
+    { 223,   0 }, { 203,   0 }, { 183,   0 }, { 162,   0 }, { 142,   0 }, { 122,   0 }, { 101,   0 }, {  81,   0 }, {  61,   0 }, {  40,   0 }, {  20,   0 }, {   0,   0 },
+    { 223,  10 }, {   0,  10 }, { 223,  21 }, { 203,  21 }, { 183,  21 }, { 162,  21 }, { 142,  21 }, { 122,  21 }, { 101,  21 }, {  81,  21 }, {  61,  21 }, {  40,  21 },
+    {  20,  21 }, {   0,  21 }, { 223,  31 }, {   0,  31 }, { 223,  42 }, { 203,  42 }, { 183,  42 }, { 162,  42 }, { 142,  42 }, { 122,  42 }, { 101,  42 }, {  81,  42 },
+    {  61,  42 }, {  40,  42 }, {  20,  42 }, {   0,  42 }, { 223,  53 }, {   0,  53 }, { 223,  63 }, { 203,  63 }, { 183,  63 }, { 162,  63 }, { 142,  63 }, { 111,  63 },
+    {  81,  63 }, {  61,  63 }, {  40,  63 }, {  20,  63 }, {   0,  63 }
+}, {
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1
+} };
-    {{0|(11<<4)},   {20.36*11,  0}, 1},
-    {{0|(10<<4)},   {20.36*10,  0}, 1},
-    {{0|(9<<4)},    {20.36*9,  0}, 1},
-    {{0|(8<<4)},    {20.36*8,  0}, 1},
-    {{0|(7<<4)},    {20.36*7,  0}, 1},
-        {{0|(6<<4)},    { 20.36*6,  0}, 1},
-    {{0|(5<<4)},    { 20.36*5,  0}, 1},
-    {{0|(4<<4)},    { 20.36*4,  0}, 1},
-    {{0|(3<<4)},    { 20.36*3,  0}, 1},
-    {{0|(2<<4)},    { 20.36*2,  0}, 1},
-    {{0|(1<<4)},    { 20.36*1,  0}, 1},
-    {{0|(0<<4)},    { 20.36*0,  0}, 1},
-    {{0|(12<<4)},   {20.36*11, 21.33*0.5}, 1},
-    {{0|(13<<4)},  {20.36*0,21.33*0.5}, 1},
-    {{1|(11<<4)},   {20.36*11,  21.33}, 1},
-    {{1|(10<<4)},   {20.36*10,  21.33}, 4},
-    {{1|(9<<4)},    {20.36*9,  21.33}, 4},
-    {{1|(8<<4)},    {20.36*8,  21.33}, 4},
-    {{1|(7<<4)},    {20.36*7,  21.33}, 4},
-    {{1|(6<<4)},    { 20.36*6,  21.33}, 4},
-    {{1|(5<<4)},    { 20.36*5,  21.33}, 4},
-    {{1|(4<<4)},    { 20.36*4,  21.33}, 4},
-    {{1|(3<<4)},    { 20.36*3,  21.33}, 4},
-    {{1|(2<<4)},    { 20.36*2,  21.33}, 4},
-    {{1|(1<<4)},    { 20.36*1,  21.33}, 4},
-    {{1|(0<<4)},    { 20.36*0,  21.33}, 1},
-    {{1|(12<<4)},   {20.36*11, 21.33*1.5}, 1},
-    {{1|(13<<4)},  {20.36*0,21.33*1.5}, 1},
-    {{2|(11<<4)},   {20.36*11,  21.33*2}, 1},
-    {{2|(10<<4)},   {20.36*10,  21.33*2}, 4},
-    {{2|(9<<4)},    {20.36*9,  21.33*2}, 4},
-    {{2|(8<<4)},    {20.36*8,  21.33*2}, 4},
-    {{2|(7<<4)},    {20.36*7,  21.33*2}, 4},
-    {{2|(6<<4)},    { 20.36*6,  21.33*2}, 4},
-    {{2|(5<<4)},    { 20.36*5,  21.33*2}, 4},
-    {{2|(4<<4)},    { 20.36*4,  21.33*2}, 4},
-    {{2|(3<<4)},    { 20.36*3,  21.33*2}, 4},
-    {{2|(2<<4)},    { 20.36*2,  21.33*2}, 4},
-    {{2|(1<<4)},    { 20.36*1,  21.33*2}, 4},
-    {{2|(0<<4)},    { 20.36*0,  21.33*2}, 1},
-    {{2|(12<<4)},   {20.36*11, 21.33*2.5}, 1},
-    {{2|(13<<4)},  {20.36*0,21.33*2.5}, 1},
-    {{3|(11<<4)},   {20.36*11,  21.33*3}, 1},
-    {{3|(10<<4)},   {20.36*10,  21.33*3}, 1},
-    {{3|(9<<4)},    {20.36*9,  21.33*3}, 1},
-    {{3|(8<<4)},    {20.36*8,  21.33*3}, 1},
-    {{3|(7<<4)},    {20.36*7,  21.33*3}, 1},
-        {{3|(6<<4)},    { 20.36*5.5,  21.33*3}, 1},
-    {{3|(4<<4)},    { 20.36*4,  21.33*3}, 1},
-    {{3|(3<<4)},    { 20.36*3,  21.33*3}, 1},
-    {{3|(2<<4)},    { 20.36*2,  21.33*3}, 1},
-    {{3|(1<<4)},    { 20.36*1,  21.33*3}, 1},
-    {{3|(0<<4)},    { 20.36*0,  21.33*3}, 1}
-};
 #endif

diff --git a/keyboards/dztech/dz40rgb/dz40rgb.c b/keyboards/dztech/dz40rgb/dz40rgb.c index 34bfc4366..e5e39c92a 100644 --- a/keyboards/dztech/dz40rgb/dz40rgb.c +++ b/keyboards/dztech/dz40rgb/dz40rgb.c
@@ -52,7 +52,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
52	{0, E_3, D_3, F_3},	52	{0, E_3, D_3, F_3},
53	{0, E_2, D_2, F_2},	53	{0, E_2, D_2, F_2},
54	{0, E_1, D_1, F_1},	54	{0, E_1, D_1, F_1},
55		55
56	{0, E_13, D_13, F_13},	56	{0, E_13, D_13, F_13},
57	{0, E_14, D_14, F_14},	57	{0, E_14, D_14, F_14},
58		58
@@ -71,70 +71,25 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
71		71
72	};	72	};
73		73
74	rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {	74	led_config_t g_led_config = { {
75		75	{ 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
76	{{0\|(11<<4)}, {20.36*11, 0}, 1},	76	{ 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
77	{{0\|(10<<4)}, {20.36*10, 0}, 1},	77	{ 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28 },
78	{{0\|(9<<4)}, {20.36*9, 0}, 1},	78	{ 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42 }
79	{{0\|(8<<4)}, {20.36*8, 0}, 1},	79	}, {
80	{{0\|(7<<4)}, {20.36*7, 0}, 1},	80	{ 223, 0 }, { 203, 0 }, { 183, 0 }, { 162, 0 }, { 142, 0 }, { 122, 0 }, { 101, 0 }, { 81, 0 }, { 61, 0 }, { 40, 0 }, { 20, 0 }, { 0, 0 },
81	{{0\|(6<<4)}, { 20.36*6, 0}, 1},	81	{ 223, 10 }, { 0, 10 }, { 223, 21 }, { 203, 21 }, { 183, 21 }, { 162, 21 }, { 142, 21 }, { 122, 21 }, { 101, 21 }, { 81, 21 }, { 61, 21 }, { 40, 21 },
82	{{0\|(5<<4)}, { 20.36*5, 0}, 1},	82	{ 20, 21 }, { 0, 21 }, { 223, 31 }, { 0, 31 }, { 223, 42 }, { 203, 42 }, { 183, 42 }, { 162, 42 }, { 142, 42 }, { 122, 42 }, { 101, 42 }, { 81, 42 },
83	{{0\|(4<<4)}, { 20.36*4, 0}, 1},	83	{ 61, 42 }, { 40, 42 }, { 20, 42 }, { 0, 42 }, { 223, 53 }, { 0, 53 }, { 223, 63 }, { 203, 63 }, { 183, 63 }, { 162, 63 }, { 142, 63 }, { 122, 63 },
84	{{0\|(3<<4)}, { 20.36*3, 0}, 1},	84	{ 101, 63 }, { 81, 63 }, { 61, 63 }, { 40, 63 }, { 20, 63 }, { 0, 63 }
85	{{0\|(2<<4)}, { 20.36*2, 0}, 1},	85	}, {
86	{{0\|(1<<4)}, { 20.36*1, 0}, 1},	86	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
87	{{0\|(0<<4)}, { 20.36*0, 0}, 1},	87	1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
88		88	4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4,
89	{{0\|(12<<4)}, {20.3611, 21.330.5}, 1},	89	4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1,
90	{{0\|(13<<4)}, {20.360,21.330.5}, 1},	90	1, 1, 1, 1, 1, 1
91		91	} };
92	{{1\|(11<<4)}, {20.36*11, 21.33}, 1},
93	{{1\|(10<<4)}, {20.36*10, 21.33}, 4},
94	{{1\|(9<<4)}, {20.36*9, 21.33}, 4},
95	{{1\|(8<<4)}, {20.36*8, 21.33}, 4},
96	{{1\|(7<<4)}, {20.36*7, 21.33}, 4},
97	{{1\|(6<<4)}, { 20.36*6, 21.33}, 4},
98	{{1\|(5<<4)}, { 20.36*5, 21.33}, 4},
99	{{1\|(4<<4)}, { 20.36*4, 21.33}, 4},
100	{{1\|(3<<4)}, { 20.36*3, 21.33}, 4},
101	{{1\|(2<<4)}, { 20.36*2, 21.33}, 4},
102	{{1\|(1<<4)}, { 20.36*1, 21.33}, 4},
103	{{1\|(0<<4)}, { 20.36*0, 21.33}, 1},
104
105	{{1\|(12<<4)}, {20.3611, 21.331.5}, 1},
106	{{1\|(13<<4)}, {20.360,21.331.5}, 1},
107		92
108	{{2\|(11<<4)}, {20.3611, 21.332}, 1},
109	{{2\|(10<<4)}, {20.3610, 21.332}, 4},
110	{{2\|(9<<4)}, {20.369, 21.332}, 4},
111	{{2\|(8<<4)}, {20.368, 21.332}, 4},
112	{{2\|(7<<4)}, {20.367, 21.332}, 4},
113	{{2\|(6<<4)}, { 20.366, 21.332}, 4},
114	{{2\|(5<<4)}, { 20.365, 21.332}, 4},
115	{{2\|(4<<4)}, { 20.364, 21.332}, 4},
116	{{2\|(3<<4)}, { 20.363, 21.332}, 4},
117	{{2\|(2<<4)}, { 20.362, 21.332}, 4},
118	{{2\|(1<<4)}, { 20.361, 21.332}, 4},
119	{{2\|(0<<4)}, { 20.360, 21.332}, 1},
120
121	{{2\|(12<<4)}, {20.3611, 21.332.5}, 1},
122	{{2\|(13<<4)}, {20.360,21.332.5}, 1},
123
124	{{3\|(11<<4)}, {20.3611, 21.333}, 1},
125	{{3\|(10<<4)}, {20.3610, 21.333}, 1},
126	{{3\|(9<<4)}, {20.369, 21.333}, 1},
127	{{3\|(8<<4)}, {20.368, 21.333}, 1},
128	{{3\|(7<<4)}, {20.367, 21.333}, 1},
129	{{3\|(6<<4)}, { 20.366, 21.333}, 1},
130	{{3\|(5<<4)}, { 20.365, 21.333}, 1},
131	{{3\|(4<<4)}, { 20.364, 21.333}, 1},
132	{{3\|(3<<4)}, { 20.363, 21.333}, 1},
133	{{3\|(2<<4)}, { 20.362, 21.333}, 1},
134	{{3\|(1<<4)}, { 20.361, 21.333}, 1},
135	{{3\|(0<<4)}, { 20.360, 21.333}, 1}
136
137	};
138	#else	93	#else
139	const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {	94	const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
140	/* Refer to IS31 manual for these locations	95	/* Refer to IS31 manual for these locations
@@ -205,69 +160,25 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
205		160
206	};	161	};
207		162
208	rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {	163	led_config_t g_led_config = { {
		164	{ 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
		165	{ 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
		166	{ 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28 },
		167	{ 52, 51, 50, 49, 48, NO_LED, 47, 46, 45, 44, 43, 42 }
		168	}, {
		169	{ 223, 0 }, { 203, 0 }, { 183, 0 }, { 162, 0 }, { 142, 0 }, { 122, 0 }, { 101, 0 }, { 81, 0 }, { 61, 0 }, { 40, 0 }, { 20, 0 }, { 0, 0 },
		170	{ 223, 10 }, { 0, 10 }, { 223, 21 }, { 203, 21 }, { 183, 21 }, { 162, 21 }, { 142, 21 }, { 122, 21 }, { 101, 21 }, { 81, 21 }, { 61, 21 }, { 40, 21 },
		171	{ 20, 21 }, { 0, 21 }, { 223, 31 }, { 0, 31 }, { 223, 42 }, { 203, 42 }, { 183, 42 }, { 162, 42 }, { 142, 42 }, { 122, 42 }, { 101, 42 }, { 81, 42 },
		172	{ 61, 42 }, { 40, 42 }, { 20, 42 }, { 0, 42 }, { 223, 53 }, { 0, 53 }, { 223, 63 }, { 203, 63 }, { 183, 63 }, { 162, 63 }, { 142, 63 }, { 111, 63 },
		173	{ 81, 63 }, { 61, 63 }, { 40, 63 }, { 20, 63 }, { 0, 63 }
		174	}, {
		175	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
		176	1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
		177	4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4,
		178	4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1,
		179	1, 1, 1, 1, 1
		180	} };
209		181
210	{{0\|(11<<4)}, {20.36*11, 0}, 1},
211	{{0\|(10<<4)}, {20.36*10, 0}, 1},
212	{{0\|(9<<4)}, {20.36*9, 0}, 1},
213	{{0\|(8<<4)}, {20.36*8, 0}, 1},
214	{{0\|(7<<4)}, {20.36*7, 0}, 1},
215	{{0\|(6<<4)}, { 20.36*6, 0}, 1},
216	{{0\|(5<<4)}, { 20.36*5, 0}, 1},
217	{{0\|(4<<4)}, { 20.36*4, 0}, 1},
218	{{0\|(3<<4)}, { 20.36*3, 0}, 1},
219	{{0\|(2<<4)}, { 20.36*2, 0}, 1},
220	{{0\|(1<<4)}, { 20.36*1, 0}, 1},
221	{{0\|(0<<4)}, { 20.36*0, 0}, 1},
222
223	{{0\|(12<<4)}, {20.3611, 21.330.5}, 1},
224	{{0\|(13<<4)}, {20.360,21.330.5}, 1},
225
226	{{1\|(11<<4)}, {20.36*11, 21.33}, 1},
227	{{1\|(10<<4)}, {20.36*10, 21.33}, 4},
228	{{1\|(9<<4)}, {20.36*9, 21.33}, 4},
229	{{1\|(8<<4)}, {20.36*8, 21.33}, 4},
230	{{1\|(7<<4)}, {20.36*7, 21.33}, 4},
231	{{1\|(6<<4)}, { 20.36*6, 21.33}, 4},
232	{{1\|(5<<4)}, { 20.36*5, 21.33}, 4},
233	{{1\|(4<<4)}, { 20.36*4, 21.33}, 4},
234	{{1\|(3<<4)}, { 20.36*3, 21.33}, 4},
235	{{1\|(2<<4)}, { 20.36*2, 21.33}, 4},
236	{{1\|(1<<4)}, { 20.36*1, 21.33}, 4},
237	{{1\|(0<<4)}, { 20.36*0, 21.33}, 1},
238
239	{{1\|(12<<4)}, {20.3611, 21.331.5}, 1},
240	{{1\|(13<<4)}, {20.360,21.331.5}, 1},
241
242	{{2\|(11<<4)}, {20.3611, 21.332}, 1},
243	{{2\|(10<<4)}, {20.3610, 21.332}, 4},
244	{{2\|(9<<4)}, {20.369, 21.332}, 4},
245	{{2\|(8<<4)}, {20.368, 21.332}, 4},
246	{{2\|(7<<4)}, {20.367, 21.332}, 4},
247	{{2\|(6<<4)}, { 20.366, 21.332}, 4},
248	{{2\|(5<<4)}, { 20.365, 21.332}, 4},
249	{{2\|(4<<4)}, { 20.364, 21.332}, 4},
250	{{2\|(3<<4)}, { 20.363, 21.332}, 4},
251	{{2\|(2<<4)}, { 20.362, 21.332}, 4},
252	{{2\|(1<<4)}, { 20.361, 21.332}, 4},
253	{{2\|(0<<4)}, { 20.360, 21.332}, 1},
254
255	{{2\|(12<<4)}, {20.3611, 21.332.5}, 1},
256	{{2\|(13<<4)}, {20.360,21.332.5}, 1},
257
258	{{3\|(11<<4)}, {20.3611, 21.333}, 1},
259	{{3\|(10<<4)}, {20.3610, 21.333}, 1},
260	{{3\|(9<<4)}, {20.369, 21.333}, 1},
261	{{3\|(8<<4)}, {20.368, 21.333}, 1},
262	{{3\|(7<<4)}, {20.367, 21.333}, 1},
263	{{3\|(6<<4)}, { 20.365.5, 21.333}, 1},
264	{{3\|(4<<4)}, { 20.364, 21.333}, 1},
265	{{3\|(3<<4)}, { 20.363, 21.333}, 1},
266	{{3\|(2<<4)}, { 20.362, 21.333}, 1},
267	{{3\|(1<<4)}, { 20.361, 21.333}, 1},
268	{{3\|(0<<4)}, { 20.360, 21.333}, 1}
269
270	};
271	#endif	182	#endif
272		183
273		184