summaryrefslogtreecommitdiffstats
path: root/keyboards/s65_x/keymaps/smt/keymap.c
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2019-01-05 06:47:13 +0100
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-01-05 06:47:13 +0100
commitd6cc90d0277cf084ab16215190ad64d24164f1bc (patch)
treea5b506e29909fb72a46b86d5513b9d1f711ef918 /keyboards/s65_x/keymaps/smt/keymap.c
parent3527efcbd21231cf9e7bf7a8de0fa02aa177a957 (diff)
downloadqmk_firmware-d6cc90d0277cf084ab16215190ad64d24164f1bc.tar.gz
qmk_firmware-d6cc90d0277cf084ab16215190ad64d24164f1bc.tar.xz
S65-X and S65-Plus updates and refactoring (#4780)
* S65-X: remove S65-Plus support The original QMK codebase for the Sentraq S65-X actually supported both the S65-X and the S65-Plus. In the interim, the S65-Plus has been broken off into its own directory. This commit removes support for the S65-Plus from the `keyboards/s65_x/` directory, as that code has been superseded by the code in the S65-Plus directory (`keyboards/s65_plus/`). - deleted S65-Plus layout macros from s65_x.h and info.json - deleted s65plus keymap directory - removed references to the unused column pins - removed the two unused columns for the switch matrices - renamed switch K300 in LAYOUT_ansi to K301 (reflects matrix position) - renamed switch K214 in LAYOUT_iso to K114 (reflects matrix position) * S65-X: keymap refactor - all keymaps now use #include QMK_KEYBOARD_H - default and iso keymaps refactored for readability - deleted redundant KC_TRNS and KC_NO keycode definitions from smt keymap * S65-X: readme update - updated Hardware Availability link - updated Docs links * S65-Plus: add LAYOUT_iso data Adds LAYOUT_iso macro to s65_plus.h and info.json, and an ISO layout version of the default keymap. * S65-Plus: refactor default keymap - refactor for alignment/readability - removed fn_actions code block - add empty process_record_user block * S65-Plus: readme update - Hardware Availability link is now a hyperlink - updated Docs links * S65-X: enable 65_ansi and 65_iso community layouts Thi commit allows the Sentraq S65-X to use the 65_ansi and 65_iso community layouts. - LAYOUT_ansi renamed to LAYOUT_65_ansi - LAYOUT_iso renamed to LAYOUT_65_iso - added LAYOUTS rule to rules.mk
Diffstat (limited to 'keyboards/s65_x/keymaps/smt/keymap.c')
-rw-r--r--keyboards/s65_x/keymaps/smt/keymap.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/keyboards/s65_x/keymaps/smt/keymap.c b/keyboards/s65_x/keymaps/smt/keymap.c
index ce21859ac..8c3984c21 100644
--- a/keyboards/s65_x/keymaps/smt/keymap.c
+++ b/keyboards/s65_x/keymaps/smt/keymap.c
@@ -1,4 +1,4 @@
-#include "s65_x.h"
+#include QMK_KEYBOARD_H
#define _QWERTY 0
#define _COLEMAK 1
@@ -12,10 +12,6 @@ enum planck_keycodes {
DVORAK
};
-// Helpful defines
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
// Custom macros
#define CTL_ESC CTL_T(KC_ESC) // Tap for Esc, hold for Ctrl
#define HPR_TAB ALL_T(KC_TAB) // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
@@ -37,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
/* 0: ANSI qwerty */
- [_QWERTY] = LAYOUT_ansi(
+ [_QWERTY] = LAYOUT_65_ansi(
KC_GESC, 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_GRV, \
HPR_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_BSLS, KC_DEL, \
CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, \
@@ -59,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
/* 1: ANSI colemak */
- [_COLEMAK] = LAYOUT_ansi(
+ [_COLEMAK] = LAYOUT_65_ansi(
KC_GESC, 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_GRV, \
HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, \
CTL_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_PGUP, \
@@ -81,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
/* 2: ANSI dvorak */
- [_DVORAK] = LAYOUT_ansi(
+ [_DVORAK] = LAYOUT_65_ansi(
KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_GRV, \
HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_DEL, \
CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, KC_PGUP, \
@@ -103,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
/* 3: ANSI Fn layer */
- [_FL] = LAYOUT_ansi(
+ [_FL] = LAYOUT_65_ansi(
KC_GRV, 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_F13, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, \
_______, _______, MO(_CL), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
@@ -125,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
/* 4: ANSI control layer */
- [_CL] = LAYOUT_ansi(
+ [_CL] = LAYOUT_65_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, \
_______, _______, _______, _______, RESET, _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, RGB_VAI, \
_______, _______, MO(_CL), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, \