Adding my DZ60, Satan, XD75 kemaps and updates to userspace by JarredSteenvoorden · Pull Request #4039 · qmk/qmk_firmware

JarredSteenvoorden · 2018-10-02T00:13:45Z

Adding keymaps for DZ60, Satan and XD75 (mine and a friends).

Also small update to userspace.

Cheers!

drashna · 2018-10-02T03:38:24Z

keyboards/dz60/keymaps/jarred/config.h

@@ -0,0 +1,8 @@
+#ifndef CONFIG_USER_H


If you could replace the include guard (the ifndef, define, and endif at the end) with just #pragma once?

It's simpler, and less prone to user error, so if you could make this switch?

@drashna Actually, I think this file can be deleted.

Line 4 isn't needed; it's included automatically by the build script.

Line 6 isn't needed. It's default behavior.

With your changes, that leaves only #pragma once in this file.

drashna · 2018-10-02T03:38:29Z

keyboards/dz60/keymaps/jarred/config.h

+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"


This line is not actually needed, and should be removed.

Specifically, the build script automatically includes all of the config.h files, so this is not necessary.

drashna · 2018-10-02T03:38:54Z

keyboards/dz60/keymaps/jarred/config.h

+
+#include "../../config.h"
+
+#define PREVENT_STUCK_MODIFIERS


This is actually the new default now. This isn't needed. But you may need to update your fork to get the changes.

drashna · 2018-10-02T03:39:20Z

keyboards/planck/keymaps/jarred/config.h


 #include "config_common.h"

+<<<<<<< HEAD


You have merge conflicts here, you need to fix this.

drashna · 2018-10-02T03:39:34Z

keyboards/satan/keymaps/jarred/config.h

@@ -0,0 +1,8 @@
+#ifndef CONFIG_USER_H


If you could replace the include guard (the ifndef, define, and endif at the end) with just #pragma once?

It's simpler, and less prone to user error, so if you could make this switch?

This file I believe can be deleted as well, for the same reasons as the config.h file for the DZ60 keymap.

drashna · 2018-10-02T03:40:51Z

keyboards/xd75/keymaps/jarred/config.h

+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"


This line is not actually needed, and should be removed.

Specifically, the build script automatically includes all of the config.h files, so this is not necessary.

drashna · 2018-10-02T03:41:01Z

keyboards/xd75/keymaps/jarred/config.h

+
+#include "../../config.h"
+
+#define PREVENT_STUCK_MODIFIERS


This line is not actually needed, and should be removed.

Specifically, the build script automatically includes all of the config.h files, so this is not necessary.

drashna · 2018-10-02T03:41:08Z

users/jarred/config.h

+#ifndef USERSPACE_CONFIG_H
+#define USERSPACE_CONFIG_H
+
+#define PREVENT_STUCK_MODIFIERS


This line is not actually needed, and should be removed.

Specifically, the build script automatically includes all of the config.h files, so this is not necessary.

drashna · 2018-10-02T03:41:46Z

users/jarred/config.h

+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef USERSPACE_CONFIG_H


If you could replace the include guard (the ifndef, define, and endif at the end) with just #pragma once?

It's simpler, and less prone to user error, so if you could make this switch?

drashna · 2018-10-02T03:41:50Z

keyboards/xd75/keymaps/jarred/rules.mk

@@ -0,0 +1,3 @@
+ifndef QUANTUM_DIR


Could you remove this (ifndef/include/endif) block?

It's not needed, and is a holdover from the old build system.

File can be deleted, nothing going on here.

noroadsleft · 2018-10-02T00:47:35Z

keyboards/dz60/keymaps/jarred/keymap.c

@@ -0,0 +1,24 @@
+#include QMK_KEYBOARD_H
+
+#define _______ KC_TRNS


Lines 3 and 4 can be safely deleted. QMK includes these definitions automatically with every keymap.

qmk_firmware/quantum/quantum_keycodes.h

Lines 29 to 31 in 4318797

// Fillers to make layering more clear

#define _______ KC_TRNS

#define XXXXXXX KC_NO

noroadsleft · 2018-10-02T00:50:18Z

keyboards/planck/keymaps/jarred/rules.mk

@@ -1,4 +1 @@
 # Build options


This file can be deleted; nothing's actually happening here.

noroadsleft · 2018-10-02T00:52:09Z

keyboards/satan/keymaps/jarred/keymap.c

@@ -0,0 +1,25 @@
+#include QMK_KEYBOARD_H
+
+#define _______ KC_TRNS


Lines 3 and 4 can be safely deleted. QMK includes these definitions automatically with every keymap.

qmk_firmware/quantum/quantum_keycodes.h

Lines 29 to 31 in 4318797

// Fillers to make layering more clear

#define _______ KC_TRNS

#define XXXXXXX KC_NO

noroadsleft · 2018-10-02T00:56:51Z

keyboards/satan/keymaps/jarred/rules.mk

+#   change to "no" to disable the options, or define them in the Makefile in 
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)


You can actually compress Lines 5-17 down to:

MOUSEKEY_ENABLE = yes # Mouse keys(+4700) CONSOLE_ENABLE = no # Console for debug(+400) RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend

The settings only need to be included here if you're changing them from what is set by the keyboard's rules.mk file (keyboards/satan/rules.mk, in this case).

noroadsleft · 2018-10-02T00:58:21Z

keyboards/xd75/keymaps/daniel/keymap.c

+#define _NV 1
+#define _NM 2
+
+#define _______ KC_TRNS


Lines 7 and 8 can be safely deleted. QMK includes these definitions automatically with every keymap.

qmk_firmware/quantum/quantum_keycodes.h

Lines 29 to 31 in 4318797

// Fillers to make layering more clear

#define _______ KC_TRNS

#define XXXXXXX KC_NO

noroadsleft · 2018-10-02T04:25:43Z

keyboards/xd75/keymaps/daniel/config.h

@@ -0,0 +1,8 @@
+#ifndef CONFIG_USER_H


This file I think can be deleted, as with the other keymap config.h files, for the same reasons as before.

noroadsleft · 2018-10-02T04:27:31Z

keyboards/xd75/keymaps/daniel/rules.mk

@@ -0,0 +1,3 @@
+ifndef QUANTUM_DIR


This file should be deleted. The code block is unnecessary as @drashna said, and there's nothing else here.

noroadsleft · 2018-10-02T04:28:32Z

keyboards/xd75/keymaps/jarred/config.h

@@ -0,0 +1,8 @@
+#ifndef CONFIG_USER_H


@noroadsleft says "Delete this file, blah blah blah, I've heard it a hundred times already."

😀

noroadsleft · 2018-10-02T04:29:31Z

keyboards/xd75/keymaps/jarred/keymap.c

+#define _NV 2
+#define _NM 3
+
+#define _______ KC_TRNS


Lines 8 and 9 can be safely deleted. QMK includes these definitions automatically with every keymap.

qmk_firmware/quantum/quantum_keycodes.h

Lines 29 to 31 in 4318797

// Fillers to make layering more clear

#define _______ KC_TRNS

#define XXXXXXX KC_NO

noroadsleft · 2018-10-02T04:29:50Z

keyboards/xd75/keymaps/jarred/rules.mk

@@ -0,0 +1,3 @@
+ifndef QUANTUM_DIR


File can be deleted, nothing going on here.

JarredSteenvoorden · 2018-10-02T04:53:15Z

Wow there was alot of redundant code in these older keymaps, should be cleaned up now :)

noroadsleft · 2018-10-02T05:03:29Z

users/jarred/jarred.h

+  VRSN = SAFE_RANGE               // Prints QMK Firmware and board info
+};
+
 // Use 7 wide characters for keymaps


Missed this before.

Lines 26-28 shouldn't be needed.

But everything else to me looks good.

noroadsleft · 2018-10-02T07:23:59Z

Travis CI error is unrelated.

drashna · 2018-10-02T15:14:26Z

Thanks!

…mk#4039) * Update userspace with common config.h * Add my dz60, satan and xd75 keyboard keymaps * Fixing executable bits changed during last upstream merge * Cleanup unnecessary files and defines * Remove unnecessary defines from userspace config

JarredSteenvoorden and others added 5 commits September 2, 2018 10:57

Update userspace with common config.h

b683809

Merge remote-tracking branch 'upstream/master'

14507e3

Merge remote-tracking branch 'upstream/master'

6220cf8

Add my dz60, satan and xd75 keyboard keymaps

c5a0e41

Fixing executable bits changed during last upstream merge

7461135

drashna requested changes Oct 2, 2018

View reviewed changes

drashna added the keymap label Oct 2, 2018

noroadsleft requested changes Oct 2, 2018

View reviewed changes

Cleanup unnecessary files and defines

fc0a65c

noroadsleft requested changes Oct 2, 2018

View reviewed changes

Remove unnecessary defines from userspace config

1be076b

noroadsleft approved these changes Oct 2, 2018

View reviewed changes

drashna approved these changes Oct 2, 2018

View reviewed changes

drashna merged commit 5c2ac73 into qmk:master Oct 2, 2018

		@@ -0,0 +1,24 @@
		#include QMK_KEYBOARD_H

		#define _______ KC_TRNS

	// Fillers to make layering more clear
	#define _______ KC_TRNS
	#define XXXXXXX KC_NO

		@@ -0,0 +1,25 @@
		#include QMK_KEYBOARD_H

		#define _______ KC_TRNS

Uh oh!

Conversation

JarredSteenvoorden commented Oct 2, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JarredSteenvoorden commented Oct 2, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

noroadsleft commented Oct 2, 2018

Uh oh!

drashna commented Oct 2, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants