Add basic ISO {Win,Mac} layouts for Durgod/K320 #11778

AlCutter · 2021-02-02T21:41:11Z

Description

Adds support for ISO layouts to the durgod/K320 keyboard, along with basic default layouts for Windows and Mac.

Types of Changes

Issues Fixed or Closed by This PR

Checklist

My code follows the code style of this project: C, Python
I have read the PR Checklist document and have made the appropriate changes.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
I have tested the changes and verified that they work and don't break anything (as well as I can manage).

keyboards/durgod/k320/keymaps/default_iso/keymap.c

spidey3

This is mostly good - but I am concerned about the confusing scrunched setup of the LAYOUT macros. Although I note that the same scrunched organization exists in the ansi layouts...

spidey3 · 2021-02-13T02:06:15Z

keyboards/durgod/k320/k320.h

+      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F,  \
+      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,        K1E,  K1F,  \
+      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,        K2E,  K2F,  \
+      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D,  K3E,  K3F,  \
+      K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,  K4E,  K4F,  \
+      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,  K5E,  K5F,  \
+                                                                                                K6F   \


This's nothing technically wrong with this, but you might want to re-arrange the way the keys are listed here so that it matches the actual keyboard layout. As it it now, it is somewhat confusing...

Thanks - done, I think... PTAL.

I've made the changes for the two ISO layouts in this PR, I'm a little reluctant to try to fix up the ANSI version as I don't have an ANSI version of the keyboard.

spidey3 · 2021-02-13T02:07:55Z

keyboards/durgod/k320/keymaps/default_iso/keymap.c

+      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_PSCR,  KC_SLCK,  KC_PAUS,
+      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_PGUP,
+      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_INS,   KC_HOME,
+      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_NUHS,  KC_DEL,   KC_END,   KC_PGDN,
+      KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_ENT,   KC_UP,
+      KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(_FUNC),KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,


Same as above; if you modify the LAYOUT_tkl_iso macro to match the actual keyboard, this will need to be adjusted too (and will be more easily understandable).

spidey3 · 2021-02-13T02:08:13Z

keyboards/durgod/k320/keymaps/default_iso/keymap.c

+      _______,  KC_MPLY,  KC_MSTP,  KC_MRWD,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+      _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______,


Same as above.

spidey3 · 2021-02-13T02:08:44Z

keyboards/durgod/k320/keymaps/default_iso_mac/keymap.c

+      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_PSCR,  KC_SLCK,  KC_PAUS,
+      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_PGUP,
+      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_INS,   KC_HOME,
+      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_NUHS,  KC_DEL,   KC_END,   KC_PGDN,
+      KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_ENT,   KC_UP,
+      KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RALT,  MO(_FUNC),KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,


spidey3 · 2021-02-13T02:08:55Z

keyboards/durgod/k320/keymaps/default_iso_mac/keymap.c

+      _______,  KC_MPLY,  KC_MSTP,  KC_MRWD,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+      _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______,


Swap the L{GUI,ALT} keys to match the mac layout, and remove the windows key lock functionality.

spidey3

Thanks.

github-actions bot added keyboard keymap labels Feb 2, 2021

drashna reviewed Feb 5, 2021

View reviewed changes

keyboards/durgod/k320/keymaps/default_iso/keymap.c Outdated Show resolved Hide resolved

AlCutter force-pushed the durgod_k320_iso branch from c53ea12 to 3a63082 Compare February 10, 2021 19:31

drashna approved these changes Feb 12, 2021

View reviewed changes

spidey3 reviewed Feb 13, 2021

View reviewed changes

AlCutter added 4 commits February 13, 2021 14:13

Add default ISO Windows layout for Durgod/K320

3640806

Duplicate default_iso to default_iso_mac

94d6509

Swap the L{GUI,ALT} keys to match the mac layout, and remove the windows key lock functionality.

Remove windows-key lock in default_iso

47da368

Fixup wonky macro layout inherited from ansi keymap

12331b3

AlCutter force-pushed the durgod_k320_iso branch from 3a63082 to 12331b3 Compare February 13, 2021 14:13

spidey3 approved these changes Feb 13, 2021

View reviewed changes

spidey3 mentioned this pull request Feb 13, 2021

[Bug] Durgod K320 layout macro is wrong #11883

Closed

spidey3 merged commit 8af7e5e into qmk:master Feb 13, 2021

spidey3 mentioned this pull request Feb 13, 2021

unscramble Durgod k320 keymap / fix Issue #11883 #11885

Merged

14 tasks

dkjer mentioned this pull request Feb 23, 2021

[Keyboard] Add ISO layout for Durgod K320 #11872

Closed

14 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add basic ISO {Win,Mac} layouts for Durgod/K320 #11778

Add basic ISO {Win,Mac} layouts for Durgod/K320 #11778

AlCutter commented Feb 2, 2021

spidey3 left a comment

spidey3 Feb 13, 2021

AlCutter Feb 13, 2021

spidey3 Feb 13, 2021

AlCutter Feb 13, 2021

spidey3 Feb 13, 2021

AlCutter Feb 13, 2021

spidey3 Feb 13, 2021

AlCutter Feb 13, 2021

spidey3 Feb 13, 2021

AlCutter Feb 13, 2021

spidey3 left a comment

Add basic ISO {Win,Mac} layouts for Durgod/K320 #11778

Add basic ISO {Win,Mac} layouts for Durgod/K320 #11778

Conversation

AlCutter commented Feb 2, 2021

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

spidey3 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

spidey3 left a comment

Choose a reason for hiding this comment