DZ60 keymap and layout #5474

OlliGranlund · 2019-03-23T21:31:25Z

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

My code follows the code style of this project.
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).

.gitignore

keyboards/crkbd/keymaps/olligranlund_nordic/keymap.c

keyboards/dz60/dz60.h

keyboards/satan/keymaps/olligranlund_iso/keymap.c

keyboards/satan/keymaps/olligranlund_iso/rules.mk

drashna · 2019-03-24T00:29:42Z

You've opened this pull request from your fork's master branch. While this isn't a major issue now, later changes may result in merge conflicts if you try to file another PR because the commit history will have diverged between your master and QMK's. It is highly recommended for QMK development - regardless of what is being done or where - to keep your master updated, but NEVER commit to it. Instead, do all your changes in a branch (branches are basically free in Git) and issue PRs from your branches when you're developing.

There are instructions on how to keep your master updated here:

Best Practices: Your fork's master: Update Often, Commit Never

If you need any help with this just ask.

You do not need to close this PR. Further changes should still be pushed to your master branch, until this PR is merged.

OlliGranlund · 2019-03-24T11:16:45Z

Alright, so apparently my iris keymap had gotten in as a duplicate to the wrong folder, no idea how this happened... I removed that since it was irrelewant for crkbd. Reviewed the changes you requested and made changes accordingly. I had to create a new DZ60 layout due to there not being a ISO layout with split backspace and split right shift. I now added also the json-data of my layout. Also cleaned layout to match 1:1 the visual representation of layouts.

I couldn't remember how I did the PR last time so that's why some of this mess. Should I now wait for you to accept this PR or should I create a new branch and push it to qmk-repo and request that to be merged?

mechmerlin · 2019-03-24T15:02:10Z

Unless this new layout name is a community accepted standard, I am opposed to having this new layout named with your user name. Can you think of a more generic name for this or make any of the existing layout macros work with your keymap?

OlliGranlund · 2019-03-24T18:44:45Z

I could come up with a better name for it, however I've just followed how the previous layouts have been made eg. "LAYOUT_60_tsangan_hhkb" has exactly as much information as my layout. Do you still feel like I should rename my layout to something like "LAYOUT_60_iso_split_backspace_rshift"?

noroadsleft · 2019-03-24T20:18:33Z

LAYOUT_60_iso_split_backspace_rshift

Most other 60% keyboards that I know of would use LAYOUT_60_iso_split_bs_rshift (bs being Backspace here) for that. You've got split Space as well, but I don't know that there's a custom for that as far as naming.

OlliGranlund · 2019-03-24T22:39:20Z

Alrighty! Renamed the layout to something more generic, so I guess this should be fine now? How should we proceed with this merge, it's fine like this or should I do these changes via a separate branch and make PR for that?

drashna · 2019-03-25T00:14:48Z

Could you remove the .vscode/ipch/50bbb6394ee57e02/DZ60.ipch file?

OlliGranlund · 2019-03-25T17:56:57Z

Damn, did that get in there now too... Well I removed the file as requested.

zvecr · 2019-03-26T00:51:19Z

keyboards/satan/keymaps/olligranlund_iso/keymap.c

@@ -48,6 +48,9 @@
 #define CALC KC_CALC  // Open default calculator app
 #define MYCM KC_MYCM  // Open default file manager

+// increase readability
+#define XXXXX    KC_NO


Is this required when XXXXXXX can be used for free as its provided along with ______ for KC_TRANS?

Suggested change

#define XXXXX KC_NO

Well, it's not predefined, like XXXXXXX, so it depends on what you want.

Ideally, I think we should use the built in one.

I would also prefer use of the seven-character alias defined in QMK core.

@OlliGranlund I recommend you rewrite this keymap to use the LAYOUT_60_iso macro. (Your existing readme suggests that's the layout you're running anyway.) Right now this keymap is based on outdated conventions, and wouldn't compile from a current version of QMK if merged as-is.

OlliGranlund · 2019-03-27T05:50:54Z

As my GH60 if fried, I can't test the compiled hex if it works as expected...

drashna · 2019-03-27T15:47:47Z

Oh no, I'm very sorry to hear that! :(

Co-Authored-By: OlliGranlund <[email protected]>

OlliGranlund · 2019-04-04T20:43:55Z

It's been a while. Yeah, my GH60 board is not working anymore and nothing seems to help for it, hence I would rather not do any more changes to my Satan keymap as it might break things. I've done the changes as requested, how should we go on with this merge? Do you want me to make it into a separate branch and PR or is it fine just in here after all the changes?

drashna · 2019-04-04T21:54:49Z

This should be fine. @mechmerlin @noroadsleft any issues with the layout changes?

OlliGranlund · 2019-04-10T16:35:38Z

This still seems to be pending :)

mechmerlin · 2019-04-10T18:23:19Z

This should be fine. @mechmerlin @noroadsleft any issues with the layout changes?

looks good to me!

mechmerlin

all good, but looks like someone's keymap is over the limit!

noroadsleft · 2019-04-10T18:26:00Z

This should be fine. @mechmerlin @noroadsleft any issues with the layout changes?

The DZ60 layout changes are good, but the Satan keymap actually won't compile as-is when this is merged into master.

noroadsleft · 2019-04-10T18:44:54Z

keyboards/satan/keymaps/olligranlund_iso/keymap.c

@@ -48,6 +48,9 @@
 #define CALC KC_CALC  // Open default calculator app
 #define MYCM KC_MYCM  // Open default file manager

+// increase readability
+#define XXXXX    KC_NO


@OlliGranlund I recommend you rewrite this keymap to use the LAYOUT_60_iso macro. (Your existing readme suggests that's the layout you're running anyway.) Right now this keymap is based on outdated conventions, and wouldn't compile from a current version of QMK if merged as-is.

noroadsleft · 2019-04-11T06:02:27Z

It's been a while. Yeah, my GH60 board is not working anymore and nothing seems to help for it, hence I would rather not do any more changes to my Satan keymap as it might break things. I've done the changes as requested, how should we go on with this merge? Do you want me to make it into a separate branch and PR or is it fine just in here after all the changes?

I forgot that your Satan is out of commission. Please disregard my comments regarding rewriting that keymap.

OlliGranlund · 2019-04-20T09:08:49Z

Hmm, so we are still waiting for yanfali:s approval?

drashna · 2019-05-04T00:24:59Z

Thanks!

* init * function layout planning * nordic keymap v1.0 * Added latest satan layouts, updated readmes * Cleaning code * Renamed ISO -> iso * Updated keymap to work better with Swedish layout * merge conflict * Added dz60 layout * pr issues fixes * removed weirdly positioned files * code cleanup, added dz60 layout json data * Added dz60 layout readme * Renamed layout * removed vscode file * Update keyboards/dz60/dz60.h Co-Authored-By: OlliGranlund <[email protected]>

OlliGranlund added 11 commits March 9, 2018 21:30

init

5aa9a80

function layout planning

99b0c33

Merge remote-tracking branch 'upstream'

9b333cd

nordic keymap v1.0

94323cf

Added latest satan layouts, updated readmes

1727b3a

Cleaning code

00e9b3f

Renamed ISO -> iso

d5097c9

Updated keymap to work better with Swedish layout

e7746fe

merged upstream

5129f8a

merge conflict

ac7063a

Added dz60 layout

cda44c1

drashna requested changes Mar 24, 2019

View reviewed changes

drashna added keyboard keymap labels Mar 24, 2019

OlliGranlund added 4 commits March 24, 2019 12:49

pr issues fixes

c83a0df

Merge remote-tracking branch 'upstream'

f12692f

removed weirdly positioned files

5ed647d

code cleanup, added dz60 layout json data

1510f64

Added dz60 layout readme

46b5304

Renamed layout

f6e752e

removed vscode file

944688b

zvecr reviewed Mar 26, 2019

View reviewed changes

IsaacElenbaas mentioned this pull request Mar 31, 2019

New Planck 2x2U keymap #5519

Merged

13 tasks

Update keyboards/dz60/dz60.h

05b0a63

Co-Authored-By: OlliGranlund <[email protected]>

drashna requested review from noroadsleft, mechmerlin and yanfali April 4, 2019 21:53

drashna approved these changes Apr 4, 2019

View reviewed changes

mechmerlin approved these changes Apr 10, 2019

View reviewed changes

noroadsleft requested changes Apr 10, 2019

View reviewed changes

noroadsleft approved these changes Apr 11, 2019

View reviewed changes

Merge branch 'master' of https://github.com/qmk/qmk_firmware

3bede56

drashna merged commit b9f060c into qmk:master May 4, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DZ60 keymap and layout #5474

DZ60 keymap and layout #5474

OlliGranlund commented Mar 23, 2019 •

edited

Loading

drashna commented Mar 24, 2019

OlliGranlund commented Mar 24, 2019

mechmerlin commented Mar 24, 2019

OlliGranlund commented Mar 24, 2019

noroadsleft commented Mar 24, 2019

OlliGranlund commented Mar 24, 2019

drashna commented Mar 25, 2019

OlliGranlund commented Mar 25, 2019

zvecr Mar 26, 2019 •

edited

Loading

drashna Mar 27, 2019

noroadsleft Apr 4, 2019

noroadsleft Apr 10, 2019

OlliGranlund commented Mar 27, 2019

drashna commented Mar 27, 2019

OlliGranlund commented Apr 4, 2019

drashna commented Apr 4, 2019

OlliGranlund commented Apr 10, 2019

mechmerlin commented Apr 10, 2019

mechmerlin left a comment

noroadsleft commented Apr 10, 2019

noroadsleft Apr 10, 2019

noroadsleft commented Apr 11, 2019

OlliGranlund commented Apr 20, 2019

drashna commented May 4, 2019

DZ60 keymap and layout #5474

DZ60 keymap and layout #5474

Conversation

OlliGranlund commented Mar 23, 2019 • edited Loading

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

drashna commented Mar 24, 2019

OlliGranlund commented Mar 24, 2019

mechmerlin commented Mar 24, 2019

OlliGranlund commented Mar 24, 2019

noroadsleft commented Mar 24, 2019

OlliGranlund commented Mar 24, 2019

drashna commented Mar 25, 2019

OlliGranlund commented Mar 25, 2019

zvecr Mar 26, 2019 • edited Loading

Choose a reason for hiding this comment

drashna Mar 27, 2019

Choose a reason for hiding this comment

noroadsleft Apr 4, 2019

Choose a reason for hiding this comment

noroadsleft Apr 10, 2019

Choose a reason for hiding this comment

OlliGranlund commented Mar 27, 2019

drashna commented Mar 27, 2019

OlliGranlund commented Apr 4, 2019

drashna commented Apr 4, 2019

OlliGranlund commented Apr 10, 2019

mechmerlin commented Apr 10, 2019

mechmerlin left a comment

Choose a reason for hiding this comment

noroadsleft commented Apr 10, 2019

noroadsleft Apr 10, 2019

Choose a reason for hiding this comment

noroadsleft commented Apr 11, 2019

OlliGranlund commented Apr 20, 2019

drashna commented May 4, 2019

OlliGranlund commented Mar 23, 2019 •

edited

Loading

zvecr Mar 26, 2019 •

edited

Loading