hooked-up keymap/matrix, compiling, not working

This commit is contained in:
Jack Humbert
2018-06-09 02:03:32 -04:00
parent 53c518f7d4
commit 2fccc1a064
10 changed files with 251 additions and 275 deletions

View File

@@ -149,4 +149,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DRIVER_2_LED_TOTAL 24
#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL
#define NO_USB_STARTUP_CHECK
#endif

View File

@@ -79,6 +79,13 @@
#define HAL_USE_I2C TRUE
#endif
/**
* @brief Enables the I2C Slave subsystem.
*/
#if !defined(HAL_USE_I2C_SLAVE) || defined(__DOXYGEN__)
#define HAL_USE_I2C_SLAVE TRUE
#endif
/**
* @brief Enables the I2S subsystem.
*/

View File

@@ -28,13 +28,13 @@ void matrix_scan_kb(void) {
matrix_scan_user();
}
void suspend_power_down_kb(void) {
rgb_matrix_set_suspend_state(true);
}
// void suspend_power_down_kb(void) {
// rgb_matrix_set_suspend_state(true);
// }
void suspend_wakeup_init_kb(void) {
rgb_matrix_set_suspend_state(false);
}
// void suspend_wakeup_init_kb(void) {
// rgb_matrix_set_suspend_state(false);
// }
const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_ortho_4x6(
18, 19, 20, 21, 22, 23,
@@ -43,73 +43,73 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_ortho_4x6(
0, 1, 2, 3, 4, 5
);
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */
{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},
// const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
// /* Refer to IS31 manual for these locations
// * driver
// * | R location
// * | | G location
// * | | | B location
// * | | | | */
// {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},
{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},
// {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},
{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},
// {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},
{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_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}
// };
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
// const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
/*{row | col << 4}
| {x=0..224, y=0..64}
| | modifier
| | | */
{{0|(0<<4)}, {20.36*0, 21.33*0}, 1},
{{0|(1<<4)}, {20.36*1, 21.33*0}, 0},
{{0|(2<<4)}, {20.36*2, 21.33*0}, 0},
{{0|(3<<4)}, {20.36*3, 21.33*0}, 0},
{{0|(4<<4)}, {20.36*4, 21.33*0}, 0},
{{0|(5<<4)}, {20.36*5, 21.33*0}, 0},
// {row | col << 4}
// | {x=0..224, y=0..64}
// | | modifier
// | | |
// {{0|(0<<4)}, {20.36*0, 21.33*0}, 1},
// {{0|(1<<4)}, {20.36*1, 21.33*0}, 0},
// {{0|(2<<4)}, {20.36*2, 21.33*0}, 0},
// {{0|(3<<4)}, {20.36*3, 21.33*0}, 0},
// {{0|(4<<4)}, {20.36*4, 21.33*0}, 0},
// {{0|(5<<4)}, {20.36*5, 21.33*0}, 0},
{{1|(0<<4)}, {20.36*0, 21.33*1}, 1},
{{1|(1<<4)}, {20.36*1, 21.33*1}, 0},
{{1|(2<<4)}, {20.36*2, 21.33*1}, 0},
{{1|(3<<4)}, {20.36*3, 21.33*1}, 0},
{{1|(4<<4)}, {20.36*4, 21.33*1}, 0},
{{1|(5<<4)}, {20.36*5, 21.33*1}, 0},
// {{1|(0<<4)}, {20.36*0, 21.33*1}, 1},
// {{1|(1<<4)}, {20.36*1, 21.33*1}, 0},
// {{1|(2<<4)}, {20.36*2, 21.33*1}, 0},
// {{1|(3<<4)}, {20.36*3, 21.33*1}, 0},
// {{1|(4<<4)}, {20.36*4, 21.33*1}, 0},
// {{1|(5<<4)}, {20.36*5, 21.33*1}, 0},
{{2|(0<<4)}, {20.36*0, 21.33*2}, 1},
{{2|(1<<4)}, {20.36*1, 21.33*2}, 0},
{{2|(2<<4)}, {20.36*2, 21.33*2}, 0},
{{2|(3<<4)}, {20.36*3, 21.33*2}, 0},
{{2|(4<<4)}, {20.36*4, 21.33*2}, 0},
{{2|(5<<4)}, {20.36*5, 21.33*2}, 0},
// {{2|(0<<4)}, {20.36*0, 21.33*2}, 1},
// {{2|(1<<4)}, {20.36*1, 21.33*2}, 0},
// {{2|(2<<4)}, {20.36*2, 21.33*2}, 0},
// {{2|(3<<4)}, {20.36*3, 21.33*2}, 0},
// {{2|(4<<4)}, {20.36*4, 21.33*2}, 0},
// {{2|(5<<4)}, {20.36*5, 21.33*2}, 0},
{{3|(0<<4)}, {20.36*0, 21.33*3}, 1},
{{3|(1<<4)}, {20.36*1, 21.33*3}, 1},
{{3|(2<<4)}, {20.36*2, 21.33*3}, 1},
{{3|(3<<4)}, {20.36*3, 21.33*3}, 1},
{{3|(4<<4)}, {20.36*4, 21.33*3}, 1},
{{3|(5<<4)}, {20.36*5, 21.33*3}, 0}
};
// {{3|(0<<4)}, {20.36*0, 21.33*3}, 1},
// {{3|(1<<4)}, {20.36*1, 21.33*3}, 1},
// {{3|(2<<4)}, {20.36*2, 21.33*3}, 1},
// {{3|(3<<4)}, {20.36*3, 21.33*3}, 1},
// {{3|(4<<4)}, {20.36*4, 21.33*3}, 1},
// {{3|(5<<4)}, {20.36*5, 21.33*3}, 0}
// };

View File

@@ -51,12 +51,13 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # USB Nkey Rollover
CUSTOM_MATRIX = yes # Custom matrix file
AUDIO_ENABLE = yes
RGB_MATRIX_ENABLE = yes
ENCODER_ENABLE = yes
# RGB_MATRIX_ENABLE = yes
# ENCODER_ENABLE = yes
# SERIAL_LINK_ENABLE = yes
I2C_SLAVE_ENABLE = yes
QWIIC_KEYBOARD_ENABLE = yes
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
LAYOUTS = ortho_4x6
LAYOUTS_HAS_RGB = no