Browse Source

update planck implementation

Jack Humbert 8 years ago
parent
commit
824c80ffa8
2 changed files with 52 additions and 130 deletions
  1. 0 11
      drivers/avr/is31fl3731.c
  2. 52 119
      keyboards/planck/light/light.c

+ 0 - 11
drivers/avr/is31fl3731.c

@@ -62,17 +62,6 @@ bool g_pwm_buffer_update_required = false;
 uint8_t g_led_control_registers[DRIVER_COUNT][18] = { { 0 }, { 0 } };
 bool g_led_control_registers_update_required = false;
 
-
-typedef struct
-{
-	uint8_t red_register;
-	uint8_t red_bit;
-	uint8_t green_register;
-	uint8_t green_bit;
-	uint8_t blue_register;
-	uint8_t blue_bit;
-} led_control_bitmask;
-
 // This is the bit pattern in the LED control registers
 // (for matrix A, add one to register for matrix B)
 //

+ 52 - 119
keyboards/planck/light/light.c

@@ -17,72 +17,6 @@
 
 #include "light.h"
 
-// const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
-// /*   driver
-//  *   |  matrix
-//  *   |  |  control_index
-//  *   |  |  |
-//  *   |  |  |  */
-//     {0, 0, 3},
-//     {0, 0, 4},
-//     {0, 0, 5},
-//     {0, 1, 3},
-//     {0, 1, 4},
-//     {0, 1, 5},
-//     {1, 0, 3},
-//     {1, 0, 4},
-//     {1, 0, 5},
-//     {1, 1, 3},
-//     {1, 1, 4},
-//     {1, 1, 5},
-
-//     {0, 0, 6},
-//     {0, 0, 7},
-//     {0, 0, 8},
-//     {0, 1, 6},
-//     {0, 1, 7},
-//     {0, 1, 8},
-//     {1, 0, 6},
-//     {1, 0, 7},
-//     {1, 0, 8},
-//     {1, 1, 6},
-//     {1, 1, 7},
-//     {1, 1, 8},
-
-//     {0, 0, 9},
-//     {0, 0, 10},
-//     {0, 0, 11},
-//     {0, 1, 9},
-//     {0, 1, 10},
-//     {0, 1, 11},
-//     {1, 0, 9},
-//     {1, 0, 10},
-//     {1, 0, 11},
-//     {1, 1, 9},
-//     {1, 1, 10},
-//     {1, 1, 11},
-
-//     {0, 0, 12},
-//     {0, 0, 13},
-//     {0, 0, 14},
-//     {0, 1, 12},
-//     {0, 1, 13},
-// #ifdef PLANCK_MIT_LAYOUT
-//     {0, 1, 14},
-//     {0, 1, 15},
-//     {1, 0, 12},
-// #else
-//     {0, 1, 14},
-//     {0, 1, 15},
-//     {1, 0, 12},
-// #endif
-//     {1, 0, 13},
-//     {1, 0, 14},
-//     {1, 1, 12},
-//     {1, 1, 13},
-//     {1, 1, 14},
-// };
-
 
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 /*   driver
@@ -90,61 +24,60 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, C3_1,  C2_1,  C4_1}, // LED1
-    {0, C6_1,  C5_1,  C7_1}, // LED2
-    {0, C4_2,  C3_2,  C5_2}, // LED3
-    {0, C7_2,  C6_2,  C8_2}, // LED4
-    {0, C2_3,  C1_3,  C3_3}, // LED5
-    {0, C5_3,  C4_3,  C6_3}, // LED6
-    {0, C8_3,  C7_3,  C9_3}, // LED7
-    {0, C2_4,  C1_4,  C3_4}, // LED8
-    {0, C6_4,  C5_4,  C7_4}, // LED9
-    {0, C2_5,  C1_5,  C3_5}, // LED10
-    {0, C7_5,  C6_5,  C8_5}, // LED11
-    {0, C2_6,  C1_6,  C3_6}, // LED12
-    {0, C5_6,  C4_6,  C6_6}, // LED13
-    {0, C8_6,  C7_6,  C9_6}, // LED14
-    {0, C2_7,  C1_7,  C3_7}, // LED15
-    {0, C5_7,  C4_7,  C6_7}, // LED16
-    {0, C2_8,  C1_8,  C3_8}, // LED17
-    {0, C5_8,  C4_8,  C6_8}, // LED18
-
-    {0, C3_9,  C2_9,  C4_9}, // LED19
-    {0, C6_9,  C5_9,  C7_9}, // LED20
-    {0, C4_10, C3_10, C5_10}, // LED21
-    {0, C7_10, C6_10, C8_10}, // LED22
-    {0, C2_11, C1_11, C3_11}, // LED23
-    {0, C5_11, C4_11, C6_11}, // LED24
-
-    {1, C3_1,  C2_1,  C4_1}, // LED1
-    {1, C6_1,  C5_1,  C7_1}, // LED2
-    {1, C4_2,  C3_2,  C5_2}, // LED3
-    {1, C7_2,  C6_2,  C8_2}, // LED4
-    {1, C2_3,  C1_3,  C3_3}, // LED5
-    {1, C5_3,  C4_3,  C6_3}, // LED6
-    {1, C8_3,  C7_3,  C9_3}, // LED7
-    {1, C2_4,  C1_4,  C3_4}, // LED8
-    {1, C6_4,  C5_4,  C7_4}, // LED9
-    {1, C2_5,  C1_5,  C3_5}, // LED10
-    {1, C7_5,  C6_5,  C8_5}, // LED11
-    {1, C2_6,  C1_6,  C3_6}, // LED12
-    {1, C5_6,  C4_6,  C6_6}, // LED13
-    {1, C8_6,  C7_6,  C9_6}, // LED14
-    {1, C2_7,  C1_7,  C3_7}, // LED15
-    {1, C5_7,  C4_7,  C6_7}, // LED16
-    {1, C2_8,  C1_8,  C3_8}, // LED17
-    {1, C5_8,  C4_8,  C6_8}, // LED18
-
-    {1, C3_9,  C2_9,  C4_9}, // LED19
-    {1, C6_9,  C5_9,  C7_9}, // LED20
-    {1, C4_10, C3_10, C5_10}, // LED21
-    {1, C7_10, C6_10, C8_10}, // LED22
-    {1, C2_11, C1_11, C3_11}, // LED23
-    {1, C5_11, C4_11, C6_11} // LED24
+    {0, C1_3,  C2_3,  C3_3},
+    {0, C1_4,  C2_4,  C3_4},
+    {0, C1_5,  C2_5,  C3_5},
+    {0, C1_11, C2_11, C3_11},
+    {0, C1_12, C2_12, C3_12},
+    {0, C1_13, C2_13, C3_13},
+    {1, C1_3,  C2_3,  C3_3},
+    {1, C1_4,  C2_4,  C3_4},
+    {1, C1_5,  C2_5,  C3_5},
+    {1, C1_11, C2_11, C3_11},
+    {1, C1_12, C2_12, C3_12},
+    {1, C1_13, C2_13, C3_13},
+
+    {0, C1_6,  C2_6,  C3_6},
+    {0, C1_7,  C2_7,  C3_7},
+    {0, C1_8,  C2_8,  C3_8},
+    {0, C1_14, C2_14, C3_14},
+    {0, C1_15, C2_15, C3_15},
+    {0, C1_16, C2_16, C3_16},
+    {1, C1_6,  C2_6,  C3_6},
+    {1, C1_7,  C2_7,  C3_7},
+    {1, C1_8,  C2_8,  C3_8},
+    {1, C1_14, C2_14, C3_14},
+    {1, C1_15, C2_15, C3_15},
+    {1, C1_16, C2_16, C3_16},
+
+    {0, C9_1,  C8_1,  C7_1},
+    {0, C9_2,  C8_2,  C7_2},
+    {0, C9_3,  C8_3,  C7_3},
+    {0, C9_9,  C8_9,  C7_9},
+    {0, C9_10, C8_10, C7_10},
+    {0, C9_11, C8_11, C7_11},
+    {1, C9_1,  C8_1,  C7_1},
+    {1, C9_2,  C8_2,  C7_2},
+    {1, C9_3,  C8_3,  C7_3},
+    {1, C9_9,  C8_9,  C7_9},
+    {1, C9_10, C8_10, C7_10},
+    {1, C9_11, C8_11, C7_11},
+
+    {0, C9_4,  C8_4,  C7_4},
+    {0, C9_5,  C8_5,  C7_5},
+    {0, C9_6,  C8_6,  C7_6},
+    {0, C9_12, C8_12, C7_12},
+    {0, C9_13, C8_13, C7_13},
+    {0, C9_14, C8_14, C7_14},
+    {0, C9_15, C8_15, C7_15}, // middle 2u switch
+    {1, C9_4,  C8_4,  C7_4},
+    {1, C9_5,  C8_5,  C7_5},
+    {1, C9_6,  C8_6,  C7_6},
+    {1, C9_12, C8_12, C7_12},
+    {1, C9_13, C8_13, C7_13},
+    {1, C9_14, C8_14, C7_14}
 };
 
-
-
 const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 
     /*{row | col << 4}