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

DZ60 keymap and layout #5474

Merged
merged 20 commits into from
May 4, 2019
Merged

DZ60 keymap and layout #5474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5aa9a80
init
OlliGranlund Mar 9, 2018
99b0c33
function layout planning
OlliGranlund Mar 10, 2018
9b333cd
Merge remote-tracking branch 'upstream'
OlliGranlund Sep 23, 2018
94323cf
nordic keymap v1.0
OlliGranlund Sep 30, 2018
1727b3a
Added latest satan layouts, updated readmes
OlliGranlund Sep 30, 2018
00e9b3f
Cleaning code
OlliGranlund Sep 30, 2018
d5097c9
Renamed ISO -> iso
OlliGranlund Sep 30, 2018
e7746fe
Updated keymap to work better with Swedish layout
OlliGranlund Jan 11, 2019
5129f8a
merged upstream
OlliGranlund Mar 23, 2019
ac7063a
merge conflict
OlliGranlund Mar 23, 2019
cda44c1
Added dz60 layout
OlliGranlund Mar 23, 2019
c83a0df
pr issues fixes
OlliGranlund Mar 24, 2019
f12692f
Merge remote-tracking branch 'upstream'
OlliGranlund Mar 24, 2019
5ed647d
removed weirdly positioned files
OlliGranlund Mar 24, 2019
1510f64
code cleanup, added dz60 layout json data
OlliGranlund Mar 24, 2019
46b5304
Added dz60 layout readme
OlliGranlund Mar 24, 2019
f6e752e
Renamed layout
OlliGranlund Mar 24, 2019
944688b
removed vscode file
OlliGranlund Mar 25, 2019
05b0a63
Update keyboards/dz60/dz60.h
drashna Apr 4, 2019
3bede56
Merge branch 'master' of https://github.com/qmk/qmk_firmware
OlliGranlund Apr 20, 2019
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
merged upstream
  • Loading branch information
@OlliGranlund
OlliGranlund committed Mar 23, 2019
commit 5129f8a794aa8da342a3360d4392227563077ed1
0 ...iris/keymaps/olligranlund_nordic/config.h → ...rkbd/keymaps/olligranlund_nordic/config.h
View file
Open in desktop
File renamed without changes.
0 ...iris/keymaps/olligranlund_nordic/keymap.c → ...rkbd/keymaps/olligranlund_nordic/keymap.c
View file
Open in desktop
File renamed without changes.
0 ...ris/keymaps/olligranlund_nordic/readme.md → ...kbd/keymaps/olligranlund_nordic/readme.md
View file
Open in desktop
File renamed without changes.
0 ...iris/keymaps/olligranlund_nordic/rules.mk → ...rkbd/keymaps/olligranlund_nordic/rules.mk
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions keyboards/satan/keymaps/olligranlund_iso/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,13 @@
#define CALC KC_CALC // Open default calculator app
#define MYCM KC_MYCM // Open default file manager

<<<<<<< HEAD
// increase readability
#define _______ KC_TRNS
OlliGranlund marked this conversation as resolved.
Show resolved Hide resolved
#define XXXXX KC_NO
Copy link
Member

@zvecr zvecr Mar 26, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

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

Suggested change
#define XXXXX 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.

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

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

Copy link
Member

Choose a reason for hiding this comment

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

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

Copy link
Member

Choose a reason for hiding this comment

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

@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.


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

/* Keymap BASE: (Base Layer) Default Layer
Expand Down
4 changes: 4 additions & 0 deletions keyboards/satan/keymaps/olligranlund_iso/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,9 @@ MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
<<<<<<< HEAD
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
OlliGranlund marked this conversation as resolved.
Show resolved Hide resolved
=======
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
>>>>>>> upstream
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
You are viewing a condensed version of this merge commit. You can view the full changes here.