jordan
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

betterize register handling

Browse Source
rgb_matrix
Jack Humbert 7 years ago
parent 8c5ae8d6c7
commit cd07b64263
5 changed files with 376 additions and 235 deletions
Show Stats Download Patch File Download Diff File

135
drivers/avr/is31fl3731.c
Unescape Escape View File

@ -87,71 +87,6 @@ typedef struct
// 0x0E - R17,G15,G14,G13,G12,G11,G10,G09
// 0x10 - R16,R15,R14,R13,R12,R11,R10,R09
const led_control_bitmask g_led_control_bitmask[18] =
{
{ 0x02, 0, 0x04, 0, 0x06, 0 }, // R00,G00,B00
{ 0x00, 0, 0x04, 1, 0x06, 1 }, // R01,G01,B01
{ 0x00, 1, 0x02, 1, 0x06, 2 }, // R02,G02,B02
{ 0x00, 2, 0x02, 2, 0x04, 2 }, // R03,G03,B03
{ 0x00, 3, 0x02, 3, 0x04, 3 }, // R04,G04,B04
{ 0x00, 4, 0x02, 4, 0x04, 4 }, // R05,G05,B05
{ 0x00, 5, 0x02, 5, 0x04, 5 }, // R06,G06,B06
{ 0x00, 6, 0x02, 6, 0x04, 6 }, // R07,G07,B07
{ 0x00, 7, 0x02, 7, 0x04, 7 }, // R08,G08,B08
{ 0x10, 0, 0x0E, 0, 0x0C, 0 }, // R09,G09,B09
{ 0x10, 1, 0x0E, 1, 0x0C, 1 }, // R10,G10,B10
{ 0x10, 2, 0x0E, 2, 0x0C, 2 }, // R11,G11,B11
{ 0x10, 3, 0x0E, 3, 0x0C, 3 }, // R12,G12,B12
{ 0x10, 4, 0x0E, 4, 0x0C, 4 }, // R13,G13,B13
{ 0x10, 5, 0x0E, 5, 0x0C, 5 }, // R14,G14,B14
{ 0x10, 6, 0x0E, 6, 0x0A, 5 }, // R15,G15,B15
{ 0x10, 7, 0x0C, 6, 0x0A, 6 }, // R16,G16,B16
{ 0x0E, 7, 0x0C, 7, 0x0A, 7 }, // R17,G17,B17
};
const uint8_t g_map_control_index_to_register[2][18][3] PROGMEM = {
{
{0x34, 0x44, 0x54}, // 00
{0x24, 0x45, 0x55}, // 01
{0x25, 0x35, 0x56}, // 02
{0x26, 0x36, 0x46}, // 03
{0x27, 0x37, 0x47}, // 04
{0x28, 0x38, 0x48}, // 05
{0x29, 0x39, 0x49}, // 06
{0x2a, 0x3a, 0x4a}, // 07
{0x2b, 0x3b, 0x4b}, // 08
{0xa4, 0x94, 0x84}, // 09
{0xa5, 0x95, 0x85}, // 10
{0xa6, 0x96, 0x86}, // 11
{0xa7, 0x97, 0x87}, // 12
{0xa8, 0x98, 0x88}, // 13
{0xa9, 0x99, 0x89}, // 14
{0xaa, 0x9a, 0x79}, // 15
{0xab, 0x8a, 0x7a}, // 16
{0x9b, 0x8b, 0x7b} // 17
}, {
{0x34 + 8, 0x44 + 8, 0x54 + 8}, // 00
{0x24 + 8, 0x45 + 8, 0x55 + 8}, // 01
{0x25 + 8, 0x35 + 8, 0x56 + 8}, // 02
{0x26 + 8, 0x36 + 8, 0x46 + 8}, // 03
{0x27 + 8, 0x37 + 8, 0x47 + 8}, // 04
{0x28 + 8, 0x38 + 8, 0x48 + 8}, // 05
{0x29 + 8, 0x39 + 8, 0x49 + 8}, // 06
{0x2a + 8, 0x3a + 8, 0x4a + 8}, // 07
{0x2b + 8, 0x3b + 8, 0x4b + 8}, // 08
{0xa4 + 8, 0x94 + 8, 0x84 + 8}, // 09
{0xa5 + 8, 0x95 + 8, 0x85 + 8}, // 10
{0xa6 + 8, 0x96 + 8, 0x86 + 8}, // 11
{0xa7 + 8, 0x97 + 8, 0x87 + 8}, // 12
{0xa8 + 8, 0x98 + 8, 0x88 + 8}, // 13
{0xa9 + 8, 0x99 + 8, 0x89 + 8}, // 14
{0xaa + 8, 0x9a + 8, 0x79 + 8}, // 15
{0xab + 8, 0x8a + 8, 0x7a + 8}, // 16
{0x9b + 8, 0x8b + 8, 0x7b + 8} // 17
}};
void IS31FL3731_write_register( uint8_t addr, uint8_t reg, uint8_t data )
{
@ -256,32 +191,15 @@ void IS31FL3731_init( uint8_t addr )
IS31FL3731_write_register( addr, ISSI_COMMANDREGISTER, 0 );
}
void map_index_to_led( uint8_t index, is31_led *led ) {
//led = , sizeof(struct is31_led));
// led->driver = addr->driver;
// led->matrix = addr->matrix;
// led->modifier = addr->modifier;
// led->control_index = addr->control_index;
// led->matrix_co.raw = addr->matrix_co.raw;
// led->driver = (pgm_read_byte(addr) >> 6) && 0b11;
// led->matrix = (pgm_read_byte(addr) >> 4) && 0b1;
// led->modifier = (pgm_read_byte(addr) >> 3) && 0b1;
// led->control_index = pgm_read_byte(addr+1);
// led->matrix_co.raw = pgm_read_byte(addr+2);
}
void IS31FL3731_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
{
if ( index >= 0 && index < DRIVER_LED_TOTAL )
{
if ( index >= 0 && index < DRIVER_LED_TOTAL ) {
is31_led led = g_is31_leds[index];
//map_index_to_led(index, &led);
// Subtract 0x24 to get the second index of g_pwm_buffer
g_pwm_buffer[led.driver][ pgm_read_byte(&g_map_control_index_to_register[led.matrix][led.control_index][0]) - 0x24] = red;
g_pwm_buffer[led.driver][ pgm_read_byte(&g_map_control_index_to_register[led.matrix][led.control_index][1]) - 0x24] = green;
g_pwm_buffer[led.driver][ pgm_read_byte(&g_map_control_index_to_register[led.matrix][led.control_index][2]) - 0x24] = blue;
g_pwm_buffer[led.driver][led.r - 0x24] = red;
g_pwm_buffer[led.driver][led.g - 0x24] = green;
g_pwm_buffer[led.driver][led.b - 0x24] = blue;
g_pwm_buffer_update_required = true;
}
}
@ -297,35 +215,28 @@ void IS31FL3731_set_color_all( uint8_t red, uint8_t green, uint8_t blue )
void IS31FL3731_set_led_control_register( uint8_t index, bool red, bool green, bool blue )
{
is31_led led = g_is31_leds[index];
// map_index_to_led(index, &led);
led_control_bitmask bitmask = g_led_control_bitmask[led.control_index];
// Matrix A and B registers are interleaved.
// Add 1 to Matrix A register to get Matrix B register
if ( red )
{
g_led_control_registers[led.driver][bitmask.red_register+led.matrix] |= (1<<bitmask.red_bit);
uint8_t control_register_r = (led.r - 0x24) / 8;
uint8_t control_register_g = (led.g - 0x24) / 8;
uint8_t control_register_b = (led.b - 0x24) / 8;
uint8_t bit_r = (led.r - 0x24) % 8;
uint8_t bit_g = (led.g - 0x24) % 8;
uint8_t bit_b = (led.b - 0x24) % 8;
if ( red ) {
g_led_control_registers[led.driver][control_register_r] |= (1 << bit_r);
} else {
g_led_control_registers[led.driver][control_register_r] &= ~(1 << bit_r);
}
else
{
g_led_control_registers[led.driver][bitmask.red_register+led.matrix] &= ~(1<<bitmask.red_bit);
}
if ( green )
{
g_led_control_registers[led.driver][bitmask.green_register+led.matrix] |= (1<<bitmask.green_bit);
}
else
{
g_led_control_registers[led.driver][bitmask.green_register+led.matrix] &= ~(1<<bitmask.green_bit);
}
if ( blue )
{
g_led_control_registers[led.driver][bitmask.blue_register+led.matrix] |= (1<<bitmask.blue_bit);
if ( green ) {
g_led_control_registers[led.driver][control_register_g] |= (1 << bit_g);
} else {
g_led_control_registers[led.driver][control_register_g] &= ~(1 << bit_g);
}
else
{
g_led_control_registers[led.driver][bitmask.blue_register+led.matrix] &= ~(1<<bitmask.blue_bit);
if ( blue ) {
g_led_control_registers[led.driver][control_register_b] |= (1 << bit_b);
} else {
g_led_control_registers[led.driver][control_register_b] &= ~(1 << bit_b);
}
g_led_control_registers_update_required = true;

169
drivers/avr/is31fl3731.h
Unescape Escape View File

@ -23,8 +23,9 @@
typedef struct is31_led {
uint8_t driver:2;
uint8_t matrix:1;
uint8_t control_index;
uint8_t r;
uint8_t g;
uint8_t b;
} __attribute__((packed)) is31_led;
extern const is31_led g_is31_leds[DRIVER_LED_TOTAL];
@ -47,4 +48,168 @@ void IS31FL3731_set_led_control_register( uint8_t index, bool red, bool green, b
void IS31FL3731_update_pwm_buffers( uint8_t addr1, uint8_t addr2 );
void IS31FL3731_update_led_control_registers( uint8_t addr1, uint8_t addr2 );
#define C1_1 0x24
#define C1_2 0x25
#define C1_3 0x26
#define C1_4 0x27
#define C1_5 0x28
#define C1_6 0x29
#define C1_7 0x2A
#define C1_8 0x2B
#define C1_9 0x2C
#define C1_10 0x2D
#define C1_11 0x2E
#define C1_12 0x2F
#define C1_13 0x30
#define C1_14 0x31
#define C1_15 0x32
#define C1_16 0x33
#define C2_1 0x34
#define C2_2 0x35
#define C2_3 0x36
#define C2_4 0x37
#define C2_5 0x38
#define C2_6 0x39
#define C2_7 0x3A
#define C2_8 0x3B
#define C2_9 0x3C
#define C2_10 0x3D
#define C2_11 0x3E
#define C2_12 0x3F
#define C2_13 0x40
#define C2_14 0x41
#define C2_15 0x42
#define C2_16 0x43
#define C3_1 0x44
#define C3_2 0x45
#define C3_3 0x46
#define C3_4 0x47
#define C3_5 0x48
#define C3_6 0x49
#define C3_7 0x4A
#define C3_8 0x4B
#define C3_9 0x4C
#define C3_10 0x4D
#define C3_11 0x4E
#define C3_12 0x4F
#define C3_13 0x50
#define C3_14 0x51
#define C3_15 0x52
#define C3_16 0x53
#define C4_1 0x54
#define C4_2 0x55
#define C4_3 0x56
#define C4_4 0x57
#define C4_5 0x58
#define C4_6 0x59
#define C4_7 0x5A
#define C4_8 0x5B
#define C4_9 0x5C
#define C4_10 0x5D
#define C4_11 0x5E
#define C4_12 0x5F
#define C4_13 0x60
#define C4_14 0x61
#define C4_15 0x62
#define C4_16 0x63
#define C5_1 0x64
#define C5_2 0x65
#define C5_3 0x66
#define C5_4 0x67
#define C5_5 0x68
#define C5_6 0x69
#define C5_7 0x6A
#define C5_8 0x6B
#define C5_9 0x6C
#define C5_10 0x6D
#define C5_11 0x6E
#define C5_12 0x6F
#define C5_13 0x70
#define C5_14 0x71
#define C5_15 0x72
#define C5_16 0x73
#define C6_1 0x74
#define C6_2 0x75
#define C6_3 0x76
#define C6_4 0x77
#define C6_5 0x78
#define C6_6 0x79
#define C6_7 0x7A
#define C6_8 0x7B
#define C6_9 0x7C
#define C6_10 0x7D
#define C6_11 0x7E
#define C6_12 0x7F
#define C6_13 0x80
#define C6_14 0x81
#define C6_15 0x82
#define C6_16 0x83
#define C7_1 0x84
#define C7_2 0x85
#define C7_3 0x86
#define C7_4 0x87
#define C7_5 0x88
#define C7_6 0x89
#define C7_7 0x8A
#define C7_8 0x8B
#define C7_9 0x8C
#define C7_10 0x8D
#define C7_11 0x8E
#define C7_12 0x8F
#define C7_13 0x90
#define C7_14 0x91
#define C7_15 0x92
#define C7_16 0x93
#define C8_1 0x94
#define C8_2 0x95
#define C8_3 0x96
#define C8_4 0x97
#define C8_5 0x98
#define C8_6 0x99
#define C8_7 0x9A
#define C8_8 0x9B
#define C8_9 0x9C
#define C8_10 0x9D
#define C8_11 0x9E
#define C8_12 0x9F
#define C8_13 0xA0
#define C8_14 0xA1
#define C8_15 0xA2
#define C8_16 0xA3
#define C9_1 0xA4
#define C9_2 0xA5
#define C9_3 0xA6
#define C9_4 0xA7
#define C9_5 0xA8
#define C9_6 0xA9
#define C9_7 0xAA
#define C9_8 0xAB
#define C9_9 0xAC
#define C9_10 0xAD
#define C9_11 0xAE
#define C9_12 0xAF
#define C9_13 0xB0
#define C9_14 0xB1
#define C9_15 0xB2
#define C9_16 0xB3
#endif // IS31FL3731_DRIVER_H

185
keyboards/planck/light/light.c
Unescape Escape View File

@ -17,72 +17,131 @@
#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
* | 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},
};
* | R location
* | | 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
};

5
quantum/rgb_matrix.c
Unescape Escape View File

@ -1015,6 +1015,11 @@ void rgblight_step(void) {
backlight_config_save();
}
void rgblight_step_reverse(void) {
g_config.effect = (g_config.effect - 1) % (BACKLIGHT_EFFECT_MAX + 1);
backlight_config_save();
}
void rgblight_increase_hue(void) {
backlight_color_1_hue_increase();
backlight_color_2_hue_increase();

1
quantum/rgb_matrix.h
Unescape Escape View File

@ -130,6 +130,7 @@ void backlight_debug_led(bool state);
void rgblight_toggle(void);
void rgblight_step(void);
void rgblight_step_reverse(void);
void rgblight_increase_hue(void);
void rgblight_decrease_hue(void);
void rgblight_increase_sat(void);

Write Preview
Loading…
Cancel
Save