From: Felix Uhl <felix.uhl@outlook.de>
Date: Sat, 13 Aug 2016 22:41:09 +0000 (+0200)
Subject: Added all original S60-X keymaps
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=911cc6832598ac9b637fdb11448354d418c197c4;p=qmk_firmware.git
Added all original S60-X keymaps
All keymaps that were included in VinnyCordeiro's repository were ported to QMK.
Main Readme was copied over from VC's repo, slightly altered.
Main Makefile was updated to reflect VC's original configuration.
Small changes in felix keymap.
---
diff --git a/keyboards/s60-x/Makefile b/keyboards/s60-x/Makefile
index 57edd5e03..8b51d4609 100644
--- a/keyboards/s60-x/Makefile
+++ b/keyboards/s60-x/Makefile
@@ -53,7 +53,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
CONSOLE_ENABLE ?= yes # Console for debug(+400)
diff --git a/keyboards/s60-x/keymaps/custom/keymap.c b/keyboards/s60-x/keymaps/custom/keymap.c
new file mode 100644
index 000000000..59361241f
--- /dev/null
+++ b/keyboards/s60-x/keymaps/custom/keymap.c
@@ -0,0 +1,28 @@
+#include "keymap_common.h"
+
+/* Main layer: Test layout, using all keys.
+
+ 0 1 2 3 4 5 6 7 8 9 A B C D E
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ 0 âGRAVEâ 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âPGUP âBKSPCâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ 1 â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ 2 âCAPSLâ A â S â D â F â G â H â J â K â L â ; â ' âPGDN âENTERâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ 3 âLSHFTâHOME â Z â X â C â V â B â N â M â , â . â / â END âRSHFTâ UP â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ 4 âLCTRLâL_GUIâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâR_GUIâ APP âRCTRLâââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+*/
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* 0: ANSI qwerty */
+ KEYMAP(GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, PGUP, BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, \
+ CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, PGDN, ENT , \
+ LSFT, HOME, Z, X, C, V, B, N, M, COMM, DOT, SLSH, END, RSFT, UP, \
+ LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, RCTL),
+};
+const uint16_t PROGMEM fn_actions[] = {};
+
diff --git a/keyboards/s60-x/keymaps/custom/readme.md b/keyboards/s60-x/keymaps/custom/readme.md
new file mode 100644
index 000000000..cf87bd915
--- /dev/null
+++ b/keyboards/s60-x/keymaps/custom/readme.md
@@ -0,0 +1,15 @@
+### 8 Custom
+The custom keymap - [keymap_custom.c](keymap_custom.c) - is where I tested all the switches, not being concerned with a specific layout or layers. It's a plain layout option with the extra keys used on ISO & HHKB layouts being assigned some other keys.
+
+#### 8.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ` â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âPgUp âBkSpcâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â A â S â D â F â G â H â J â K â L â ; â ' âPgDwnâEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâHome â Z â X â C â V â B â N â M â , â . â / â End âShiftâ Up â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â Gui â Alt âââââââââââââââââââSpaceâââââââââââââââââââ Alt â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
diff --git a/keyboards/s60-x/keymaps/default/Makefile b/keyboards/s60-x/keymaps/default/Makefile
deleted file mode 100644
index f4671a9d1..000000000
--- a/keyboards/s60-x/keymaps/default/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Build Options
-# 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)
-MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
-CONSOLE_ENABLE = no # Console for debug(+400)
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-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
-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
-
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
\ No newline at end of file
diff --git a/keyboards/s60-x/keymaps/default/keymap.c b/keyboards/s60-x/keymaps/default/keymap.c
index 3b680c307..be7a71aff 100644
--- a/keyboards/s60-x/keymaps/default/keymap.c
+++ b/keyboards/s60-x/keymaps/default/keymap.c
@@ -1,92 +1,48 @@
-/*
-Copyright 2016 Julien Pecqueur <julien@peclu.net>
-Copyright 2016 Felix Uhl <ifreilicht@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "keymap_common.h"
+
+/* 0: Main layer
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â ESC â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCAPSLâ A â S â D â F â G â H â J â K â L â ; â ' âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ Z â X â C â V â B â N â M â , â . â / âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_GUIâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâ FN0 â APP âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
*/
-#include "s60-x.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Layout 0: Default Layer
- * ,-----------------------------------------------------------.
- * |` | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp |
- * |-----------------------------------------------------------|
- * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|
- * |-----------------------------------------------------------|
- * |Ctrl | A| S| D| F| G| H| J| K| L| ;| '|Return |
- * |-----------------------------------------------------------|
- * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |
- * |-----------------------------------------------------------|
- * |Fn1 |Gui |Alt | SpaceFn |Alt |Gui |App |Ctrl|
- * `-----------------------------------------------------------'
- */
- KEYMAP(
- GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, BSPC, BSPC, \
- TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, \
- LCTL, A, S, D, F, G, H, J, K, L, SCLN, QUOT, NUHS, ENT, \
- LSFT, NUBS, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, NO, \
- FN1, LGUI, LALT, FN0, RALT, RGUI, APP, RCTL),
-
- /* Layout 1: Function Layer
- * ,-----------------------------------------------------------.
- * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
- * |-----------------------------------------------------------|
- * | |Prv|Ply|Nxt|Stp| | |PUp|Up |PDn| |Slk|Pau|Ins |
- * |-----------------------------------------------------------|
- * | |Vl-|Mut|Vl+| | |Hom|Lef|Dow|Rig|End| |PEnt |
- * |-----------------------------------------------------------|
- * | |Prt|Cut|Cop|Pst|Cal| | | | | |CapsLock |
- * |-----------------------------------------------------------|
- * | | | | | | | | |
- * `-----------------------------------------------------------'
- */
- KEYMAP(
- ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, DEL, \
- TRNS, MPRV, MPLY, MNXT, MSTP, TRNS, TRNS, PGUP, UP, PGDN, TRNS, SLCK, PAUS, INS, \
- TRNS, VOLD, MUTE, VOLU, TRNS, TRNS, HOME, LEFT, DOWN, RGHT, END, TRNS, TRNS, PENT, \
- TRNS, TRNS, PSCR, FN2, FN3, FN4, CALC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CAPS, TRNS, \
- TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
-};
-
-/*
-* Fn action definition
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* 0: ANSI qwerty */
+ KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, \
+ CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, NO, ENT , \
+ LSFT, NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, RALT, FN0, APP, RCTL),
+
+/* 1: Fn layer
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGRAVEâ F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â Up â â â â â âPGUP âPGDWNâPRTSCâSCLCKâPAUSEâ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âLeft âDown âRightâ â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
*/
-const uint16_t PROGMEM fn_actions[] = {
- [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE), /* SpaceFn layout 1 */
- [1] = ACTION_LAYER_MOMENTARY(1), /* Momentary layout 1 */
- [2] = ACTION_MODS_KEY(MOD_LSFT, KC_DEL), /* Cut */
- [3] = ACTION_MODS_KEY(MOD_LCTL, KC_INS), /* Copy */
- [4] = ACTION_MODS_KEY(MOD_LSFT, KC_INS), /* Paste */
+ KEYMAP(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, TRNS, \
+ TRNS, TRNS, UP, TRNS, TRNS, TRNS, TRNS, TRNS, PGUP, PGDN, PSCR, SLCK, PAUS, TRNS, \
+ TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
};
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- return MACRO_NONE;
+const uint16_t PROGMEM fn_actions[] = {
+ [0] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay
};
-
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
\ No newline at end of file
diff --git a/keyboards/s60-x/keymaps/default/readme.md b/keyboards/s60-x/keymaps/default/readme.md
index 73318dad7..01cda9df9 100644
--- a/keyboards/s60-x/keymaps/default/readme.md
+++ b/keyboards/s60-x/keymaps/default/readme.md
@@ -1 +1,27 @@
-# The default keymap for s60-x
\ No newline at end of file
+### 1 Standard - ANSI
+The standard keymap is the one that is pre-flashed on the S60-X.
+
+#### 1.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ESC â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCAPSLâ A â S â D â F â G â H â J â K â L â ; â ' âââââââENTERâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âLSHFTâââââââ Z â X â C â V â B â N â M â , â . â / âââââââRSHFTâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âLCTRLâL_GUIâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâ FN0 â APP âRCTRLâââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 1.1 Fn layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ âGRAVEâ F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â Up â â â â â âPGUP âPGDWNâPRTSCâSCLCKâPAUSEâ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âLeft âDown âRightâ â â â â â â â âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âââââââ â â â â â â â â â âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â âââââââââââââââââââ âââââââââââââââââââ â â â âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
diff --git a/keyboards/s60-x/keymaps/felix/keymap.c b/keyboards/s60-x/keymaps/felix/keymap.c
index 7fc0e021c..9c620527b 100644
--- a/keyboards/s60-x/keymaps/felix/keymap.c
+++ b/keyboards/s60-x/keymaps/felix/keymap.c
@@ -16,26 +16,52 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "s60-x.h"
+//make keymap a little easier to read
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+
+enum layer_names {
+ DEFAULT,
+ GAMING,
+ FUNCTION
+};
+
+enum languages {
+ GERMAN
+};
+
+#define LANGUAGE GERMAN
+
+enum custom_keycodes {
+ KC_C_AM = SAFE_RANGE,
+ KC_C_EM,
+ KC_C_IM,
+ KC_C_OM,
+ KC_C_UM,
+ KC_C_SM,
+ KC_C_YM,
+ KC_C_WM
+};
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Layout 0: Default Layer
- * RSFT will be replaced once a better way to control magic is found.
* ,-----------------------------------------------------------.
* |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \|Del|
* |-----------------------------------------------------------|
- * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|BckSp|
+ * |Tab | Q| W| E| R| T| Z| U| I| O| P| [| ]|BckSp|
* |-----------------------------------------------------------|
* |Ctrl | A| S| D| F| G| H| J| K| L| ;| '|Return |
* |-----------------------------------------------------------|
- * |Shift | Z| X| C| V| B| N| M| ,| .| /| Up |RSft|
+ * |Shift | Y| X| C| V| B| N| M| ,| .| /| Up |RSft|
* |-----------------------------------------------------------|
- * |Fn2 |Gui |Alt | SpaceFn |Alt |Left|Down|Right|
+ * |Fn2 |Gui |Alt | SpaceFn |Alt |Left|Down|Right|
* `-----------------------------------------------------------'
*/
- KEYMAP(
+ [DEFAULT] = KEYMAP(
KC_ESC, 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_BSLS, KC_DEL, \
- 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_BSPC, \
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, \
- KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_UP, KC_RSFT, \
+ KC_LSFT, KC_NUBS, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_UP, KC_RSFT, \
KC_FN2, KC_LGUI, KC_LALT, KC_FN0, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
/* Layout 1: Gaming Layer, SpaceFn disabled
@@ -51,32 +77,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | NOP| | Space | | | | |
* `-----------------------------------------------------------'
*/
- KEYMAP(
- 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, 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, 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, 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, KC_TRNS, KC_FN1, \
- KC_TRNS, KC_NO, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+ [GAMING] = KEYMAP(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_FN1, \
+ _______, XXXXXXX, _______, KC_SPC, _______, _______, _______, _______),
/* Layout 2: Function Layer
* ,-----------------------------------------------------------.
- * |` | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |RES|
+ * |` | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|RES|
* |-----------------------------------------------------------|
- * | |Prv|Ply|Nxt|Stp| | |PUp|Up |PDn| |Slk|Pau|Ins |
+ * | | | | |Prv|Ply|Nxt| Ü | | Ö | |Prt|Slk|Pau |
* |-----------------------------------------------------------|
- * | |Vl-|Mut|Vl+| | |Hom|Lef|Dow|Rig|End| |PEnt |
+ * | | Ä | ß | |Vl-|Mut|Vl+| | | | | |PEnt |
* |-----------------------------------------------------------|
- * | |Prt| | | |Cal| | | | |Pau |PUp |Fn1 |
+ * | | | | | |Cal| | | | |Pau |PUp |Fn1 |
* |-----------------------------------------------------------|
* | | | | | |Home|PDn |End |
* `-----------------------------------------------------------'
*/
- KEYMAP(
- 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, DEBUG, RESET, \
- KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_TRNS, KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_TRNS, KC_SLCK, KC_PAUS, KC_INS, \
- KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_TRNS, KC_TRNS, KC_PENT, \
- KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_PGUP, KC_FN1, \
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END),
+ [FUNCTION] = KEYMAP(
+ 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_INS, RESET, \
+ _______, _______, KC_C_WM, KC_C_EM, KC_MPRV, KC_MPLY, KC_MNXT, KC_C_UM, KC_C_IM, KC_C_OM, _______, KC_PSCR, KC_SLCK, KC_PAUS, \
+ _______, KC_C_AM, KC_C_SM, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, KC_PENT, \
+ _______, KC_C_YM, _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_FN1, \
+ _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
};
/*
@@ -102,8 +128,61 @@ void matrix_scan_user(void) {
}
+bool process_german(uint16_t keycode, keyrecord_t *record) {
+ uint16_t send_code = 0;
+ switch (keycode) {
+ case KC_C_AM:
+ if (record->event.pressed) {
+ send_code = KC_Q;
+ }
+ break;
+
+ case KC_C_OM:
+ if (record->event.pressed) {
+ send_code = KC_P;
+ }
+ break;
+
+ case KC_C_UM:
+ if (record->event.pressed) {
+ send_code = KC_Y;
+ }
+ break;
+
+ case KC_C_SM:
+ if (record->event.pressed) {
+ send_code = KC_S;
+ }
+ break;
+ }
+
+ if (send_code == 0) {
+ return true;
+ }
+ else {
+ register_code(KC_RALT);
+ register_code(send_code);
+ unregister_code(send_code);
+ unregister_code(KC_RALT);
+ return false;
+ }
+}
+
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- return true;
+ if (keycode == KC_QUOT) {
+ if (record->event.pressed) {
+ register_code(KC_QUOT);
+ unregister_code(KC_QUOT);
+ register_code(KC_SPACE);
+ unregister_code(KC_SPACE);
+ }
+ return false;
+ }
+#if LANGUAGE == GERMAN
+ return process_german(keycode, record);
+#else
+ return true;
+#endif
}
void led_set_user(uint8_t usb_led) {
diff --git a/keyboards/s60-x/keymaps/felix/readme.md b/keyboards/s60-x/keymaps/felix/readme.md
index 73318dad7..7f083dfd0 100644
--- a/keyboards/s60-x/keymaps/felix/readme.md
+++ b/keyboards/s60-x/keymaps/felix/readme.md
@@ -1 +1,9 @@
-# The default keymap for s60-x
\ No newline at end of file
+# A non-US ANSI QWERTZ keymap
+
+This keymap was specifically designed to support ANSI keycaps while retaining the possibility of inputting characters with diacritics that are normally not used in the english language.
+
+It relies on the US-International keyboard layout, which can be installed in any current operating system without the use of third party hardware.
+
+Currently, it explicitly supports the following languages, though other languages are readily useable using the AltGr modifier.
+- German
+
diff --git a/keyboards/s60-x/keymaps/hasu/keymap.c b/keyboards/s60-x/keymaps/hasu/keymap.c
new file mode 100644
index 000000000..46ea81fea
--- /dev/null
+++ b/keyboards/s60-x/keymaps/hasu/keymap.c
@@ -0,0 +1,182 @@
+#include "keymap_common.h"
+
+/*
+ * Hasu
+ */
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Keymap 0: Default Layer
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â Esc â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCAPSLâ A â S â D â F â G â H â J â K â L â Fn2 â ' âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ Z â X â C â V â B â N â M â , â . â Fn1 âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_WINâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâ Fn3 â Fn3 â Fn0 âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, \
+ CAPS, A, S, D, F, G, H, J, K, L, FN2, QUOT, NO, ENT, \
+ LSFT, NO, Z, X, C, V, B, N, M, COMM, DOT, FN1, NO, FN9, NO, \
+ LCTL, LGUI, LALT, SPC, RALT, FN3, FN3, FN0),
+ /* Keymap 1: colemak
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGRAVEâ 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â W â F â P â G â J â L â U â Y â ; â [ â ] â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âBKSPCâ A â R â S â T â D â H â N â E â I â O â ' âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ Z â X â C â V â B â K â M â , â . â / âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_WINâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâR_WINâ APP â Fn0 âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, W, F, P, G, J, L, U, Y, SCLN, LBRC, RBRC, BSLS, \
+ BSPC, A, R, S, T, D, H, N, E, I, O, QUOT, NO, ENT, \
+ LSFT, NO, Z, X, C, V, B, K, M, COMM, DOT, SLSH, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, FN0),
+ /* Keymap 2: dvorak
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGRAVEâ 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â [ â ] âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â ' â , â . â P â Y â F â G â C â R â L â / â = â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCAPSLâ A â O â E â U â I â D â H â T â N â S â - âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ ; â Q â J â K â X â B â M â W â V â Z âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_WINâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâR_WINâ APP â FN0 âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC, RBRC, NO, BSPC, \
+ TAB, QUOT, COMM, DOT, P, Y, F, G, C, R, L, SLSH, EQL, BSLS, \
+ CAPS, A, O, E, U, I, D, H, T, N, S, MINS, NO, ENT, \
+ LSFT, NO, SCLN, Q, J, K, X, B, M, W, V, Z, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, FN0),
+ /* Keymap 3: workman
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGRAVEâ 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â D â E â W â B â J â F â U â P â ; â [ â ] â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âBKSPCâ A â S â H â T â G â Y â N â E â O â I â ' âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ Z â X â M â C â V â K â L â , â . â / âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_WINâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâR_WINâ APP â FN0 âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, D, R, W, B, J, F, U, P, SCLN, LBRC, RBRC, BSLS, \
+ BSPC, A, S, H, T, G, Y, N, E, O, I, QUOT, NO, ENT, \
+ LSFT, NO, Z, X, M, C, V, K, L, COMM, DOT, SLSH, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, FN0),
+ /* Overlay 4: HHKB mode
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGraveâ F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ Del â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCaps â â â â â â â â Psc â Slk âPauseâ Up â â Ins âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâ VoD â VoU âMute â â âNP_* âNP_/ âHome âPgUp âLeft âRightâââââââEnterâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ â â â â âNP_+ âNP_- â End âPgDwnâDown âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_GUIâL_ALTâââââââââââââââââââSpaceâââââââââââââââââââR_ALTâR_GUIâ App â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, DEL, \
+ CAPS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PSCR, SLCK, PAUS, UP, TRNS, INS, \
+ LCTL, VOLD, VOLU, MUTE, TRNS, TRNS, PAST, PSLS, HOME, PGUP, LEFT, RGHT, TRNS, ENT, \
+ LSFT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PPLS, PMNS, END, PGDN, DOWN, TRNS, RSFT, TRNS, \
+ LCTL, LGUI, LALT, SPC, RALT, RGUI, FN4, TRNS),
+ /* Overlay 5: Vi mode (Slash)
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGraveâ F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââBkSpcâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â Tab âHome âPgDwnâ Up âPgUp â End âHome âPgDwnâPgUp â End â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâ âLeft âDown âRightâ âLeft âDown â Up âRightâ â âââââââEnterâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ â â â â âHome âPgDwnâPgUp â End â âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_GUIâL_ALTâââââââââââââââââââSpaceâââââââââââââââââââR_ALTâR_GUIâ APP âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, BSPC, \
+ TAB, HOME, PGDN, UP, PGUP, END, HOME, PGDN, PGUP, END, TRNS, TRNS, TRNS, TRNS, \
+ LCTL, TRNS, LEFT, DOWN, RGHT, TRNS, LEFT, DOWN, UP, RGHT, TRNS, TRNS, TRNS, ENT, \
+ LSFT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, HOME, PGDN, PGUP, END, TRNS, TRNS, RSFT, TRNS, \
+ LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, RCTL),
+ /* Overlay 6: Mouse mode (Semicolon/App)
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGraveâ F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââBkSpcâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â Tab â â â â â â MwL â MwD â MwU â MwR â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâ â Ac0 â Ac1 â Ac2 â â McL â McD â McU â McR â â âââââââEnterâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSFHTâââââââ â â â â Mb3 â Mb2 â Mb1 â Mb4 â Mb5 â âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_GUIâL_ALTâââââââââââââââââââ Mb1 âââââââââââââââââââ â â âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
+ */
+ KEYMAP(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, BSPC, \
+ TAB, TRNS, TRNS, TRNS, TRNS, TRNS, WH_L, WH_D, WH_U, WH_R, TRNS, TRNS, TRNS, TRNS, \
+ LCTL, TRNS, ACL0, ACL1, ACL2, TRNS, MS_L, MS_D, MS_U, MS_R, TRNS, TRNS, TRNS, ENT, \
+ LSFT, TRNS, TRNS, TRNS, TRNS, TRNS, BTN3, BTN2, BTN1, BTN4, BTN5, TRNS, TRNS, RSFT, TRNS, \
+ LCTL, LGUI, LALT, BTN1, TRNS, TRNS, TRNS, RCTL),
+ /* Overlay 7: Layout selector
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â Lq â Lc â Ld â Lw â â â â â â â â â âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â Lq â Lw â â â â â â â â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â Ld â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â Lc â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+
+Lq: set Qwerty layout
+Lc: set Colemak layout
+Ld: set Dvorak layout
+Lw: set Workman layout
+
+ */
+ KEYMAP(
+ FN5, FN6, FN7, FN8, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, FN5, FN8, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, FN7, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, FN6, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
+};
+
+/*
+ * Fn action definition
+ */
+const uint16_t PROGMEM fn_actions[] = {
+ [0] = ACTION_LAYER_MOMENTARY(4),
+ [1] = ACTION_LAYER_TAP_KEY(5, KC_SLASH),
+ [2] = ACTION_LAYER_TAP_KEY(6, KC_SCLN),
+ [3] = ACTION_LAYER_MOMENTARY(6),
+ [4] = ACTION_LAYER_MOMENTARY(7), // to Layout selector
+ [5] = ACTION_DEFAULT_LAYER_SET(0), // set qwerty layout
+ [6] = ACTION_DEFAULT_LAYER_SET(1), // set colemak layout
+ [7] = ACTION_DEFAULT_LAYER_SET(2), // set dvorak layout
+ [8] = ACTION_DEFAULT_LAYER_SET(3), // set workman layout
+ [9] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_GRV),
+};
diff --git a/keyboards/s60-x/keymaps/hasu/readme.md b/keyboards/s60-x/keymaps/hasu/readme.md
new file mode 100644
index 000000000..64969b616
--- /dev/null
+++ b/keyboards/s60-x/keymaps/hasu/readme.md
@@ -0,0 +1,4 @@
+### 5. Hasu
+This is Hasu's favorite keymap with HHKB Fn, Vi cursor and Mousekey layer. See [keymap_hasu.c](keymap_hasu.c) for detail.
+
+(Hasu is the initial creator of the TMK firmware, in case you weren't aware.)
\ No newline at end of file
diff --git a/keyboards/s60-x/keymaps/hhkb/keymap.c b/keyboards/s60-x/keymaps/hhkb/keymap.c
new file mode 100644
index 000000000..a6e5b3279
--- /dev/null
+++ b/keyboards/s60-x/keymaps/hhkb/keymap.c
@@ -0,0 +1,52 @@
+#include "keymap_common.h"
+
+/*
+ * HHKB Layout
+ */
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* 0: Default layer
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â Esc â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = â \ â ` â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] âBkSpcâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCtrl â A â S â D â F â G â H â J â K â L â Fn3 â ' âââââââEnterâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âShiftâââââââ Z â X â C â V â B â N â M â , â . â / âââââââShiftâ Fn â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âââââââ Gui â Alt âââââââââââââââââââSpaceâââââââââââââââââââââââââ Alt â Gui âââââââââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, BSLS, GRV, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSPC, \
+ LCTL, A, S, D, F, G, H, J, K, L, SCLN, QUOT, NO, ENT, \
+ LSFT, NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, FN0, \
+ NO, LGUI, LALT, SPC, NO, RALT, RGUI, NO),
+ /* 1: HHKB Fn layer
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â Pwr â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 â Ins â Del â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCaps â â â â â â â â Psc â Slk â Pus â Up â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â VoD â VoU â Mut â Ejc â âNP_* âNP_/ âHome âPgUp âLeft âRightâââââââNPEntâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â â â âNP_+ âNP_- â End âPgDwnâDown âââââââ â â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âââââââ â âââââââââââââââââââ âââââââââââââââââââââââââ â âââââââââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
+ CAPS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PSCR, SLCK, PAUS, UP, TRNS, TRNS, \
+ TRNS, VOLD, VOLU, MUTE, EJCT, TRNS, PAST, PSLS, HOME, PGUP, LEFT, RGHT, NO, PENT, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PPLS, PMNS, END, PGDN, DOWN, NO, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
+};
+
+/*
+ * Fn action definition
+ */
+const uint16_t PROGMEM fn_actions[] = {
+ [0] = ACTION_LAYER_MOMENTARY(1),
+};
diff --git a/keyboards/s60-x/keymaps/hhkb/readme.md b/keyboards/s60-x/keymaps/hhkb/readme.md
new file mode 100644
index 000000000..2bceb26dd
--- /dev/null
+++ b/keyboards/s60-x/keymaps/hhkb/readme.md
@@ -0,0 +1,26 @@
+### 7. HHKB
+[keymap_hhkb.c](keymap_hhkb.c) emulates original HHKB layers.
+#### 7.0: Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Esc â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = â \ â ` â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] âBkSpcâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â A â S â D â F â G â H â J â K â L â Fn3 â ' âââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâââââââ Z â X â C â V â B â N â M â , â . â / âââââââShiftâ Fn â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âââââââ Gui â Alt âââââââââââââââââââSpaceâââââââââââââââââââââââââ Alt â Gui âââââââââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 7.1: HHKB Fn layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Pwr â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 â Ins â Del â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â â â â â â â â Psc â Slk â Pus â Up â â âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â VoD â VoU â Mut â Ejc â â * â / âHome âPgUp âLeft âRightâââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âââââââ â â â â â + â - â End âPgDwnâDown âââââââ â â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âââââââ â âââââââââââââââââââ âââââââââââââââââââââââââ â âââââââââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
diff --git a/keyboards/s60-x/keymaps/iso/keymap.c b/keyboards/s60-x/keymaps/iso/keymap.c
new file mode 100644
index 000000000..ad597cd7d
--- /dev/null
+++ b/keyboards/s60-x/keymaps/iso/keymap.c
@@ -0,0 +1,48 @@
+#include "keymap_common.h"
+
+/* 0: Main layer
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â ESC â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] âââââââââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCAPSLâ A â S â D â F â G â H â J â K â L â ; â ' âNUHS âENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâ \ â Z â X â C â V â B â N â M â , â . â / âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_GUIâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâ FN0 â APP âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+*/
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* 0: ANSI qwerty */
+ KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, NO, \
+ CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, NUHS, ENT , \
+ LSFT, BSLS, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, RALT, FN0, APP, RCTL),
+
+/* 1: Fn layer
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGRAVEâ F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â Up â â â â â âPGUP âPGDWNâPRTSCâSCLCKâPAUSEâââââââââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âLeft âDown âRightâ â â â â â â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+*/
+ KEYMAP(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, TRNS, \
+ TRNS, TRNS, UP, TRNS, TRNS, TRNS, TRNS, TRNS, PGUP, PGDN, PSCR, SLCK, PAUS, TRNS, \
+ TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+ [0] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay
+};
diff --git a/keyboards/s60-x/keymaps/iso/readme.md b/keyboards/s60-x/keymaps/iso/readme.md
new file mode 100644
index 000000000..2c06bf86f
--- /dev/null
+++ b/keyboards/s60-x/keymaps/iso/readme.md
@@ -0,0 +1,28 @@
+### 2 Standard - ISO
+The same as the standard keymap, but with additional ISO keys.
+
+
+#### 2.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ESC â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] âââââââââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCAPSLâ A â S â D â F â G â H â J â K â L â ; â ' âNUHS âENTERâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âLSHFTâ \ â Z â X â C â V â B â N â M â , â . â / âââââââRSHFTâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âLCTRLâL_GUIâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâ FN0 â APP âRCTRLâââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 2.1 Fn layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ âGRAVEâ F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â Up â â â â â âPGUP âPGDWNâPRTSCâSCLCKâPAUSEâââââââââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âLeft âDown âRightâ â â â â â â â â â âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â â â â â â â â â â âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â âââââââââââââââââââ âââââââââââââââââââ â â â âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
diff --git a/keyboards/s60-x/keymaps/jpec/keymap.c b/keyboards/s60-x/keymaps/jpec/keymap.c
new file mode 100644
index 000000000..3b680c307
--- /dev/null
+++ b/keyboards/s60-x/keymaps/jpec/keymap.c
@@ -0,0 +1,92 @@
+/*
+Copyright 2016 Julien Pecqueur <julien@peclu.net>
+Copyright 2016 Felix Uhl <ifreilicht@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "s60-x.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Layout 0: Default Layer
+ * ,-----------------------------------------------------------.
+ * |` | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp |
+ * |-----------------------------------------------------------|
+ * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|
+ * |-----------------------------------------------------------|
+ * |Ctrl | A| S| D| F| G| H| J| K| L| ;| '|Return |
+ * |-----------------------------------------------------------|
+ * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |
+ * |-----------------------------------------------------------|
+ * |Fn1 |Gui |Alt | SpaceFn |Alt |Gui |App |Ctrl|
+ * `-----------------------------------------------------------'
+ */
+ KEYMAP(
+ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, BSPC, BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, \
+ LCTL, A, S, D, F, G, H, J, K, L, SCLN, QUOT, NUHS, ENT, \
+ LSFT, NUBS, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, NO, \
+ FN1, LGUI, LALT, FN0, RALT, RGUI, APP, RCTL),
+
+ /* Layout 1: Function Layer
+ * ,-----------------------------------------------------------.
+ * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
+ * |-----------------------------------------------------------|
+ * | |Prv|Ply|Nxt|Stp| | |PUp|Up |PDn| |Slk|Pau|Ins |
+ * |-----------------------------------------------------------|
+ * | |Vl-|Mut|Vl+| | |Hom|Lef|Dow|Rig|End| |PEnt |
+ * |-----------------------------------------------------------|
+ * | |Prt|Cut|Cop|Pst|Cal| | | | | |CapsLock |
+ * |-----------------------------------------------------------|
+ * | | | | | | | | |
+ * `-----------------------------------------------------------'
+ */
+ KEYMAP(
+ ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, DEL, \
+ TRNS, MPRV, MPLY, MNXT, MSTP, TRNS, TRNS, PGUP, UP, PGDN, TRNS, SLCK, PAUS, INS, \
+ TRNS, VOLD, MUTE, VOLU, TRNS, TRNS, HOME, LEFT, DOWN, RGHT, END, TRNS, TRNS, PENT, \
+ TRNS, TRNS, PSCR, FN2, FN3, FN4, CALC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CAPS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
+};
+
+/*
+* Fn action definition
+*/
+const uint16_t PROGMEM fn_actions[] = {
+ [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE), /* SpaceFn layout 1 */
+ [1] = ACTION_LAYER_MOMENTARY(1), /* Momentary layout 1 */
+ [2] = ACTION_MODS_KEY(MOD_LSFT, KC_DEL), /* Cut */
+ [3] = ACTION_MODS_KEY(MOD_LCTL, KC_INS), /* Copy */
+ [4] = ACTION_MODS_KEY(MOD_LSFT, KC_INS), /* Paste */
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+ return MACRO_NONE;
+};
+
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ return true;
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}
\ No newline at end of file
diff --git a/keyboards/s60-x/keymaps/jpec/readme.md b/keyboards/s60-x/keymaps/jpec/readme.md
new file mode 100644
index 000000000..73318dad7
--- /dev/null
+++ b/keyboards/s60-x/keymaps/jpec/readme.md
@@ -0,0 +1 @@
+# The default keymap for s60-x
\ No newline at end of file
diff --git a/keyboards/s60-x/keymaps/plain/keymap.c b/keyboards/s60-x/keymaps/plain/keymap.c
new file mode 100644
index 000000000..0f0cdee2a
--- /dev/null
+++ b/keyboards/s60-x/keymaps/plain/keymap.c
@@ -0,0 +1,25 @@
+#include "keymap_common.h"
+
+/* Main layer:
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â ESC â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCAPSLâ A â S â D â F â G â H â J â K â L â ; â ' âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ Z â X â C â V â B â N â M â , â . â / âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_GUIâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâR_GUIâ APP âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+*/
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* 0: qwerty */
+ KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, \
+ CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, NO, ENT, \
+ LSFT, NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, RCTL),
+};
+const uint16_t PROGMEM fn_actions[] = {};
diff --git a/keyboards/s60-x/keymaps/plain/readme.md b/keyboards/s60-x/keymaps/plain/readme.md
new file mode 100644
index 000000000..ab13323e3
--- /dev/null
+++ b/keyboards/s60-x/keymaps/plain/readme.md
@@ -0,0 +1,16 @@
+### 4. Plain
+Without any Fn layer this will be useful if you want to use key remapping tool like AHK on host.
+See [keymap_plain.c](keymap_plain.c) for detail.
+
+#### 4.0 Plain Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Esc â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBkSpcâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â A â S â D â F â G â H â J â K â L â ; â ' âââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâââââââ Z â X â C â V â B â N â M â , â . â / âââââââShiftâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â Gui â Alt âââââââââââââââââââSpaceâââââââââââââââââââ Alt â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
diff --git a/keyboards/s60-x/keymaps/poker/keymap.c b/keyboards/s60-x/keymaps/poker/keymap.c
new file mode 100644
index 000000000..5fc970a04
--- /dev/null
+++ b/keyboards/s60-x/keymaps/poker/keymap.c
@@ -0,0 +1,180 @@
+#include "keymap_common.h"
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* 0: qwerty
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGRAVEâ 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCAPSLâ A â S â D â F â G â H â J â K â L â ; â ' âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ Z â X â C â V â B â N â M â , â . â / âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_WINâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââ Fn0 âR_WINâ APP âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, \
+ CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, NO, ENT, \
+ LSFT, NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, FN0, RGUI, APP, RCTL),
+ /* 1: colemak
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGRAVEâ 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â W â F â P â G â J â L â U â Y â ; â [ â ] â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âBKSPCâ A â R â S â T â D â H â N â E â I â O â ' âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ Z â X â C â V â B â K â M â , â . â / âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_WINâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââ Fn0 âR_WINâ APP âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, W, F, P, G, J, L, U, Y, SCLN, LBRC, RBRC, BSLS, \
+ BSPC, A, R, S, T, D, H, N, E, I, O, QUOT, NO, ENT, \
+ LSFT, NO, Z, X, C, V, B, K, M, COMM, DOT, SLSH, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, FN0, RGUI, APP, RCTL),
+ /* 2: dvorak
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGRAVEâ 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â [ â ] âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â ' â , â . â P â Y â F â G â C â R â L â / â = â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCAPSLâ A â O â E â U â I â D â H â T â N â S â - âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ ; â Q â J â K â X â B â M â W â V â Z âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_WINâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââ Fn0 âR_WINâ APP âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC, RBRC, NO, BSPC, \
+ TAB, QUOT, COMM, DOT, P, Y, F, G, C, R, L, SLSH, EQL, BSLS, \
+ CAPS, A, O, E, U, I, D, H, T, N, S, MINS, NO, ENT, \
+ LSFT, NO, SCLN, Q, J, K, X, B, M, W, V, Z, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, FN0, RGUI, APP, RCTL),
+ /* 3: workman
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGRAVEâ 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â D â E â W â B â J â F â U â P â ; â [ â ] â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âBKSPCâ A â S â H â T â G â Y â N â E â O â I â ' âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ Z â X â M â C â V â K â L â , â . â / âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_WINâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââ Fn0 âR_WINâ APP âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, D, R, W, B, J, F, U, P, SCLN, LBRC, RBRC, BSLS, \
+ BSPC, A, S, H, T, G, Y, N, E, O, I, QUOT, NO, ENT, \
+ LSFT, NO, Z, X, M, C, V, K, L, COMM, DOT, SLSH, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, FN0, RGUI, APP, RCTL),
+ /* 4: Poker with Arrow
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â â â â â â â â â â â â â âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â â â â â â â â âââââââ Up âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ âLeft âDown âRightâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, UP, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, LEFT, DOWN, RGHT),
+ /* 5: Poker with Esc
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â ESC â â â â â â â â â â â â âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ ESC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
+ /* 6: Poker Fn
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â Esc â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â FnQ â Up â â â â â â â Cal â âHome â Ins â FnL âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âLeft âDown âRightâ â â Psc â Slk âPauseâ â Tsk â End âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ Del â â Web âMute â VoU â VoD â âPgUp âPgDwnâ Del âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ FnS âââââââââââââââââââ â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+
+Fn: to Fn overlay
+FnL: to Layout selector overaly
+FnQ: toggle Esc overlay
+FnS: toggle Arrow overlay
+
+ */
+ KEYMAP(
+ ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, TRNS, \
+ TRNS, FN2, UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME, INS, FN4, \
+ TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS, FN3, END, TRNS, TRNS, \
+ TRNS, TRNS, DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN, DEL, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, FN1, TRNS, TRNS, TRNS, TRNS),
+ /* 7: Layout selector
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â Lq â Lc â Ld â Lw â â â â â â â â â âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â Lq â Lw â â â â â â â â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â Ld â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â Lc â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+
+Lq: set Qwerty layout
+Lc: set Colemak layout
+Ld: set Dvorak layout
+Lw: set Workman layout
+
+ */
+ KEYMAP(
+ FN5, FN6, FN7, FN8, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, FN5, FN8, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, FN7, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, FN6, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
+};
+const uint16_t PROGMEM fn_actions[] = {
+ /* Poker Layout */
+ [0] = ACTION_LAYER_MOMENTARY(6), // to Fn overlay
+ [1] = ACTION_LAYER_TOGGLE(4), // toggle arrow overlay
+ [2] = ACTION_LAYER_TOGGLE(5), // toggle Esc overlay
+ [3] = ACTION_MODS_KEY(MOD_RCTL|MOD_RSFT, KC_ESC), // Task(RControl,RShift+Esc)
+ [4] = ACTION_LAYER_MOMENTARY(7), // to Layout selector
+ [5] = ACTION_DEFAULT_LAYER_SET(0), // set qwerty layout
+ [6] = ACTION_DEFAULT_LAYER_SET(1), // set colemak layout
+ [7] = ACTION_DEFAULT_LAYER_SET(2), // set dvorak layout
+ [8] = ACTION_DEFAULT_LAYER_SET(3), // set workman layout
+};
diff --git a/keyboards/s60-x/keymaps/poker/readme.md b/keyboards/s60-x/keymaps/poker/readme.md
new file mode 100644
index 000000000..0d8be9d0f
--- /dev/null
+++ b/keyboards/s60-x/keymaps/poker/readme.md
@@ -0,0 +1,31 @@
+### 3 Poker
+[keymap_poker.c](keymap_poker.c) emulates original Poker layers
+while both [keymap_poker_bit.c](keymap_poker_bit.c) and [keymap_poker_set.c](keymap_poker_set.c) implements same layout in different way and they fix a minor issue of original Poker and enhance arrow keys.
+
+ Fn + Esc = `
+ Fn + {left, down, up, right} = {home, pgdown, pgup, end}
+
+#### 3.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ` â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBkSpcâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â A â S â D â F â G â H â J â K â L â ; â ' âââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâââââââ Z â X â C â V â B â N â M â , â . â / âââââââShiftâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â Gui â Alt âââââââââââââââââââSpaceâââââââââââââââââââ Fn â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 3.1 Poker Fn layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Esc â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â FnQ â Up â â â â â â â Cal â âHome â Ins â âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âLeft âDown âRightâ â â Psc â Slk âPauseâ â Tsk â End âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âââââââ Del â â Web âMute â VoU â VoD â âPgUp âPgDwnâ Del âââââââ Up âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â âââââââââââââââââââ FnS âââââââââââââââââââ Fn âLeft âDown âRightâââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
diff --git a/keyboards/s60-x/keymaps/poker_bit/keymap.c b/keyboards/s60-x/keymaps/poker_bit/keymap.c
new file mode 100644
index 000000000..4a4cfd1be
--- /dev/null
+++ b/keyboards/s60-x/keymaps/poker_bit/keymap.c
@@ -0,0 +1,110 @@
+#include "keymap_common.h"
+
+// Poker fix with toggle and bit operation
+// Fn + Esc = `
+// Fn + {left, down, up, right} = {home, pgdown, pgup, end}
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* 0: qwerty
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGRAVEâ 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâ A â S â D â F â G â H â J â K â L â ; â ' âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ Z â X â C â V â B â N â M â , â . â / âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_WINâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââ Fn0 âR_WINâ APP âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, \
+ LCTL, A, S, D, F, G, H, J, K, L, SCLN, QUOT, NO, ENT, \
+ LSFT, NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, FN0, RGUI, APP, RCTL),
+ /* 4: Poker Default + Fn'd
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â Esc â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCaps â Fn2 â Up â â â â â â â Cal â âHome â Ins â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âLeft âDown âRightâ â â Psc â Slk âPauseâ â Fn4 â End âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ Del â â Web âMute â VoU â VoD â âPgUp âPgDwnâ Del âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ Fn1 âââââââââââââââââââ â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ [4] = KEYMAP(
+ TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, TRNS, \
+ CAPS, FN2, UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME, INS, TRNS, \
+ TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS, FN4, END, TRNS, TRNS, \
+ TRNS, TRNS, DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN, DEL, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, FN1, TRNS, TRNS, TRNS, TRNS),
+ /* 5: Poker with Arrow
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â â â â â â â â â â â â â âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â â â â â â â â âââââââPgUp âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ Fn3 âHome âPgDwnâ End âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PGUP, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, FN3, HOME, PGDN, END),
+ /* 6: Poker with Esc
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â ESC â â â â â â â â â â â â âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ ESC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
+ /* 7: Poker with Arrow + Fn'd
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â â â â â â â â â â â â â âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â â â â â â â â âââââââ Up âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ âLeft âDown âRightâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, UP, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, LEFT, DOWN, RGHT),
+};
+const uint16_t PROGMEM fn_actions[] = {
+ /* Poker Layout */
+ [0] = ACTION_LAYER_BIT_XOR(1, 0b0101, ON_BOTH), // Poker Fn(with fix for Esc)
+ [1] = ACTION_LAYER_TOGGLE(5), // Poker Arrow toggle
+ [2] = ACTION_LAYER_TOGGLE(6), // Poker Esc toggle
+ [3] = ACTION_LAYER_BIT_XOR(1, 0b1101, ON_BOTH), // Poker Fn(with fix for Arrow)
+ [4] = ACTION_MODS_KEY(MOD_RCTL|MOD_RSFT, KC_ESC), // FN3 Task(RControl,RShift+Esc)
+};
diff --git a/keyboards/s60-x/keymaps/poker_bit/readme.md b/keyboards/s60-x/keymaps/poker_bit/readme.md
new file mode 100644
index 000000000..0d8be9d0f
--- /dev/null
+++ b/keyboards/s60-x/keymaps/poker_bit/readme.md
@@ -0,0 +1,31 @@
+### 3 Poker
+[keymap_poker.c](keymap_poker.c) emulates original Poker layers
+while both [keymap_poker_bit.c](keymap_poker_bit.c) and [keymap_poker_set.c](keymap_poker_set.c) implements same layout in different way and they fix a minor issue of original Poker and enhance arrow keys.
+
+ Fn + Esc = `
+ Fn + {left, down, up, right} = {home, pgdown, pgup, end}
+
+#### 3.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ` â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBkSpcâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â A â S â D â F â G â H â J â K â L â ; â ' âââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâââââââ Z â X â C â V â B â N â M â , â . â / âââââââShiftâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â Gui â Alt âââââââââââââââââââSpaceâââââââââââââââââââ Fn â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 3.1 Poker Fn layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Esc â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â FnQ â Up â â â â â â â Cal â âHome â Ins â âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âLeft âDown âRightâ â â Psc â Slk âPauseâ â Tsk â End âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âââââââ Del â â Web âMute â VoU â VoD â âPgUp âPgDwnâ Del âââââââ Up âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â âââââââââââââââââââ FnS âââââââââââââââââââ Fn âLeft âDown âRightâââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
diff --git a/keyboards/s60-x/keymaps/poker_set/keymap.c b/keyboards/s60-x/keymaps/poker_set/keymap.c
new file mode 100644
index 000000000..0c1ef1a9b
--- /dev/null
+++ b/keyboards/s60-x/keymaps/poker_set/keymap.c
@@ -0,0 +1,178 @@
+#include "keymap_common.h"
+
+// Poker fix with set(state transition)
+// Fn + Esc = `
+// Fn + {left, down, up, right} = {home, pgdown, pgup, end}
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* 0: qwerty
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGRAVEâ 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâ A â S â D â F â G â H â J â K â L â ; â ' âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ Z â X â C â V â B â N â M â , â . â / âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_WINâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââ Fn0 âR_WINâ APP âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, \
+ LCTL, A, S, D, F, G, H, J, K, L, SCLN, QUOT, NO, ENT, \
+ LSFT, NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, SPC, FN0, RGUI, APP, RCTL),
+ /* 1: Poker with Arrow
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â â â â â â â â â â â â â âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â â â â â â â â âââââââ Up âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ Fn1 âLeft âDown âRightâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, UP, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, FN1, LEFT, DOWN, RGHT),
+ /* 2: Poker with Esc
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â ESC â â â â â â â â â â â â âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ Fn2 â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ ESC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, FN2, TRNS, TRNS, TRNS),
+ /* 3: Poker with Arrow and Esc
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â Esc â â â â â â â â â â â â âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â â â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â â â â â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â â â â â â â â âââââââ Up âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ Fn3 âLeft âDown âRightâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ ESC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, UP, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, FN3, LEFT, DOWN, RGHT),
+ /* 4: Poker Fn'd
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â Esc â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â Fn6 â Up â â â â â â â Cal â âHome â Ins â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âLeft âDown âRightâ â â Psc â Slk âPauseâ â Fn8 â End âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ Del â â Web âMute â VoU â VoD â âPgUp âPgDwnâ Del âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ Fn5 âââââââââââââââââââ Fn4 â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, TRNS, \
+ TRNS, FN6, UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME, INS, TRNS, \
+ TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS, FN8, END, TRNS, TRNS, \
+ TRNS, TRNS, DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN, DEL, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, FN5, FN4, TRNS, TRNS, TRNS),
+ /* 5: Poker Fn'd arrow
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â Esc â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â Fn7 â Up â â â â â â â Cal â âHome â Ins â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âLeft âDown âRightâ â â Psc â Slk âPauseâ â Fn8 â End âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ Del â â Web âMute â VoU â VoD â âPgUp âPgDwnâ Del âââââââPgUp âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ Fn4 âââââââââââââââââââ Fn5 âHome âPgDwnâ End âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, TRNS, \
+ TRNS, FN7, UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME, INS, TRNS, \
+ TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS, FN8, END, TRNS, TRNS, \
+ TRNS, TRNS, DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN, DEL, TRNS, PGUP, TRNS, \
+ TRNS, TRNS, TRNS, FN4, FN5, HOME, PGDN, END),
+ /* 6: Poker Fn'd Esc
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGraveâ F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â Fn4 â Up â â â â â â â Cal â âHome â Ins â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âLeft âDown âRightâ â â Psc â Slk âPauseâ â Fn8 â End âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ Del â â Web âMute â VoU â VoD â âPgUp âPgDwnâ Del âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ Fn7 âââââââââââââââââââ Fn6 â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, TRNS, \
+ TRNS, FN4, UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME, INS, TRNS, \
+ TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS, FN8, END, TRNS, TRNS, \
+ TRNS, TRNS, DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN, DEL, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, FN7, FN6, TRNS, TRNS, TRNS),
+ /* 7: Poker Fn'd Arrow + Esc
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+âGraveâ F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â Fn5 â Up â â â â â â â Cal â âHome â Ins â âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âLeft âDown âRightâ â â Psc â Slk âPauseâ â Fn8 â End âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ Del â â Web âMute â VoU â VoD â âPgUp âPgDwnâ Del âââââââPgUp âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ Fn6 âââââââââââââââââââ Fn7 âHome âPgDwnâ End âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, TRNS, \
+ TRNS, FN5, UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME, INS, TRNS, \
+ TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS, FN8, END, TRNS, TRNS, \
+ TRNS, TRNS, DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN, DEL, TRNS, PGUP, TRNS, \
+ TRNS, TRNS, TRNS, FN6, FN7, HOME, PGDN, END),
+};
+
+/*
+ * Fn action definition
+ */
+const uint16_t PROGMEM fn_actions[] = {
+ /* Poker Layout */
+ [0] = ACTION_LAYER_SET(4, ON_PRESS), // FN0 move to Fn'd when press
+ [1] = ACTION_LAYER_SET(5, ON_PRESS), // FN1 move to Fn'd arrow when press
+ [2] = ACTION_LAYER_SET(6, ON_PRESS), // FN2 move to Fn'd Esc when press
+ [3] = ACTION_LAYER_SET(7, ON_PRESS), // FN3 move to Fn'd arrow + Esc when press
+
+ //[4] = ACTION_LAYER_CLEAR(ON_RELEASE), // FN4 clear overlay when release
+ [4] = ACTION_LAYER_SET(0, ON_RELEASE), // FN4 clear overlay when release
+ [5] = ACTION_LAYER_SET(1, ON_RELEASE), // FN5 move to arrow when release
+ [6] = ACTION_LAYER_SET(2, ON_RELEASE), // FN6 move to Esc when release
+ [7] = ACTION_LAYER_SET(3, ON_RELEASE), // FN7 move to arrow + Esc when release
+
+ [8] = ACTION_MODS_KEY(MOD_RCTL|MOD_RSFT, KC_ESC), // FN8 Task(RControl,RShift+Esc)
+};
diff --git a/keyboards/s60-x/keymaps/poker_set/readme.md b/keyboards/s60-x/keymaps/poker_set/readme.md
new file mode 100644
index 000000000..0d8be9d0f
--- /dev/null
+++ b/keyboards/s60-x/keymaps/poker_set/readme.md
@@ -0,0 +1,31 @@
+### 3 Poker
+[keymap_poker.c](keymap_poker.c) emulates original Poker layers
+while both [keymap_poker_bit.c](keymap_poker_bit.c) and [keymap_poker_set.c](keymap_poker_set.c) implements same layout in different way and they fix a minor issue of original Poker and enhance arrow keys.
+
+ Fn + Esc = `
+ Fn + {left, down, up, right} = {home, pgdown, pgup, end}
+
+#### 3.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ` â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBkSpcâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â A â S â D â F â G â H â J â K â L â ; â ' âââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâââââââ Z â X â C â V â B â N â M â , â . â / âââââââShiftâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â Gui â Alt âââââââââââââââââââSpaceâââââââââââââââââââ Fn â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 3.1 Poker Fn layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Esc â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â FnQ â Up â â â â â â â Cal â âHome â Ins â âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âLeft âDown âRightâ â â Psc â Slk âPauseâ â Tsk â End âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âââââââ Del â â Web âMute â VoU â VoD â âPgUp âPgDwnâ Del âââââââ Up âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â âââââââââââââââââââ FnS âââââââââââââââââââ Fn âLeft âDown âRightâââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
diff --git a/keyboards/s60-x/keymaps/spacefn/keymap.c b/keyboards/s60-x/keymaps/spacefn/keymap.c
new file mode 100644
index 000000000..c93070532
--- /dev/null
+++ b/keyboards/s60-x/keymaps/spacefn/keymap.c
@@ -0,0 +1,55 @@
+#include "keymap_common.h"
+
+/*
+ * SpaceFN
+ * http://geekhack.org/index.php?topic=51069.0
+ */
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Keymap 0: Default Layer
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â ESC â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âCAPSLâ A â S â D â F â G â H â J â K â L â ; â ' âââââââENTERâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLSHFTâââââââ Z â X â C â V â B â N â M â , â . â / âââââââRSHFTâââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+âLCTRLâL_GUIâL_ALTââââââââââââââââââSpc/Fn0ââââââââââââââââââR_ALTâR_GUIâ APP âRCTRLâââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, \
+ CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, NO, ENT, \
+ LSFT, NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, NO, \
+ LCTL, LGUI, LALT, FN0, RALT, RGUI, APP, RCTL),
+
+ /* Overlay 1: SpaceFN
+âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+â ` â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ Del â
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â Esc â â â âHome â Up â End âPscr âSlck âPauseâ Ins âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â â â â âPgUp âLeft âDown âRightâ â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â âââââââ â â âSpaceâPgDwnâ ` â ~ â â â âââââââ âââââââ
+âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+â â â âââââââââââââââââââ âââââââââââââââââââ â â â âââââââ
+âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+ */
+ KEYMAP(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, DEL, \
+ TRNS, TRNS, TRNS, ESC, TRNS, TRNS, TRNS, HOME, UP, END, PSCR, SLCK, PAUS, INS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PGUP, LEFT, DOWN, RGHT, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, SPC, PGDN, GRV, FN1, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
+};
+
+/*
+ * Fn action definition
+ */
+const uint16_t PROGMEM fn_actions[] = {
+ [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE),
+ [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde
+};
diff --git a/keyboards/s60-x/keymaps/spacefn/readme.md b/keyboards/s60-x/keymaps/spacefn/readme.md
new file mode 100644
index 000000000..d04bd9486
--- /dev/null
+++ b/keyboards/s60-x/keymaps/spacefn/readme.md
@@ -0,0 +1,27 @@
+### 6. SpaceFN
+This layout proposed by spiceBar uses space bar to change layer with using Dual role key technique. See [keymap_spacefn.c](keymap_spacefn.c) and [SpaceFN discussion](http://geekhack.org/index.php?topic=51069.0).
+
+#### 6.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Esc â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBkSpcâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â A â S â D â F â G â H â J â K â L â ; â ' âââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâââââââ Z â X â C â V â B â N â M â , â . â / âââââââShiftâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â Gui â Alt âââââââââââââââââ Space/Fn ââââââââââââââââ Alt â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 6.1 SpaceFN layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ` â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ Del â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â â â â â âHome â Up â End â Psc â Slk âPauseâ Ins âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â â â â âPgUp âLeft âDown âRightâ â âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âââââââ â â â âSpaceâPgDwnâ ` â ~ â â âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â âââââââââââââââââââ Fn âââââââââââââââââââ Alt â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
diff --git a/keyboards/s60-x/readme.md b/keyboards/s60-x/readme.md
index 34c48b0b7..0872c2e01 100644
--- a/keyboards/s60-x/readme.md
+++ b/keyboards/s60-x/readme.md
@@ -1,32 +1,248 @@
-S60-x keyboard firmware
+S60-x keyboard firmware
======================
-DIY compact keyboard by Massdrop. This is a port from TMK to QMK based on the [original S60-X Repo](https://github.com/jpec/s60x).
+DIY compact keyboard designed by VinnyCordeiro for Sentraq. Most of the keymaps are based on GH60 code. This is a port from TMK to QMK based on the [original S60-X Repo](https://github.com/VinnyCordeiro/tmk_keyboard).
## S60X Resources
-- [Massdrop page](https://www.massdrop.com/buy/sentraq-60-diy-keyboard-kit)
+- [Massdrop page](https://www.massdrop.com/buy/sentraq-60-diy-keyboard-kit?mode=guest_open)
## Quantum MK Firmware
-For the full Quantum feature list, see [the parent readme.md](/doc/readme.md).
+For the full Quantum feature list, see [the parent readme.md](/readme.md).
-## Building
+## Keymap
+Several versions of keymaps are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `keymap_<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
-Download or clone the whole firmware and navigate to the keyboards/s60-x folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file.
+To build firmware binary hex file with a certain keymap just run `make` with the `keymap` option like:
-Depending on which keymap you would like to use, you will have to compile slightly differently.
+ $ make keymap=[custom|poker|poker_set|poker_bit|plain|hasu|spacefn|hhkb|<name>]
-### Default
+File [S60-X_pre-compiled_firmwares.zip](S60-X_pre-compiled_firmwares.zip) contains pre-compiled firmwares for all keymaps available. Not all of them are tested.
-To build with the default keymap, simply run `make`.
-### Other Keymaps
+## Flashing your keyboard
+The recommended programs for flashing your keyboard are [Atmel FLIP](http://www.atmel.com/tools/FLIP.aspx) (Windows) and [dfu-programmer](http://dfu-programmer.sourceforge.net/) (Linux/Windows).
-Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files.
+[QMK Firmware Flasher](https://github.com/jackhumbert/qmk_firmware_flasher/releases) may work, as the S60-X keyboard uses the ATMega32U4 microcontroller, but it is untested. Use at your own risk.
-To build the firmware binary hex file with a keymap just do `make` with `keymap` option like:
+[Easy AVR USB Keyboard Firmware](https://deskthority.net/wiki/Easy_AVR_USB_Keyboard_Firmware) also supports S60-X, but it is completely unrelated to TMK firmware. Use at your own risk.
-```
-$ make keymap=[default|<name>]
-```
+**Programming the firmware (Windows)**
-Keymaps follow the format **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/`
\ No newline at end of file
+1. download and install FLIP (http://www.atmel.com/tools/FLIP.aspx)
+2. connect the keyboard, press the program button (S1) and wait until it enumerates
+3. go to device manager, find the atmega32u4 chip and click "update driver"
+4. choose location manually: folder named "usb" inside the installation directory of FLIP
+5. once the driver is installed, run flip
+6. Device -> Select: choose ATMega32U4
+7. Settings -> Communication -> USB, FLIP should show the signature at this point (58 1E 95 87)
+8. File -> Load HEX file: choose the hex firmware: <firmware>.hex
+9. click "Run"
+10. after programming is done, disconnect the device from USB and connect again.
+
+
+**Programming the firmware (Linux)**
+
+1. Download and install/compile/unpack dfu-programmer from http://dfu-programmer.sourceforge.net/.
+2. Issue the following commands in the command prompt after connecting the device and pressing the programming button (S1). You may need root permissions or udev rules to do that.
+ 1. `sudo dfu-programmer atmega32u4 erase`
+ 2. `sudo dfu-programmer atmega32u4 flash <firmware>.hex`
+ 3. `sudo dfu-programmer atmega32u4 start`
+3. The keyboard should start working. If it doesn't, reconnect the cable.
+
+
+### 0 Initial explanations
+The âââââ blocks on the layouts hides the switch positions that do not exist physically on the PCB. If you feel like hacking the keyboard and adding new keys, those are the positions that can be used. You'll have to modify the [keymap_common.h](keymap_common.h) file for that.
+
+The âââââ blocks hides switch positions not used on this particular layout, but they do exist on the PCB.
+
+There is no LED support on the PCB at the moment, but I'll let the code for that untouched.
+
+
+### 1 Standard - ANSI
+The standard keymap is the one that is pre-flashed on the S60-X.
+
+#### 1.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ESC â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCAPSLâ A â S â D â F â G â H â J â K â L â ; â ' âââââââENTERâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âLSHFTâââââââ Z â X â C â V â B â N â M â , â . â / âââââââRSHFTâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âLCTRLâL_GUIâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâ FN0 â APP âRCTRLâââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 1.1 Fn layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ âGRAVEâ F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â Up â â â â â âPGUP âPGDWNâPRTSCâSCLCKâPAUSEâ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âLeft âDown âRightâ â â â â â â â âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âââââââ â â â â â â â â â âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â âââââââââââââââââââ âââââââââââââââââââ â â â âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+
+
+### 2 Standard - ISO
+The same as the standard keymap, but with additional ISO keys.
+
+
+#### 2.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ESC â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBKSPCâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â TAB â Q â W â E â R â T â Y â U â I â O â P â [ â ] âââââââââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCAPSLâ A â S â D â F â G â H â J â K â L â ; â ' âNUHS âENTERâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âLSHFTâ \ â Z â X â C â V â B â N â M â , â . â / âââââââRSHFTâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âLCTRLâL_GUIâL_ALTâââââââââââââââââââ SPC âââââââââââââââââââR_ALTâ FN0 â APP âRCTRLâââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 2.1 Fn layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ âGRAVEâ F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â Up â â â â â âPGUP âPGDWNâPRTSCâSCLCKâPAUSEâââââââââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âLeft âDown âRightâ â â â â â â â â â âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â â â â â â â â â â âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â âââââââââââââââââââ âââââââââââââââââââ â â â âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+
+
+### 3 Poker
+[keymap_poker.c](keymap_poker.c) emulates original Poker layers
+while both [keymap_poker_bit.c](keymap_poker_bit.c) and [keymap_poker_set.c](keymap_poker_set.c) implements same layout in different way and they fix a minor issue of original Poker and enhance arrow keys.
+
+ Fn + Esc = `
+ Fn + {left, down, up, right} = {home, pgdown, pgup, end}
+
+#### 3.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ` â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBkSpcâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â A â S â D â F â G â H â J â K â L â ; â ' âââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâââââââ Z â X â C â V â B â N â M â , â . â / âââââââShiftâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â Gui â Alt âââââââââââââââââââSpaceâââââââââââââââââââ Fn â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 3.1 Poker Fn layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Esc â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â FnQ â Up â â â â â â â Cal â âHome â Ins â âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âLeft âDown âRightâ â â Psc â Slk âPauseâ â Tsk â End âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âââââââ Del â â Web âMute â VoU â VoD â âPgUp âPgDwnâ Del âââââââ Up âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â âââââââââââââââââââ FnS âââââââââââââââââââ Fn âLeft âDown âRightâââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+
+
+### 4. Plain
+Without any Fn layer this will be useful if you want to use key remapping tool like AHK on host.
+See [keymap_plain.c](keymap_plain.c) for detail.
+
+#### 4.0 Plain Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Esc â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBkSpcâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â A â S â D â F â G â H â J â K â L â ; â ' âââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâââââââ Z â X â C â V â B â N â M â , â . â / âââââââShiftâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â Gui â Alt âââââââââââââââââââSpaceâââââââââââââââââââ Alt â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+
+
+### 5. Hasu
+This is Hasu's favorite keymap with HHKB Fn, Vi cursor and Mousekey layer. See [keymap_hasu.c](keymap_hasu.c) for detail.
+
+(Hasu is the creator of the TMK firmware, for those who do not know that.)
+
+
+### 6. SpaceFN
+This layout proposed by spiceBar uses space bar to change layer with using Dual role key technique. See [keymap_spacefn.c](keymap_spacefn.c) and [SpaceFN discussion](http://geekhack.org/index.php?topic=51069.0).
+
+#### 6.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Esc â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âââââââBkSpcâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â A â S â D â F â G â H â J â K â L â ; â ' âââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâââââââ Z â X â C â V â B â N â M â , â . â / âââââââShiftâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â Gui â Alt âââââââââââââââââ Space/Fn ââââââââââââââââ Alt â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 6.1 SpaceFN layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ` â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 âââââââ Del â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â â â â â âHome â Up â End â Psc â Slk âPauseâ Ins âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â â â â âPgUp âLeft âDown âRightâ â âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âââââââ â â â âSpaceâPgDwnâ ` â ~ â â âââââââ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â â âââââââââââââââââââ Fn âââââââââââââââââââ Alt â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+
+
+### 7. HHKB
+[keymap_hhkb.c](keymap_hhkb.c) emulates original HHKB layers.
+#### 7.0: Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Esc â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = â \ â ` â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] âBkSpcâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â A â S â D â F â G â H â J â K â L â Fn3 â ' âââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâââââââ Z â X â C â V â B â N â M â , â . â / âââââââShiftâ Fn â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âââââââ Gui â Alt âââââââââââââââââââSpaceâââââââââââââââââââââââââ Alt â Gui âââââââââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+#### 7.1: HHKB Fn layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â Pwr â F1 â F2 â F3 â F4 â F5 â F6 â F7 â F8 â F9 â F10 â F11 â F12 â Ins â Del â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â â â â â â â â Psc â Slk â Pus â Up â â âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â â VoD â VoU â Mut â Ejc â â * â / âHome âPgUp âLeft âRightâââââââEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â âââââââ â â â â â + â - â End âPgDwnâDown âââââââ â â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âââââââ â âââââââââââââââââââ âââââââââââââââââââââââââ â âââââââââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
+
+
+### 8 Custom
+The custom keymap - [keymap_custom.c](keymap_custom.c) - is where I tested all the switches, not being concerned with a specific layout or layers. It's a plain layout option with the extra keys used on ISO & HHKB layouts being assigned some other keys.
+
+#### 8.0 Default layer
+ âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ
+ â ` â 1 â 2 â 3 â 4 â 5 â 6 â 7 â 8 â 9 â 0 â - â = âPgUp âBkSpcâ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ â Tab â Q â W â E â R â T â Y â U â I â O â P â [ â ] â \ âââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCaps â A â S â D â F â G â H â J â K â L â ; â ' âPgDwnâEnterâââââââ
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âShiftâHome â Z â X â C â V â B â N â M â , â . â / â End âShiftâ Up â
+ âââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¼ââââââ¤
+ âCtrl â Gui â Alt âââââââââââââââââââSpaceâââââââââââââââââââ Alt â Gui â App âCtrl âââââââ
+ âââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ
diff --git a/keyboards/s60-x/s60-x.h b/keyboards/s60-x/s60-x.h
index 68f2ab22f..91e7b67f3 100644
--- a/keyboards/s60-x/s60-x.h
+++ b/keyboards/s60-x/s60-x.h
@@ -22,6 +22,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h"
+#ifdef __INTELLISENSE__
+#define PROGMEM
+#include "config.h"
+#endif
+
/* S60-X keymap definition macro
* K31 is the extra key next to short left ISO shift
* K2C is the moved key next to enter on ISO boards