From c4a1f4d8eca1ced94da42bebec53bc03cc4290e9 Mon Sep 17 00:00:00 2001 From: Takeshi Nishio Date: Fri, 18 Sep 2020 07:20:16 +0900 Subject: [PATCH] =?UTF-8?q?Update=20=E3=82=AD=E3=83=BC=E3=83=9E=E3=83=88?= =?UTF-8?q?=E3=83=AA=E3=82=AF=E3=82=B9=E3=81=AB=E5=BE=8C=E3=81=8B=E3=82=89?= =?UTF-8?q?JP=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=99=E3=82=8B=E3=81=9F?= =?UTF-8?q?=E3=82=81=E3=80=81ANSI=E7=94=A8=E3=81=AB=E8=A1=A8=E8=A8=98?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jones/v.0.3/keymaps/default_ansi/keymap.c | 16 ++++++++-------- keyboards/jones/v.0.3/v.0.3.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/jones/v.0.3/keymaps/default_ansi/keymap.c b/keyboards/jones/v.0.3/keymaps/default_ansi/keymap.c index 743a3cd39f0..7e2832f0eb7 100644 --- a/keyboards/jones/v.0.3/keymaps/default_ansi/keymap.c +++ b/keyboards/jones/v.0.3/keymaps/default_ansi/keymap.c @@ -115,49 +115,49 @@ qk_tap_dance_action_t tap_dance_actions[] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_MAC] = LAYOUT( + [_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, SCLN_M, KC_ENT, XXXXXXX,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,XXXXXXX,KC_LALT,KC_LGUI, SP_SFT, SP_RAI, KC_RGUI,A_IME_M,XXXXXXX,KC_LEFT,KC_DOWN,KC_RGHT \ ), - [_WIN] = LAYOUT( + [_WIN] = LAYOUT_ANSI( _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______, \ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______, \ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ _______,_______,KC_LGUI,KC_LALT, _______, _______, A_IME_W,KC_APP, _______,_______,_______,_______ \ ), - [_NUM] = LAYOUT( + [_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( + [_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,_______, \ ADJUST, _______,_______,_______, _______, ADJUST, _______,_______,_______,KC_HOME,KC_PGDN,KC_END \ ), - [_RAISE] = LAYOUT( + [_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,ADJUST, \ _______,_______,_______,_______, _______, _______, _______,_______,_______,KC_HOME,KC_PGDN,KC_END \ ), - [_NUM_RAISE] = LAYOUT( + [_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_SCLN,KC_QUOT, \ S_CAP, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, S_SLS, KC_RSFT,XXXXXXX,ADJUST, \ - _______,_______,_______,_______, _______, ADJUST, _______,_______,_______,_______,_______,_______ \ + _______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______ \ ), - [_ADJUST] = LAYOUT( + [_ADJUST] = LAYOUT_ANSI( _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ _______, _______,WIN, _______,RESET, _______,_______,_______,_______,_______,_______,_______, _______,_______, \ _______, _______,_______,_______,_______,_______,_______,_______,RGB_M_P,RGB_TOG,RGB_MOD,_______, _______,_______, \ diff --git a/keyboards/jones/v.0.3/v.0.3.h b/keyboards/jones/v.0.3/v.0.3.h index 18d2f25b0fe..668fd6a4543 100644 --- a/keyboards/jones/v.0.3/v.0.3.h +++ b/keyboards/jones/v.0.3/v.0.3.h @@ -26,7 +26,7 @@ * The second converts the arguments into a two-dimensional array which * represents the switch matrix. */ -#define LAYOUT( \ +#define LAYOUT_ANSI( \ k17, k27, k37, k47, k57, k67, k76, k86, k96, ka6, kb6, k81, k91, ka1, kb1, \ k18, k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, k92, ka2, kb2, \ k19, k39, k49, k59, k69, k79, k89, k98, ka8, kb8, k83, k93, ka3, kb3, \