Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for the Durgod Hades, Galaxy and Venus Keyboards #12893

Merged
merged 11 commits into from
Jul 20, 2021
Merged

Add support for the Durgod Hades, Galaxy and Venus Keyboards #12893

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
20fac44
Adding durgod hades keyboard
J-Sully Mar 24, 2021
af5d4fa
refactored hades into dgk6x common code
J-Sully May 12, 2021
060179e
adding venus implementation
J-Sully May 12, 2021
f3f9577
Updated durgod/dgk6x I2C timings
dkjer May 15, 2021
6bb1400
Added suggested PR changes
J-Sully Jun 3, 2021
c2b3383
increasing VIA layer count to 16
J-Sully Jun 3, 2021
4210272
Adding durgod galaxy 75 support
dkjer Jun 4, 2021
95b4b8f
Update keyboards/durgod/dgk6x/config.h
J-Sully Jun 9, 2021
4bc0618
Reverting update to keyboards/durgod/dgk6x/config.h to fix build issue
dkjer Jul 5, 2021
b88b92c
Updating dgk6x readme
dkjer Jul 7, 2021
0336d6d
Enabling Lighting section in VIA for DGK6X keyboards
dkjer Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added suggested PR changes
  • Loading branch information
@J-Sully
J-Sully committed Jun 3, 2021
commit 6bb14003e4ebac0acb73525367794579ee478e22
101 changes: 0 additions & 101 deletions keyboards/durgod/dgk6x/dgk6x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,107 +59,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
#endif /* WINLOCK_DISABLED */

#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */

{0, C_1, B_1, A_1}, // Esc
{0, C_2, B_2, A_2}, // 1
{0, C_3, B_3, A_3}, // 2
{0, C_4, B_4, A_4}, // 3
{0, C_5, B_5, A_5}, // 4
{0, C_6, B_6, A_6}, // 5
{0, C_7, B_7, A_7}, // 6
{0, C_8, B_8, A_8}, // 7
{0, C_9, B_9, A_9}, // 8
{0, C_10, B_10, A_10}, // 9
{0, C_11, B_11, A_11}, // 0
{0, C_12, B_12, A_12}, // -
{0, C_13, B_13, A_13}, // =
{0, C_14, B_14, A_14}, // Bksp
#ifdef KEYBOARD_durgod_dgk6x_hades
{0, C_15, B_15, A_15}, // Del
#endif

{0, F_1, E_1, D_1}, // Tab
{0, F_2, E_2, D_2}, // Q
{0, F_3, E_3, D_3}, // W
{0, F_4, E_4, D_4}, // E
{0, F_5, E_5, D_5}, // R
{0, F_6, E_6, D_6}, // T
{0, F_7, E_7, D_7}, // Y
{0, F_8, E_8, D_8}, // U
{0, F_9, E_9, D_9}, // I
{0, F_10, E_10, D_10}, // O
{0, F_11, E_11, D_11}, // P
{0, F_12, E_12, D_12}, // [
{0, F_13, E_13, D_13}, // ]
{0, F_14, E_14, D_14}, // Pipe
#ifdef KEYBOARD_durgod_dgk6x_hades
{0, F_15, E_15, D_15}, // Home
#endif

{0, I_1, H_1, G_1}, // Caps
{0, I_2, H_2, G_2}, // A
{0, I_3, H_3, G_3}, // S
{0, I_4, H_4, G_4}, // D
{0, I_5, H_5, G_5}, // F
{0, I_6, H_6, G_6}, // G
{0, I_7, H_7, G_7}, // H
{0, I_8, H_8, G_8}, // J
{0, I_9, H_9, G_9}, // K
{0, I_10, H_10, G_10}, // L
{0, I_11, H_11, G_11}, // :
{0, I_12, H_12, G_12}, // '
{0, I_14, H_14, G_14}, // Enter
#ifdef KEYBOARD_durgod_dgk6x_hades
{0, I_15, H_15, G_15}, // PgUp
#endif

{0, L_1, K_1, J_1}, // LShift
{0, L_2, K_2, J_2}, // Z
{0, L_3, K_3, J_3}, // X
{0, L_4, K_4, J_4}, // C
{0, L_5, K_5, J_5}, // V
{0, L_6, K_6, J_6}, // B
{0, L_7, K_7, J_7}, // N
{0, L_8, K_8, J_8}, // M
{0, L_9, K_9, J_9}, // <
{0, L_10, K_10, J_10}, // >
{0, L_11, K_11, J_11}, // ?
{0, L_12, K_12, J_12}, // RShift
#ifdef KEYBOARD_durgod_dgk6x_hades
{0, L_14, K_14, J_14}, // Up
{0, L_15, K_15, J_15}, // PgOn
#endif

{1, C_1, B_1, A_1}, // LCtrl
{1, C_2, B_2, A_2}, // LAlt
{1, C_3, B_3, A_3}, // Windows
{1, C_6, B_6, A_6}, // Space
{1, C_10, B_10, A_10}, // Fn1/RAlt hades/venus
{1, C_11, B_11, A_11}, // Fn2/Fn1
{1, C_12, B_12, A_12}, // RCtrl/Fn2
{1, C_13, B_13, A_13}, // LEFT/RCtrl
#ifdef KEYBOARD_durgod_dgk6x_hades
{1, C_14, B_14, A_14}, // DOWN
{1, C_15, B_15, A_15} // RIGHT
#endif
};

void suspend_power_down_kb(void) {
rgb_matrix_set_suspend_state(true);
suspend_power_down_user();
}

void suspend_wakeup_init_kb(void) {
rgb_matrix_set_suspend_state(false);
suspend_wakeup_init_user();
}

__attribute__ ((weak))
void rgb_matrix_indicators_user(void)
Expand Down
84 changes: 84 additions & 0 deletions keyboards/durgod/dgk6x/hades/hades.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,90 @@
#include "hades.h"

#ifdef RGB_MATRIX_ENABLE


const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */

{0, C_1, B_1, A_1}, // Esc
{0, C_2, B_2, A_2}, // 1
{0, C_3, B_3, A_3}, // 2
{0, C_4, B_4, A_4}, // 3
{0, C_5, B_5, A_5}, // 4
{0, C_6, B_6, A_6}, // 5
{0, C_7, B_7, A_7}, // 6
{0, C_8, B_8, A_8}, // 7
{0, C_9, B_9, A_9}, // 8
{0, C_10, B_10, A_10}, // 9
{0, C_11, B_11, A_11}, // 0
{0, C_12, B_12, A_12}, // -
{0, C_13, B_13, A_13}, // =
{0, C_14, B_14, A_14}, // Bksp
{0, C_15, B_15, A_15}, // Del

{0, F_1, E_1, D_1}, // Tab
{0, F_2, E_2, D_2}, // Q
{0, F_3, E_3, D_3}, // W
{0, F_4, E_4, D_4}, // E
{0, F_5, E_5, D_5}, // R
{0, F_6, E_6, D_6}, // T
{0, F_7, E_7, D_7}, // Y
{0, F_8, E_8, D_8}, // U
{0, F_9, E_9, D_9}, // I
{0, F_10, E_10, D_10}, // O
{0, F_11, E_11, D_11}, // P
{0, F_12, E_12, D_12}, // [
{0, F_13, E_13, D_13}, // ]
{0, F_14, E_14, D_14}, // Pipe
{0, F_15, E_15, D_15}, // Home

{0, I_1, H_1, G_1}, // Caps
{0, I_2, H_2, G_2}, // A
{0, I_3, H_3, G_3}, // S
{0, I_4, H_4, G_4}, // D
{0, I_5, H_5, G_5}, // F
{0, I_6, H_6, G_6}, // G
{0, I_7, H_7, G_7}, // H
{0, I_8, H_8, G_8}, // J
{0, I_9, H_9, G_9}, // K
{0, I_10, H_10, G_10}, // L
{0, I_11, H_11, G_11}, // :
{0, I_12, H_12, G_12}, // '
{0, I_14, H_14, G_14}, // Enter
{0, I_15, H_15, G_15}, // PgUp

{0, L_1, K_1, J_1}, // LShift
{0, L_2, K_2, J_2}, // Z
{0, L_3, K_3, J_3}, // X
{0, L_4, K_4, J_4}, // C
{0, L_5, K_5, J_5}, // V
{0, L_6, K_6, J_6}, // B
{0, L_7, K_7, J_7}, // N
{0, L_8, K_8, J_8}, // M
{0, L_9, K_9, J_9}, // <
{0, L_10, K_10, J_10}, // >
{0, L_11, K_11, J_11}, // ?
{0, L_12, K_12, J_12}, // RShift
{0, L_14, K_14, J_14}, // Up
{0, L_15, K_15, J_15}, // PgOn

{1, C_1, B_1, A_1}, // LCtrl
{1, C_2, B_2, A_2}, // LAlt
{1, C_3, B_3, A_3}, // Windows
{1, C_6, B_6, A_6}, // Space
{1, C_10, B_10, A_10}, // Fn1/RAlt hades/venus
{1, C_11, B_11, A_11}, // Fn2/Fn1
{1, C_12, B_12, A_12}, // RCtrl/Fn2
{1, C_13, B_13, A_13}, // LEFT/RCtrl
{1, C_14, B_14, A_14}, // DOWN
{1, C_15, B_15, A_15} // RIGHT
};

led_config_t g_led_config = {{
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
Expand Down
5 changes: 3 additions & 2 deletions keyboards/durgod/dgk6x/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
DEFAULT_FOLDER=durgod/dgk6x/hades
# MCU name
# Actually F070, but close enough
MCU = STM32F072

BOARD = DURGOD_STM32_F070

# Do not put the microcontroller into power saving mode
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
NO_SUSPEND_POWER_DOWN = yes

# Build Options
# change yes to no to disable
Expand All @@ -28,3 +27,5 @@ LTO_ENABLE = yes

RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = IS31FL3733
J-Sully marked this conversation as resolved.
Show resolved Hide resolved

DEFAULT_FOLDER=durgod/dgk6x/hades
76 changes: 76 additions & 0 deletions keyboards/durgod/dgk6x/venus/venus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,82 @@
#include "venus.h"

#ifdef RGB_MATRIX_ENABLE

const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */

{0, C_1, B_1, A_1}, // Esc
{0, C_2, B_2, A_2}, // 1
{0, C_3, B_3, A_3}, // 2
{0, C_4, B_4, A_4}, // 3
{0, C_5, B_5, A_5}, // 4
{0, C_6, B_6, A_6}, // 5
{0, C_7, B_7, A_7}, // 6
{0, C_8, B_8, A_8}, // 7
{0, C_9, B_9, A_9}, // 8
{0, C_10, B_10, A_10}, // 9
{0, C_11, B_11, A_11}, // 0
{0, C_12, B_12, A_12}, // -
{0, C_13, B_13, A_13}, // =
{0, C_14, B_14, A_14}, // Bksp

{0, F_1, E_1, D_1}, // Tab
{0, F_2, E_2, D_2}, // Q
{0, F_3, E_3, D_3}, // W
{0, F_4, E_4, D_4}, // E
{0, F_5, E_5, D_5}, // R
{0, F_6, E_6, D_6}, // T
{0, F_7, E_7, D_7}, // Y
{0, F_8, E_8, D_8}, // U
{0, F_9, E_9, D_9}, // I
{0, F_10, E_10, D_10}, // O
{0, F_11, E_11, D_11}, // P
{0, F_12, E_12, D_12}, // [
{0, F_13, E_13, D_13}, // ]
{0, F_14, E_14, D_14}, // Pipe

{0, I_1, H_1, G_1}, // Caps
{0, I_2, H_2, G_2}, // A
{0, I_3, H_3, G_3}, // S
{0, I_4, H_4, G_4}, // D
{0, I_5, H_5, G_5}, // F
{0, I_6, H_6, G_6}, // G
{0, I_7, H_7, G_7}, // H
{0, I_8, H_8, G_8}, // J
{0, I_9, H_9, G_9}, // K
{0, I_10, H_10, G_10}, // L
{0, I_11, H_11, G_11}, // :
{0, I_12, H_12, G_12}, // '
{0, I_14, H_14, G_14}, // Enter

{0, L_1, K_1, J_1}, // LShift
{0, L_2, K_2, J_2}, // Z
{0, L_3, K_3, J_3}, // X
{0, L_4, K_4, J_4}, // C
{0, L_5, K_5, J_5}, // V
{0, L_6, K_6, J_6}, // B
{0, L_7, K_7, J_7}, // N
{0, L_8, K_8, J_8}, // M
{0, L_9, K_9, J_9}, // <
{0, L_10, K_10, J_10}, // >
{0, L_11, K_11, J_11}, // ?
{0, L_12, K_12, J_12}, // RShift

{1, C_1, B_1, A_1}, // LCtrl
{1, C_2, B_2, A_2}, // LAlt
{1, C_3, B_3, A_3}, // Windows
{1, C_6, B_6, A_6}, // Space
{1, C_10, B_10, A_10}, // Fn1/RAlt hades/venus
{1, C_11, B_11, A_11}, // Fn2/Fn1
{1, C_12, B_12, A_12}, // RCtrl/Fn2
{1, C_13, B_13, A_13}, // LEFT/RCtrl
};

led_config_t g_led_config = { {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 },
{ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 },
Expand Down