Merge remote-tracking branch 'origin/master' into develop

10 files changed, 809 insertions, 0 deletions

diff --git a/keyboards/jones/v03_1/keymaps/default/keymap.c b/keyboards/jones/v03_1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d471665598
--- /dev/null
+++ b/keyboards/jones/v03_1/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2020 Takeshi Nishio
+ *
+ * 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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        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_GRV,
+        KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSPC,    KC_LBRC,KC_RBRC,
+        KC_LCTL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_ENT,     XXXXXXX,KC_QUOT,
+        KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,KC_UP,  XXXXXXX,
+        KC_MUTE,KC_LANG2,KC_LALT,KC_LGUI,       KC_SPC,         KC_SPC,         KC_RGUI,KC_RALT,KC_LANG1,KC_LEFT,KC_DOWN,KC_RGHT
+    )
+};
\ No newline at end of file
diff --git a/keyboards/jones/v03_1/keymaps/default/readme.md b/keyboards/jones/v03_1/keymaps/default/readme.md
new file mode 100644
index 0000000000..a23bc4c15a
--- /dev/null
+++ b/keyboards/jones/v03_1/keymaps/default/readme.md
@@ -0,0 +1 @@
+# Defalut keymap for Jones
diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/config.h b/keyboards/jones/v03_1/keymaps/default_ansi/config.h
new file mode 100644
index 0000000000..0b51190bbe
--- /dev/null
+++ b/keyboards/jones/v03_1/keymaps/default_ansi/config.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 Takeshi Nishio
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+// double tap to toggle
+#define TAPPING_TOGGLE 2
+
+// time for long press
+#define TAPPING_TERM 200
+
+// music map for music-mode
+#define MUSIC_MAP
diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
new file mode 100644
index 0000000000..e1bc27305f
--- /dev/null
+++ b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
@@ -0,0 +1,362 @@
+/* Copyright 2020 Takeshi Nishio
+ *
+ * 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 QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_number {
+    _MAC = 0,
+    _WIN,
+    _NUM,
+    _LOWER,
+    _RAISE,
+    _NUM_RAISE,
+    _ADJUST
+};
+
+// Tap Dance
+enum tap_dances{
+    TD_LSFT_CAPS = 0,
+    TD_ESC_NUM,
+};
+
+// Tap Dance state
+enum {
+    SINGLE_TAP = 1,
+    DOUBLE_TAP,
+    TRIPLE_TAP,
+    TAP_HOLD,
+};
+
+// Declare the functions to be used with your tap dance key(s)
+// Function associated with all tap dances
+uint8_t cur_dance(qk_tap_dance_state_t *state);
+// Functions associated with individual tap dances
+void ql_finished(qk_tap_dance_state_t *state, void *user_data);
+void ql_reset(qk_tap_dance_state_t *state, void *user_data);
+
+// Tap Dance definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_LSFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
+    [TD_ESC_NUM] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, ql_finished, ql_reset, 275),
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+  MAC = SAFE_RANGE,
+  WIN,
+};
+
+// Key Macro
+#define ESC_NUM TD(TD_ESC_NUM)
+#define S_CAP   TD(TD_LSFT_CAPS)
+#define SP_RAI  LT(_RAISE, KC_SPC)
+#define SP_NRAI LT(_NUM_RAISE, KC_SPC)
+#define SP_SFT  MT(MOD_LSFT, KC_SPC)
+#define C_SLSH  RCTL_T(KC_SLSH)
+#define CT_E    LCTL(KC_E)
+#define CT_A    LCTL(KC_A)
+#define ALT_GRV LALT(KC_GRV)
+#define LOWER   MO(_LOWER)
+#define NUM     TG(_NUM)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MAC] = LAYOUT_ansi(
+        ESC_NUM,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_GRV,
+        KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSPC,    KC_LBRC,KC_RBRC,
+        KC_LCTL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_ENT,             KC_QUOT,
+        S_CAP,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, C_SLSH, KC_RSFT,KC_UP,  LOWER,
+        KC_MUTE,KC_LANG2,KC_LALT,KC_LGUI,       SP_SFT,         SP_RAI,         KC_RGUI,KC_RALT,KC_LANG1,KC_LEFT,KC_DOWN,KC_RGHT
+    ),
+    [_WIN] = LAYOUT_ansi(
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,_______,
+        _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,            _______,
+        _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,ALT_GRV,KC_LGUI,KC_LALT,        _______,        _______,        KC_RALT,KC_APP, ALT_GRV,_______,_______,_______
+    ),
+    [_NUM] = LAYOUT_ansi(
+        _______,_______,_______,_______,_______,_______,_______,XXXXXXX,KC_PSLS,KC_PSLS,KC_PAST,_______,_______,_______,_______,
+        _______,    _______,_______,_______,_______,_______,_______,KC_P7,  KC_P8,  KC_P9,  KC_PPLS,_______,    _______,_______,
+        _______,    _______,_______,_______,_______,_______,_______,KC_P4,  KC_P5,  KC_P6,  XXXXXXX,_______,            _______,
+        _______,        _______,_______,_______,_______,_______,_______,KC_P1,  KC_P2,  KC_P3,  KC_PENT,_______,_______,_______,
+        _______,_______,_______,_______,        _______,        SP_NRAI,        KC_P0,  KC_PDOT,_______,_______,_______,_______
+    ),
+    [_LOWER] = LAYOUT_ansi(
+        KC_PAUS,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, KC_DEL,
+        KC_PSCR,    _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_UP,      KC_END, KC_VOLU,
+        _______,    _______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_LEFT,KC_RGHT,            KC_VOLD,
+        _______,        _______,_______,_______,_______,_______,_______,_______,_______,KC_PGDN,KC_DOWN,_______,KC_PGUP,_______,
+        _______,_______,_______,_______,        _______,        _______,         _______,_______,_______,KC_HOME,KC_PGDN,KC_END
+    ),
+    [_RAISE] = LAYOUT_ansi(
+        KC_PAUS,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, KC_DEL,
+        KC_PSCR,    _______,_______,CT_E,   _______,_______,_______,_______,_______,_______,KC_PGUP,KC_DEL,     _______,_______,
+        _______,    CT_A,   _______,KC_DEL, KC_RGHT,KC_ESC, KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,KC_MINS,KC_INS,             _______,
+        _______,        _______,_______,_______,_______,KC_LEFT,KC_PGDN,KC_ENT, _______,KC_MRWD,KC_MFFD,_______,KC_PGUP,_______,
+        _______,_______,_______,_______,        _______,        _______,        _______,_______,_______,KC_HOME,KC_PGDN,KC_END
+    ),
+    [_NUM_RAISE] = LAYOUT_ansi(
+        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_GRV,
+        KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSPC,    KC_LBRC,KC_RBRC,
+        KC_LCTL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN, KC_ENT,            KC_QUOT,
+        S_CAP,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, C_SLSH, KC_RSFT,KC_UP,  _______,
+        _______,_______,_______,_______,        _______,        _______,        _______,_______,_______,_______,_______,_______
+    ),
+    [_ADJUST] = LAYOUT_ansi(
+        _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,    _______,WIN,    _______,RESET,  _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_RMOD,_______,   _______,_______,
+        _______,    AU_TOG, CK_TOGG,MU_TOG, MU_MOD, _______,RGB_HUD,RGB_SAD,RGB_VAD,RGB_TOG,RGB_MOD,_______,            _______,
+        _______,        CK_RST, CK_DOWN,CK_UP  ,_______,_______,NUM,     MAC,   _______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,        _______,        _______,        _______,_______,_______,_______,_______,_______
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case MAC: // Change default ayer --> Write to EEPROM
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_MAC);
+            }
+            return false;
+            break;
+        case WIN: // Change default ayer --> Write to EEPROM
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_WIN);
+            }
+            return false;
+            break;
+        default:
+            break;
+    }
+    return true;
+}
+
+//------------------------------------------------------------------------------
+// RGB Light settings
+#ifdef RGBLIGHT_LAYERS
+
+// Indicator LED settings
+#define JONES_LED_INDICATOR_INDEX 12        // where to start indicator
+#define JONES_LED_INDICATOR_COUNT 2         // how many leds for indicator
+#define JONES_LED_INDICATOR_CHANGE_COUNT 1  // how meny leds to change color for temporally layer
+#define JONES_LED_DIMMER_LEVEL 200          // brightness dimmer
+
+// for Default layer (= Base layer)
+const rgblight_segment_t PROGMEM my_mac_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_COUNT, HSV_WHITE - JONES_LED_DIMMER_LEVEL}
+);
+const rgblight_segment_t PROGMEM my_win_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_COUNT, HSV_BLUE - JONES_LED_DIMMER_LEVEL}
+);
+const rgblight_segment_t PROGMEM my_num_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_COUNT, HSV_YELLOW - JONES_LED_DIMMER_LEVEL}
+);
+
+// for temporal layer
+const rgblight_segment_t PROGMEM my_caps_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_MAGENTA - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_GREEN - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_CYAN - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_num_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_GOLD - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_RED - JONES_LED_DIMMER_LEVEL}
+);
+
+// Define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_mac_layer,
+    my_win_layer,
+    my_num_layer,
+    my_caps_layer,
+    my_lower_layer,
+    my_raise_layer,
+    my_num_raise_layer,
+    my_adjust_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+
+// Enabling and disabling lighting layers
+layer_state_t layer_state_set_user(layer_state_t state) {
+    state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+
+    rgblight_set_layer_state(2, layer_state_cmp(state, _NUM));
+    rgblight_set_layer_state(4, layer_state_cmp(state, _LOWER));
+    rgblight_set_layer_state(5, layer_state_cmp(state, _RAISE));
+    rgblight_set_layer_state(6, layer_state_cmp(state, _NUM_RAISE));
+    rgblight_set_layer_state(7, layer_state_cmp(state, _ADJUST));
+
+    return state;
+}
+
+// Enabling and disabling lighting layers for default layer
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _MAC));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _WIN));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _NUM));
+
+    return state;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(3, led_state.caps_lock);
+    return true;
+}
+#endif
+
+
+//------------------------------------------------------------------------------
+// Rotary Encoder
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder, Right side */
+        if (clockwise) {
+            tap_code(KC_VOLD);
+        } else {
+            tap_code(KC_VOLU);
+        }
+    }
+    if (index == 1) { /* Second encoder, Left side */
+        switch(biton32(layer_state)) {
+            case _LOWER:
+                if (clockwise) {
+                    rgblight_decrease_hue();
+                } else {
+                    rgblight_increase_hue();
+                }
+                break;
+            case _RAISE:
+                if (clockwise) {
+                    rgblight_decrease_val();
+                } else {
+                    rgblight_increase_val();
+                }
+                break;
+            case _ADJUST:
+                if (clockwise) {
+                    rgblight_step_reverse();
+                } else {
+                    rgblight_step();
+                }
+                break;
+            default:
+                if (clockwise) {
+                    tap_code(KC_VOLD);
+                } else {
+                    tap_code(KC_VOLU);
+                }
+                break;
+        }
+    }
+}
+
+
+//------------------------------------------------------------------------------
+// Tap Dance function
+
+
+typedef struct {
+    bool is_press_action;
+    uint8_t state;
+} tap;
+
+// Determine the current tap dance state
+uint8_t cur_dance(qk_tap_dance_state_t *state) {
+    if (state->count == 1) {
+        if (!state->pressed) {
+            return SINGLE_TAP;
+        } else {
+            return TAP_HOLD;
+        }
+    } else if (state->count == 2) {
+        if (!state->pressed) {
+            return DOUBLE_TAP;
+        } else {
+            return TAP_HOLD;
+        }
+    } else if (state->count == 3) {
+        if (!state->pressed) {
+            return TRIPLE_TAP;
+        } else {
+            return TAP_HOLD;
+        }
+    } else {
+        return 8; // Magic number. At some point this method will expand to work for more presses
+    }
+}
+
+// Initialize tap structure associated with example tap dance key
+static tap ql_tap_state = {
+    .is_press_action = true,
+    .state = 0
+};
+
+// Functions that control what our tap dance key does
+void ql_finished(qk_tap_dance_state_t *state, void *user_data) {
+    ql_tap_state.state = cur_dance(state);
+    switch(state->keycode) {
+        case TD(TD_ESC_NUM): // ESC key action
+            switch (ql_tap_state.state) {
+                case SINGLE_TAP:
+                case DOUBLE_TAP:
+                    // ESC
+                    tap_code(KC_ESC);
+                    break;
+                case TAP_HOLD:
+                    // temporal layer change
+                    layer_on(_NUM);
+                    break;
+                case TRIPLE_TAP:
+                    // toggle layer
+                    // Check to see if the layer is already set
+                    if (layer_state_is(_NUM)) {
+                        // If already set, then switch it off
+                        layer_off(_NUM);
+                    } else {
+                        // If not already set, then switch the layer on
+                        layer_on(_NUM);
+                    }
+                    break;
+            }
+            break;
+    }
+}
+
+void ql_reset(qk_tap_dance_state_t *state, void *user_data) {
+    switch(state->keycode) {
+        case TD(TD_ESC_NUM):
+            // If the key was held down and now is released then switch off the layer
+            if (ql_tap_state.state == TAP_HOLD) {
+                layer_off(_NUM);
+            }
+            ql_tap_state.state = 0;
+            break;
+    }
+}
diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/readme.md b/keyboards/jones/v03_1/keymaps/default_ansi/readme.md
new file mode 100644
index 0000000000..1838a84adc
--- /dev/null
+++ b/keyboards/jones/v03_1/keymaps/default_ansi/readme.md
@@ -0,0 +1 @@
+# Defalut ANSI-style keymap for Jones
diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/rules.mk b/keyboards/jones/v03_1/keymaps/default_ansi/rules.mk
new file mode 100644
index 0000000000..18b26d5c82
--- /dev/null
+++ b/keyboards/jones/v03_1/keymaps/default_ansi/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes		# Enable Tap Dance
\ No newline at end of file
diff --git a/keyboards/jones/v03_1/keymaps/default_jp/config.h b/keyboards/jones/v03_1/keymaps/default_jp/config.h
new file mode 100644
index 0000000000..0b51190bbe
--- /dev/null
+++ b/keyboards/jones/v03_1/keymaps/default_jp/config.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 Takeshi Nishio
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+// double tap to toggle
+#define TAPPING_TOGGLE 2
+
+// time for long press
+#define TAPPING_TERM 200
+
+// music map for music-mode
+#define MUSIC_MAP
diff --git a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
new file mode 100644
index 0000000000..70e4612b6c
--- /dev/null
+++ b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
@@ -0,0 +1,364 @@
+/* Copyright 2020 Takeshi Nishio
+ *
+ * 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 QMK_KEYBOARD_H
+#include "keymap_jp.h"
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_number {
+    _MAC = 0,
+    _WIN,
+    _NUM,
+    _LOWER,
+    _RAISE,
+    _NUM_RAISE,
+    _ADJUST
+};
+
+// Tap Dance
+enum tap_dances{
+    TD_LSFT_CAPS = 0,
+    TD_ESC_NUM,
+};
+
+// Tap Dance state
+enum {
+    SINGLE_TAP = 1,
+    DOUBLE_TAP,
+    TRIPLE_TAP,
+    TAP_HOLD,
+};
+
+// Declare the functions to be used with your tap dance key(s)
+// Function associated with all tap dances
+uint8_t cur_dance(qk_tap_dance_state_t *state);
+// Functions associated with individual tap dances
+void ql_finished(qk_tap_dance_state_t *state, void *user_data);
+void ql_reset(qk_tap_dance_state_t *state, void *user_data);
+
+// Tap Dance definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_LSFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
+    [TD_ESC_NUM] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, ql_finished, ql_reset, 275),
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+  MAC = SAFE_RANGE,
+  WIN,
+};
+
+// Key Macro
+#define ESC_NUM TD(TD_ESC_NUM)
+#define S_CAP   TD(TD_LSFT_CAPS)
+#define SP_RAI  LT(_RAISE, KC_SPC)
+#define SP_NRAI LT(_NUM_RAISE, KC_SPC)
+#define SP_SFT  MT(MOD_LSFT, KC_SPC)
+#define S_BSLS  RSFT_T(JP_BSLS)
+#define C_SLSH  RCTL_T(JP_SLSH)
+#define CT_E    LCTL(KC_E)
+#define CT_A    LCTL(KC_A)
+#define ALT_GRV LALT(KC_GRV)
+#define LOWER   MO(_LOWER)
+#define NUM     TG(_NUM)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MAC] = LAYOUT_jp(
+        ESC_NUM,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   JP_MINS,KC_BSPC,JP_CIRC,JP_YEN,
+        KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,               JP_AT,  JP_LBRC,
+        KC_LCTL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   JP_SCLN, KC_ENT,    JP_COLN,JP_RBRC,
+        S_CAP,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   JP_COMM,JP_DOT, C_SLSH, S_BSLS, KC_UP,  LOWER,
+        KC_MUTE,KC_LALT,KC_LGUI,KC_LANG2,       SP_SFT,         SP_RAI,        KC_LANG1,KC_RGUI,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT
+    ),
+    [_WIN] = LAYOUT_jp(
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,            _______,_______,
+        _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,_______,
+        _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,KC_LGUI,KC_LALT,JP_MHEN,        _______,        _______,        JP_HENK,JP_KANA,KC_APP, _______,_______,_______
+    ),
+    [_NUM] = LAYOUT_jp(
+        _______,_______,_______,_______,_______,_______,_______,XXXXXXX,KC_PSLS,KC_PSLS,KC_PAST,_______,_______,_______,_______,
+        _______,    _______,_______,_______,_______,_______,_______,KC_P7,  KC_P8,  KC_P9,  KC_PPLS,            _______,_______,
+        _______,    _______,_______,_______,_______,_______,_______,KC_P4,  KC_P5,  KC_P6,  XXXXXXX,_______,    _______,_______,
+        _______,        _______,_______,_______,_______,_______,_______,KC_P1,  KC_P2,  KC_P3,  KC_PENT,_______,_______,_______,
+        _______,_______,_______,_______,        _______,        SP_NRAI,        KC_P0,  KC_PDOT,_______,_______,_______,_______
+    ),
+    [_LOWER] = LAYOUT_jp(
+        KC_PAUS,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, KC_DEL,
+        KC_PSCR,    _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,            KC_END, KC_VOLU,
+        _______,    _______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_LEFT,KC_RGHT,    _______,KC_VOLD,
+        _______,        _______,_______,_______,_______,_______,_______,_______,_______,KC_PGDN,KC_DOWN,_______,KC_PGUP,_______,
+        _______,_______,_______,_______,        _______,        _______,         _______,_______,_______,KC_HOME,KC_PGDN,KC_END
+    ),
+    [_RAISE] = LAYOUT_jp(
+        KC_PAUS,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, KC_DEL,
+        KC_PSCR,    _______,_______,CT_E,   _______,_______,_______,_______,_______,_______,KC_PGUP,            _______,_______,
+        _______,    CT_A,   _______,KC_DEL, KC_RGHT,KC_ESC, KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,_______,_______,    _______,_______,
+        _______,        _______,_______,_______,_______,KC_LEFT,KC_PGDN,KC_ENT, _______,KC_MRWD,KC_MFFD,_______,KC_PGUP,_______,
+        _______,_______,_______,_______,        _______,        _______,        _______,_______,_______,KC_HOME,KC_PGDN,KC_END
+    ),
+    [_NUM_RAISE] = LAYOUT_jp(
+        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   JP_MINS,KC_BSPC,JP_CIRC,JP_YEN,
+        KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,               JP_AT,  JP_LBRC,
+        KC_LCTL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   JP_SCLN, KC_ENT,    JP_COLN,JP_RBRC,
+        S_CAP,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   JP_COMM,JP_DOT, C_SLSH, S_BSLS, KC_UP,  _______,
+        _______,_______,_______,_______,        _______,        _______,        _______,_______,_______,_______,_______,_______
+    ),
+    [_ADJUST] = LAYOUT_jp(
+        _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,    _______,WIN,    _______,RESET,  _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_RMOD,           _______,_______,
+        _______,    AU_TOG, CK_TOGG,MU_TOG, MU_MOD, _______,RGB_HUD,RGB_SAD,RGB_VAD,RGB_TOG,RGB_MOD,_______,    _______,_______,
+        _______,        CK_RST, CK_DOWN,CK_UP  ,_______,_______,NUM,     MAC,   _______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,        _______,        _______,        _______,_______,_______,_______,_______,_______
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+switch (keycode) {
+    case MAC: // Change default ayer --> Write to EEPROM
+        if (record->event.pressed) {
+            set_single_persistent_default_layer(_MAC);
+        }
+        return false;
+        break;
+    case WIN: // Change default ayer --> Write to EEPROM
+        if (record->event.pressed) {
+            set_single_persistent_default_layer(_WIN);
+        }
+        return false;
+        break;
+    default:
+        break;
+    }
+    return true;
+}
+
+//------------------------------------------------------------------------------
+// RGB Light settings
+#ifdef RGBLIGHT_LAYERS
+
+// Indicator LED settings
+#define JONES_LED_INDICATOR_INDEX 12        // where to start indicator
+#define JONES_LED_INDICATOR_COUNT 2         // how many leds for indicator
+#define JONES_LED_INDICATOR_CHANGE_COUNT 1  // how meny leds to change color for temporally layer
+#define JONES_LED_DIMMER_LEVEL 200          // brightness dimmer
+
+// for Default layer (= Base layer)
+const rgblight_segment_t PROGMEM my_mac_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_COUNT, HSV_WHITE - JONES_LED_DIMMER_LEVEL}
+);
+const rgblight_segment_t PROGMEM my_win_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_COUNT, HSV_BLUE - JONES_LED_DIMMER_LEVEL}
+);
+const rgblight_segment_t PROGMEM my_num_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_COUNT, HSV_YELLOW - JONES_LED_DIMMER_LEVEL}
+);
+
+// for temporal layer
+const rgblight_segment_t PROGMEM my_caps_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_MAGENTA - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_GREEN - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_CYAN - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_num_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_GOLD - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_RED - JONES_LED_DIMMER_LEVEL}
+);
+
+// Define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_mac_layer,
+    my_win_layer,
+    my_num_layer,
+    my_caps_layer,
+    my_lower_layer,
+    my_raise_layer,
+    my_num_raise_layer,
+    my_adjust_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+
+// Enabling and disabling lighting layers
+layer_state_t layer_state_set_user(layer_state_t state) {
+    state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+
+    rgblight_set_layer_state(2, layer_state_cmp(state, _NUM));
+    rgblight_set_layer_state(4, layer_state_cmp(state, _LOWER));
+    rgblight_set_layer_state(5, layer_state_cmp(state, _RAISE));
+    rgblight_set_layer_state(6, layer_state_cmp(state, _NUM_RAISE));
+    rgblight_set_layer_state(7, layer_state_cmp(state, _ADJUST));
+
+    return state;
+}
+
+// Enabling and disabling lighting layers for default layer
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _MAC));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _WIN));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _NUM));
+
+    return state;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(3, led_state.caps_lock);
+    return true;
+}
+#endif
+
+
+//------------------------------------------------------------------------------
+// Rotary Encoder
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder, Right side */
+        if (clockwise) {
+            tap_code(KC_VOLD);
+        } else {
+            tap_code(KC_VOLU);
+        }
+    }
+    if (index == 1) { /* Second encoder, Left side */
+        switch(biton32(layer_state)) {
+            case _LOWER:
+                if (clockwise) {
+                    rgblight_decrease_hue();
+                } else {
+                    rgblight_increase_hue();
+                }
+                break;
+            case _RAISE:
+                if (clockwise) {
+                    rgblight_decrease_val();
+                } else {
+                    rgblight_increase_val();
+                }
+                break;
+            case _ADJUST:
+                if (clockwise) {
+                    rgblight_step_reverse();
+                } else {
+                    rgblight_step();
+                }
+                break;
+            default:
+                if (clockwise) {
+                    tap_code(KC_VOLD);
+                } else {
+                    tap_code(KC_VOLU);
+                }
+                break;
+        }
+    }
+}
+
+
+//------------------------------------------------------------------------------
+// Tap Dance function
+
+
+typedef struct {
+    bool is_press_action;
+    uint8_t state;
+} tap;
+
+// Determine the current tap dance state
+uint8_t cur_dance(qk_tap_dance_state_t *state) {
+    if (state->count == 1) {
+        if (!state->pressed) {
+            return SINGLE_TAP;
+        } else {
+            return TAP_HOLD;
+        }
+    } else if (state->count == 2) {
+        if (!state->pressed) {
+            return DOUBLE_TAP;
+        } else {
+            return TAP_HOLD;
+        }
+    } else if (state->count == 3) {
+        if (!state->pressed) {
+            return TRIPLE_TAP;
+        } else {
+            return TAP_HOLD;
+        }
+    } else {
+        return 8; // Magic number. At some point this method will expand to work for more presses
+    }
+}
+
+// Initialize tap structure associated with example tap dance key
+static tap ql_tap_state = {
+    .is_press_action = true,
+    .state = 0
+};
+
+// Functions that control what our tap dance key does
+void ql_finished(qk_tap_dance_state_t *state, void *user_data) {
+    ql_tap_state.state = cur_dance(state);
+    switch(state->keycode) {
+        case TD(TD_ESC_NUM): // ESC key action
+            switch (ql_tap_state.state) {
+                case SINGLE_TAP:
+                case DOUBLE_TAP:
+                    // ESC
+                    tap_code(KC_ESC);
+                    break;
+                case TAP_HOLD:
+                    // temporal layer change
+                    layer_on(_NUM);
+                    break;
+                case TRIPLE_TAP:
+                    // toggle layer
+                    // Check to see if the layer is already set
+                    if (layer_state_is(_NUM)) {
+                        // If already set, then switch it off
+                        layer_off(_NUM);
+                    } else {
+                        // If not already set, then switch the layer on
+                        layer_on(_NUM);
+                    }
+                    break;
+            }
+            break;
+    }
+}
+
+void ql_reset(qk_tap_dance_state_t *state, void *user_data) {
+    switch(state->keycode) {
+        case TD(TD_ESC_NUM):
+            // If the key was held down and now is released then switch off the layer
+            if (ql_tap_state.state == TAP_HOLD) {
+                layer_off(_NUM);
+            }
+            ql_tap_state.state = 0;
+            break;
+    }
+}
diff --git a/keyboards/jones/v03_1/keymaps/default_jp/readme.md b/keyboards/jones/v03_1/keymaps/default_jp/readme.md
new file mode 100644
index 0000000000..0cb2c18a4c
--- /dev/null
+++ b/keyboards/jones/v03_1/keymaps/default_jp/readme.md
@@ -0,0 +1 @@
+# Defalut JP-style keymap for Jones
diff --git a/keyboards/jones/v03_1/keymaps/default_jp/rules.mk b/keyboards/jones/v03_1/keymaps/default_jp/rules.mk
new file mode 100644
index 0000000000..15d7e0624c
--- /dev/null
+++ b/keyboards/jones/v03_1/keymaps/default_jp/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes		# Enable Tap Dance