From 5f795d8382e67c68f46cdf6e079c635c3986f939 Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Mon, 6 Jan 2020 15:29:27 -0800 Subject: Add an 65_ansi community layout (#7793) * Add an 65_ansi community layout - fix quoting because of comma in config.h * Enable LAYOUT_65_ansi for tada68 * cleanups * Update keyboards/tada68/tada68.h Co-Authored-By: fauxpark Co-authored-by: fauxpark --- keyboards/nk65/config.h | 2 +- keyboards/tada68/rules.mk | 2 ++ keyboards/tada68/tada68.h | 2 ++ layouts/community/65_ansi/yanfali/keymap.c | 40 ++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100755 layouts/community/65_ansi/yanfali/keymap.c diff --git a/keyboards/nk65/config.h b/keyboards/nk65/config.h index 423714c54c..33a3f908a6 100755 --- a/keyboards/nk65/config.h +++ b/keyboards/nk65/config.h @@ -25,7 +25,7 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER Yiancar-Designs #define PRODUCT NK65 -#define DESCRIPTION A 65-percent, tool-free RGB keyboard +#define DESCRIPTION "A 65-percent, tool-free RGB keyboard" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/tada68/rules.mk b/keyboards/tada68/rules.mk index 38b05e0426..c92417cf02 100755 --- a/keyboards/tada68/rules.mk +++ b/keyboards/tada68/rules.mk @@ -26,3 +26,5 @@ MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID + +LAYOUTS = 65_ansi diff --git a/keyboards/tada68/tada68.h b/keyboards/tada68/tada68.h index 670b0e6c15..a71910cb3b 100755 --- a/keyboards/tada68/tada68.h +++ b/keyboards/tada68/tada68.h @@ -37,6 +37,8 @@ {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e} \ } +#define LAYOUT_ansi LAYOUT_65_ansi + /* TADA68 ISO layout * ,----------------------------------------------------------------. * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e | diff --git a/layouts/community/65_ansi/yanfali/keymap.c b/layouts/community/65_ansi/yanfali/keymap.c new file mode 100755 index 0000000000..a0887da2bf --- /dev/null +++ b/layouts/community/65_ansi/yanfali/keymap.c @@ -0,0 +1,40 @@ +#include QMK_KEYBOARD_H + +enum _layers { + BS, + FN +}; + +// shim wilba_tech +#ifndef EF_DEC + #define EF_DEC RGB_RMOD + #define EF_INC RGB_MOD + #define H1_DEC RGB_HUD + #define H1_INC RGB_HUI + #define H2_DEC RGB_HUD + #define H2_INC RGB_HUI + #define S1_DEC RGB_SAD + #define S1_INC RGB_SAI + #define S2_DEC RGB_SAD + #define S2_INC RGB_SAI + #define BR_DEC RGB_VAD + #define BR_INC RGB_VAI + #define ES_DEC KC_TRNS + #define ES_INC KC_TRNS +#endif + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[BS] = LAYOUT_65_ansi( /* Base */ + KC_GRV, 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_HOME,\ + KC_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_PGUP,\ + LCTL_T(KC_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_PGDN,\ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FN), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + +[FN] = LAYOUT_65_ansi( /* FN */ + 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_DEL, KC_TRNS,\ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,\ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ + KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_TRNS,\ + KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; -- cgit v1.2.1