summaryrefslogtreecommitdiff
path: root/keyboards/s60_x
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-01-26 15:49:45 -0800
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-01-26 15:49:45 -0800
commitb05c0e46c6c62972b68518635104fb58927d1a13 (patch)
tree4037e0ff8b7d52aee235e9a7e31083984b453777 /keyboards/s60_x
parent478538e0d9938952568c62d135166d2cba15a70c (diff)
downloadqmk_firmware-b05c0e46c6c62972b68518635104fb58927d1a13.tar.gz
qmk_firmware-b05c0e46c6c62972b68518635104fb58927d1a13.zip
Adds a default value for IS_COMMAND for COMMAND feature (#4301)
* Add default value for IS_COMMAND for COMMAND feature * Cleanup and consistency * Update Templates to reflect change * Fix IS_COMMAND in template * Fix IS_COMMAND define * Use consistent IS_COMMAND block in templates * Remove unnecessary `#undef IS_COMMAND` directives * Fix compile issue on orthodox * Reomve IS_COMMAND option for newer boards * Remove all existing definitions of IS_COMMAND if they use default LSHIFT and RSHIFT setting * Remove a couple of additional IS_COMMAND defines * Remove remaining redundant IS_COMMAND definitions * Remove #undef IS_COMMAND from orthodox:drashna and whitefox:konstantin * Remove multiple empty lines in modified config.h files * Update additional boards * Reomve IS_COMMAND from newer boards * Update Alice keyboard * Remove IS_COMMAND from additional boards Jan 24th edition
Diffstat (limited to 'keyboards/s60_x')
-rw-r--r--keyboards/s60_x/config.h5
-rw-r--r--keyboards/s60_x/default/config.h5
-rw-r--r--keyboards/s60_x/keymaps/ansi_qwertz/config.h7
-rw-r--r--keyboards/s60_x/keymaps/bluebear/config.h5
4 files changed, 1 insertions, 21 deletions
diff --git a/keyboards/s60_x/config.h b/keyboards/s60_x/config.h
index 8b97b3c814..bb2602dcab 100644
--- a/keyboards/s60_x/config.h
+++ b/keyboards/s60_x/config.h
@@ -44,11 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCING_DELAY 5
-/* key combination for command */
-#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
#ifdef SUBPROJECT_default
#include "default/config.h"
#endif
diff --git a/keyboards/s60_x/default/config.h b/keyboards/s60_x/default/config.h
index 25fc4ad2e0..f6b7f8d683 100644
--- a/keyboards/s60_x/default/config.h
+++ b/keyboards/s60_x/default/config.h
@@ -13,11 +13,6 @@
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
-/* key combination for magic key command */
-#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
#define NO_ACTION_ONESHOT
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/config.h b/keyboards/s60_x/keymaps/ansi_qwertz/config.h
index 6c01d579f8..aee65690f3 100644
--- a/keyboards/s60_x/keymaps/ansi_qwertz/config.h
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/config.h
@@ -6,9 +6,4 @@
// keymap needs oneshot functionality
#undef NO_ACTION_ONESHOT
-#undef IS_COMMAND
-#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/s60_x/keymaps/bluebear/config.h b/keyboards/s60_x/keymaps/bluebear/config.h
index 10bddf0d37..c1db5f64a6 100644
--- a/keyboards/s60_x/keymaps/bluebear/config.h
+++ b/keyboards/s60_x/keymaps/bluebear/config.h
@@ -38,11 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* key combination for command */
-#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
/* Backlight configuration
*/
#define BACKLIGHT_LEVELS 3