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

Update dynamis keyboard #17625

Merged
merged 16 commits into from
Aug 29, 2022
Merged

Update dynamis keyboard #17625

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3e9bc4e
mod modifiers
bbrfkr Jul 11, 2022
8ac14a8
mod initial layout
bbrfkr Jul 11, 2022
d77cc48
mod readme
bbrfkr Jul 11, 2022
96dae11
mod info.json
bbrfkr Jul 11, 2022
ee8461e
support via for remapping encoder
bbrfkr Jul 11, 2022
388fda4
add white space and last break line
bbrfkr Jul 11, 2022
c5322b6
Update keyboards/bbrfkr/dynamis/readme.md
bbrfkr Jul 11, 2022
8db05d3
mod usage encoder
bbrfkr Jul 12, 2022
523053a
move mute default key
bbrfkr Jul 12, 2022
79c107c
mod encoder behavior
bbrfkr Jul 12, 2022
cab64d6
move the defaut behavior for encoder to .h file
bbrfkr Jul 15, 2022
f2272ef
replace actual pin to NO_PIN pin
bbrfkr Jul 17, 2022
df9866d
mod conflict
bbrfkr Aug 11, 2022
84e7b30
Merge remote-tracking branch 'qmk/master' into update-dynamis-keyboard
bbrfkr Aug 16, 2022
dca526c
try to enable encoder map
bbrfkr Aug 28, 2022
4ab684d
Merge remote-tracking branch 'qmk/master' into update-dynamis-keyboard
bbrfkr Aug 28, 2022
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
4 changes: 2 additions & 2 deletions keyboards/bbrfkr/dynamis/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
#define PRODUCT dynamis

/* key matrix */
#define MATRIX_ROWS 10
#define MATRIX_ROWS 11
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#define MATRIX_ROWS 11
#define MATRIX_ROWS 10

#define MATRIX_COLS 7
#define MATRIX_ROW_PINS { B6, B4, D6, D5, D1, C6, B5, D7, D4, D0 }
#define MATRIX_ROW_PINS { B6, B4, D6, D5, D1, C6, B5, D7, D4, D0, D2 }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is D2 actually being used here? Or just being used as a place holder?

Suggested change
#define MATRIX_ROW_PINS { B6, B4, D6, D5, D1, C6, B5, D7, D4, D0, D2 }
#define MATRIX_ROW_PINS { B6, B4, D6, D5, D1, C6, B5, D7, D4, D0 }

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

D2 is for the encoder. I think that the default via keymap for encoder cannot be defined if this doesn't exist.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can undefine and redefine the values for the via keymap, actually.

Which is the ideal option here, since you're creating blank spots in the layout that are ONLY used for the encoders.

Also, you should use NO_PIN instead of assigning a pin here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. I replaced D2 to NO_PIN.

#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7 }

/* rgb num */
Expand Down
15 changes: 3 additions & 12 deletions keyboards/bbrfkr/dynamis/dynamis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,9 @@

#include "dynamis.h"

#ifdef ENCODER_ENABLE
#ifndef ENCODER_ENABLE
drashna marked this conversation as resolved.
Show resolved Hide resolved
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) {
return false;
}
if (index == 0) { /* First encoder */
if (clockwise) {
tap_code(KC_WH_D);
} else {
tap_code(KC_WH_U);
}
}
return false;
if (!encoder_update_user(index, clockwise)) { return false; }
return true;
drashna marked this conversation as resolved.
Show resolved Hide resolved
}
#endif
6 changes: 4 additions & 2 deletions keyboards/bbrfkr/dynamis/dynamis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
{ C60, C61, C62, C63, C64, C65, C66 }, \
{ C70, KC_NO, C72, C73, C74, C75, C76 }, \
{ C80, C81, C82, C83, C84, C85, C86 }, \
{ C90, C91, C92, C93, C94, C95, C96 } \
{ C90, C91, C92, C93, C94, C95, C96 }, \
{ KC_WH_D, KC_WH_U, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{ C90, C91, C92, C93, C94, C95, C96 }, \
{ KC_WH_D, KC_WH_U, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
{ C90, C91, C92, C93, C94, C95, C96 } \

}

#define LAYOUT_iso( \
Expand All @@ -55,5 +56,6 @@
{ KC_NO, C61, C62, C63, C64, C65, C66 }, \
{ C70, C71, C72, C73, C74, C75, C76 }, \
{ C80, C81, C82, C83, C84, C85, C86 }, \
{ C90, C91, C92, C93, C94, C95, C96 } \
{ C90, C91, C92, C93, C94, C95, C96 }, \
{ KC_WH_D, KC_WH_U, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{ C90, C91, C92, C93, C94, C95, C96 }, \
{ KC_WH_D, KC_WH_U, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
{ C90, C91, C92, C93, C94, C95, C96 } \

}
76 changes: 38 additions & 38 deletions keyboards/bbrfkr/dynamis/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,62 +11,62 @@
"y": 0
},
{
"label": "F1",
"label": "1",
"x": 1,
"y": 0
},
{
"label": "F2",
"label": "2",
"x": 2,
"y": 0
},
{
"label": "F3",
"label": "3",
"x": 3,
"y": 0
},
{
"label": "F4",
"label": "4",
"x": 4,
"y": 0
},
{
"label": "F5",
"label": "5",
"x": 5,
"y": 0
},
{
"label": "F6",
"label": "6",
"x": 6,
"y": 0
},
{
"label": "F7",
"label": "7",
"x": 7,
"y": 0
},
{
"label": "F8",
"label": "8",
"x": 8,
"y": 0
},
{
"label": "F9",
"label": "9",
"x": 9,
"y": 0
},
{
"label": "F10",
"label": "0",
"x": 10,
"y": 0
},
{
"label": "F11",
"label": "-",
"x": 11,
"y": 0
},
{
"label": "F12",
"label": "=",
"x": 12,
"y": 0
},
Expand Down Expand Up @@ -286,7 +286,7 @@
"w": 1.75
},
{
"label": "Raise",
"label": "Lower",
"x": 14,
"y": 3
},
Expand All @@ -302,13 +302,13 @@
"w": 1.25
},
{
"label": "Super",
"label": "Alt",
"x": 1.25,
"y": 4,
"w": 1.25
},
{
"label": "Alt",
"label": "Lower",
"x": 2.5,
"y": 4,
"w": 1.25
Expand All @@ -320,25 +320,25 @@
"w": 2.25
},
{
"label": "Lower",
"label": "Space",
"x": 6,
"y": 4,
"w": 1.25
},
{
"label": "Raise",
"label": "Enter",
"x": 7.25,
"y": 4,
"w": 2.75
},
{
"label": "Alt",
"label": "Raise",
"x": 10,
"y": 4,
"w": 1.25
},
{
"label": "Super",
"label": "Alt",
"x": 11.25,
"y": 4,
"w": 1.25
Expand Down Expand Up @@ -374,62 +374,62 @@
"y": 0
},
{
"label": "F1",
"label": "1",
"x": 1,
"y": 0
},
{
"label": "F2",
"label": "2",
"x": 2,
"y": 0
},
{
"label": "F3",
"label": "3",
"x": 3,
"y": 0
},
{
"label": "F4",
"label": "4",
"x": 4,
"y": 0
},
{
"label": "F5",
"label": "5",
"x": 5,
"y": 0
},
{
"label": "F6",
"label": "6",
"x": 6,
"y": 0
},
{
"label": "F7",
"label": "7",
"x": 7,
"y": 0
},
{
"label": "F8",
"label": "8",
"x": 8,
"y": 0
},
{
"label": "F9",
"label": "9",
"x": 9,
"y": 0
},
{
"label": "F10",
"label": "0",
"x": 10,
"y": 0
},
{
"label": "F11",
"label": "-",
"x": 11,
"y": 0
},
{
"label": "F12",
"label": "=",
"x": 12,
"y": 0
},
Expand Down Expand Up @@ -649,7 +649,7 @@
"w": 1.75
},
{
"label": "Raise",
"label": "Lower",
"x": 14,
"y": 3
},
Expand All @@ -665,13 +665,13 @@
"w": 1.25
},
{
"label": "Super",
"label": "Alt",
"x": 1.25,
"y": 4,
"w": 1.25
},
{
"label": "Alt",
"label": "Lower",
"x": 2.5,
"y": 4,
"w": 1.25
Expand All @@ -683,25 +683,25 @@
"w": 2.25
},
{
"label": "Lower",
"label": "Space",
"x": 6,
"y": 4,
"w": 1.25
},
{
"label": "Raise",
"label": "Enter",
"x": 7.25,
"y": 4,
"w": 2.75
},
{
"label": "Alt",
"label": "Raise",
"x": 10,
"y": 4,
"w": 1.25
},
{
"label": "Super",
"label": "Alt",
"x": 11.25,
"y": 4,
"w": 1.25
Expand Down
51 changes: 31 additions & 20 deletions keyboards/bbrfkr/dynamis/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,40 +20,51 @@ enum layer_names {
_QWERTY,
_LOWER,
_RAISE,
_SETTINGS
_SETTINGS,
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_QWERTY] = LAYOUT_ansi(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_DEL,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_TAB, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(2), KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), MO(2), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
KC_TAB, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
KC_LCTL, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_ENT, MO(2), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),

[_LOWER] = LAYOUT_ansi(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_TRNS, KC_TRNS,
KC_PSCR, KC_TRNS, KC_TRNS, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN2, KC_WH_D, KC_BTN1, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END, KC_TRNS, KC_TRNS, MO(3), KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE
),

[_RAISE] = LAYOUT_ansi(
KC_ESC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_QUOT, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_UNDS, KC_PLUS, KC_DQUO, KC_LCBR, KC_RCBR, KC_TRNS, MO(3), KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LGUI, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE
),

[_SETTINGS] = LAYOUT_ansi(
RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
),
};

bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
tap_code(layer_state == 0 ? KC_WH_D : KC_VOLD);
} else {
tap_code(layer_state == 0 ? KC_WH_U : KC_VOLU);
}
}
return false;
}
Loading