From f4ff7cdc58e33f318876780cafca174cf8e8cdc6 Mon Sep 17 00:00:00 2001 From: Takeshi Nishio Date: Mon, 12 Oct 2020 05:56:11 +0900 Subject: [PATCH] =?UTF-8?q?update=20FA=E7=94=A8=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jones/v.0.3/keymaps/default_fa/config.h | 8 +- .../jones/v.0.3/keymaps/default_fa/keymap.c | 391 +++++++++++++++--- .../jones/v.0.3/keymaps/default_fa/readme.md | 2 +- .../jones/v.0.3/keymaps/default_fa/rules.mk | 10 +- 4 files changed, 352 insertions(+), 59 deletions(-) diff --git a/keyboards/jones/v.0.3/keymaps/default_fa/config.h b/keyboards/jones/v.0.3/keymaps/default_fa/config.h index 3c5fc45e9c6..c4f84726c8c 100644 --- a/keyboards/jones/v.0.3/keymaps/default_fa/config.h +++ b/keyboards/jones/v.0.3/keymaps/default_fa/config.h @@ -22,4 +22,10 @@ // time for long press #define TAPPING_TERM 200 -#define AUDIO_CLICKY +// music map for music-mode +// #define MUSIC_MAP + +// disable music-mode on FA +#define NO_MUSIC_MODE + +#define OLED_TIMEOUT 10000 diff --git a/keyboards/jones/v.0.3/keymaps/default_fa/keymap.c b/keyboards/jones/v.0.3/keymaps/default_fa/keymap.c index 4c33bf6274c..d9c8d0ed853 100644 --- a/keyboards/jones/v.0.3/keymaps/default_fa/keymap.c +++ b/keyboards/jones/v.0.3/keymaps/default_fa/keymap.c @@ -14,6 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H +#include "keymap_jp.h" #ifdef RGBLIGHT_ENABLE #include "rgblight.h" @@ -25,24 +26,72 @@ extern rgblight_config_t rgblight_config; // Defines names for use in layer keycodes and the keymap enum layer_number { _MAC = 0, + _WIN, + _NUM, _LOWER, _RAISE, + _NUM_RAISE, _ADJUST }; // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { MAC = SAFE_RANGE, + WIN, + NUM, LOWER, RAISE, + NUM_RAISE, ADJUST, + ALT_US, + ALT_JP, A_IME_M, A_IME_W, }; +// Tap Dance +enum tap_dances{ + TD_LSFT_CAPS = 0, + TD_ESC_NUM, + TD_SCLN_MINS, +}; + +// Tap Dance state +// for toggle layer by ESC +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); +void ql_each(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), + [TD_SCLN_MINS] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, ql_finished, ql_reset, 500), +}; + +#define ESC_NUM TD(TD_ESC_NUM) +#define S_CAP TD(TD_LSFT_CAPS) +#define SCLN_M TD(TD_SCLN_MINS) +#define SP_LOW LT(_LOWER, KC_SPC) #define SP_RAI LT(_RAISE, KC_SPC) +#define SP_NRAI LT(_NUM_RAISE, KC_SPC) +#define SP_GUI MT(MOD_LGUI, KC_SPC) #define SP_SFT MT(MOD_LSFT, KC_SPC) #define S_SLS RSFT_T(KC_SLSH) +#define S_BSLS RSFT_T(KC_RO) +#define C_SCLN RCTL_T(KC_SCLN) +#define C_QUOT RCTL_T(KC_QUOT) #define C_SLSH RCTL_T(KC_SLSH) #define CT_E LCTL(KC_E) #define CT_A LCTL(KC_A) @@ -51,22 +100,46 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAC] = LAYOUT_FA( - 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,KC_QUOT, \ - KC_LSFT, 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, \ + 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_BSPC,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_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, KC_EQL, 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,A_IME_M,KC_LANG1,KC_LEFT,KC_DOWN,KC_RGHT, \ KC_NLCK, KC_PSLS, KC_PAST, KC_PEQL, KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, \ KC_P7, KC_P8, KC_P9, KC_PMNS, \ KC_P4, KC_P5, KC_P6, KC_PPLS, \ KC_P1, KC_P2, KC_P3, \ KC_P0, KC_PDOT, KC_PENT \ ), + [_WIN] = LAYOUT_FA( + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ + _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______, \ + _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______, \ + _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ + _______,KC_MHEN,KC_LGUI,KC_LALT, _______, _______, A_IME_W,KC_APP,KC_HENK, _______,_______,_______, \ + _______,_______,_______,_______, _______,_______,_______,_______, \ + _______,_______,_______,_______, \ + _______,_______,_______,_______, \ + _______,_______,_______, \ + _______, _______,_______ \ + ), + [_NUM] = LAYOUT_FA( + _______,_______,_______,_______,_______,_______,_______,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_FA( 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_PSCR, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, KC_INS, KC_DEL, \ + _______, _______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_LEFT,KC_UP, KC_BSLS,KC_GRV, \ + _______, _______,_______,_______,_______,_______,_______,_______,_______,KC_PGDN,KC_DOWN,KC_RGHT,KC_PGUP,_______, \ ADJUST, _______,_______,_______, _______, ADJUST, _______,_______,_______,KC_HOME,KC_PGDN,KC_END, \ _______,_______,_______,_______, _______,_______,_______,_______, \ _______,_______,_______,_______, \ @@ -76,8 +149,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_RAISE] = LAYOUT_FA( 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_PSCR, _______,_______,CT_E, _______,_______,_______,_______,_______,_______,KC_PGUP, KC_INS, KC_DEL, \ + _______, CT_A, _______,KC_DEL, KC_RGHT,KC_ESC, KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,KC_MINS,KC_INS, KC_BSLS,KC_GRV, \ _______, _______,_______,_______,_______,KC_LEFT,KC_PGDN,KC_ENT, _______,KC_MRWD,KC_MFFD,_______,KC_PGUP,ADJUST, \ _______,_______,_______,_______, _______, _______, _______,_______,_______,KC_HOME,KC_PGDN,KC_END, \ _______,_______,_______,_______, _______,_______,_______,_______, \ @@ -86,11 +159,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______,_______,_______, \ _______, _______,_______ \ ), + [_NUM_RAISE] = LAYOUT_FA( + 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_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, S_BSLS, XXXXXXX,ADJUST, \ + _______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______, \ + _______,_______,_______,_______, _______,_______,_______,_______, \ + _______,_______,_______,_______, \ + _______,_______,_______,_______, \ + _______,_______,_______, \ + _______, _______,_______ \ + ), [_ADJUST] = LAYOUT_FA( _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ - _______, _______,_______,_______,RESET, _______,_______,_______,_______,_______,_______,_______, _______,_______, \ - _______, _______,_______,_______,_______,_______,_______,_______,RGB_M_P,RGB_TOG,RGB_MOD,_______, _______,_______, \ - _______, _______,_______,_______,_______,_______,_______,MAC, _______,_______,_______,_______,_______,_______, \ + _______, _______,WIN, _______,RESET, _______,_______,_______,_______,_______,_______, _______,_______, \ + _______, AU_TOG, CK_TOGG,MU_TOG, MU_MOD, _______,_______,_______,RGB_M_P,RGB_TOG,RGB_MOD,_______, _______,_______, \ + _______, CK_RST, CK_DOWN,CK_UP ,_______,_______,TG(_NUM),MAC, _______,_______,_______,_______,_______,_______, \ _______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______, \ _______,_______,_______,_______, _______,_______,_______,_______, \ _______,_______,_______,_______, \ @@ -100,6 +185,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; +// const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_FA( +// _______,37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, XXXXXXX,XXXXXXX,XXXXXXX, +// _______,24, 25, 26, 27, 28, 29, 30, 31, 32, 33, XXXXXXX,XXXXXXX, +// _______,11, 12, 13, 14, 15, 16, 17, 18, 19, 20, XXXXXXX,XXXXXXX,XXXXXXX, +// _______,0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, XXXXXXX,XXXXXXX, +// XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX +// ); + // レイヤーキーを変換・無変換キーと共用する際に動作を改善する。 static bool lower_pressed = false; static uint16_t lower_pressed_time = 0; @@ -120,6 +213,12 @@ switch (keycode) { } return false; break; + case WIN: // Write default layer to EEPROM + if (record->event.pressed) { + set_single_persistent_default_layer(_WIN); + } + return false; + break; case LOWER: if (record->event.pressed) { lower_pressed = true; @@ -245,33 +344,46 @@ switch (keycode) { // 1st LED const rgblight_segment_t PROGMEM my_mac_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 1, HSV_WHITE} + {0 + 4 , 2, HSV_WHITE - 200} +); +const rgblight_segment_t PROGMEM my_win_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {0 + 4 , 2, HSV_BLUE - 200} +); +const rgblight_segment_t PROGMEM my_num_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {0 + 4 , 2, HSV_YELLOW - 200} ); // 2nd LED const rgblight_segment_t PROGMEM my_caps_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 1, HSV_MAGENTA} + {1 + 4 , 1, HSV_MAGENTA - 200} ); const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 1, HSV_GREEN} + {1 + 4 , 1, HSV_GREEN - 200} ); const rgblight_segment_t PROGMEM my_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 1, HSV_CYAN} + {1 + 4 , 1, HSV_CYAN - 200} +); + +const rgblight_segment_t PROGMEM my_num_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {1 + 4 , 1, HSV_GOLD - 200} ); const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 1, HSV_RED} + {1 + 4 , 1, HSV_RED - 200} ); // 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 ); @@ -282,8 +394,10 @@ void keyboard_post_init_user(void) { // Enabling and disabling lighting layers layer_state_t layer_state_set_user(layer_state_t state) { + 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; @@ -292,9 +406,13 @@ layer_state_t layer_state_set_user(layer_state_t 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)); if (layer_state_cmp(state, _MAC)) { current_default_layer = _MAC; + } else if (layer_state_cmp(state, _WIN)) { + current_default_layer = _WIN; } return state; @@ -316,7 +434,7 @@ bool led_update_user(led_t led_state) { //------------------------------------------------------------------------------ // Rotary Encoder void encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder, Right side or EXT1*/ + if (index == 0) { /* First encoder, Right side */ if (clockwise) { tap_code(KC_VOLD); } else { @@ -330,45 +448,218 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_VOLU); } } - if (index == 2) { /* Third encoder, EXT2 */ - if (clockwise) { - tap_code(KC_VOLD); - } else { - tap_code(KC_VOLU); - } - } - if (index == 3) { /* Fourth encoder, EXT3 */ - if (clockwise) { - tap_code(KC_VOLD); - } else { - tap_code(KC_VOLU); - } - } } +//------------------------------------------------------------------------------ +// Tap Dance function + +// ESCキーの動作を、次のようにする設定 +// シングルタップ：ESC +// シングルタップしてホールド：NUMレイヤー +// トリプルタップ：Numレイヤーをトグル +// NOTE:ESCを連打（＝タブルタップ）して、Numレイヤーになるのを防止するためトリプルに。 + +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) return TRIPLE_TAP; + 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_each(qk_tap_dance_state_t *state, void *user_data) { +} + +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): + switch (ql_tap_state.state) { + case SINGLE_TAP: + case DOUBLE_TAP: + tap_code(KC_ESC); + break; + case TAP_HOLD: + layer_on(_NUM); + break; + case TRIPLE_TAP: + // 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; + + case TD(TD_SCLN_MINS): + switch (ql_tap_state.state) { + case SINGLE_TAP: + case TAP_HOLD: + register_code(KC_SCLN); + break; + case DOUBLE_TAP: + register_code(KC_MINS); + 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; + + case TD(TD_SCLN_MINS): + switch (ql_tap_state.state) { + case SINGLE_TAP: + case TAP_HOLD: + unregister_code(KC_SCLN); + break; + case DOUBLE_TAP: + unregister_code(KC_MINS); + break; + } + break; + } +} + //------------------------------------------------------------------------------ #ifdef OLED_DRIVER_ENABLE -void oled_task_user(void) { - // Host Keyboard Layer Status - oled_write_P(PSTR("Layer: "), false); +static void render_logo(void) { + static const char PROGMEM my_logo[] = { + // // '背景', 128x32px + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf0, 0x38, + // 0x18, 0x1c, 0x0c, 0x0c, 0xcc, 0xfc, 0xfc, 0xfc, 0xfc, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x0f, 0x0f, 0x00, + // 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0x3f, 0x03, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfc, 0x3e, 0x0e, + // 0x06, 0x07, 0x0f, 0x1f, 0xff, 0xfe, 0xfc, 0xf8, 0x00, 0x30, 0x38, 0x1c, 0xce, 0xfe, 0xfe, 0xff, + // 0xff, 0x70, 0x38, 0x1c, 0x8e, 0xfe, 0xff, 0xff, 0x7f, 0x0c, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf8, + // 0x7c, 0x1e, 0x8e, 0xc7, 0xff, 0xff, 0x7e, 0x3e, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0xfe, 0xfe, + // 0xc7, 0x87, 0x0f, 0x1e, 0x1e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, + // 0xf0, 0xff, 0xff, 0xff, 0x1f, 0x01, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xe1, 0x80, 0x00, + // 0x80, 0xc0, 0xe0, 0xfe, 0x7f, 0x3f, 0x1f, 0x03, 0x00, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0x3f, 0x03, + // 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xc7, 0xe0, 0xe0, 0x60, 0xf8, 0xff, 0xff, 0xff, 0xe7, + // 0xc7, 0xc3, 0xc3, 0xe1, 0xe1, 0x70, 0x30, 0x00, 0xe0, 0xf0, 0xf0, 0xe0, 0x00, 0x03, 0x07, 0x8f, + // 0xff, 0xff, 0xfe, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x7c, 0x7c, 0x78, 0x70, 0x70, 0x70, 0x78, 0x3e, 0x1f, + // 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, + // 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, + // 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + // 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + // '名称未設定', 128x32px + // '名称未設定', 128x32px + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x60, 0x20, 0x20, 0x20, 0xe0, + 0xe0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0c, 0x00, 0x00, 0x80, 0xf8, 0xff, 0x1f, + 0x01, 0x00, 0x80, 0xe0, 0xf0, 0x18, 0x0c, 0x04, 0x04, 0x1c, 0xfc, 0xf8, 0x00, 0x00, 0x10, 0x08, + 0xec, 0xfc, 0x7c, 0x20, 0x10, 0x08, 0xcc, 0xfc, 0xfc, 0x08, 0x00, 0x00, 0x80, 0xe0, 0x70, 0x18, + 0x8c, 0xc4, 0x7c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x70, 0xf8, 0xc4, 0x84, 0x0c, 0x1c, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0x3f, 0x0f, 0x00, 0x00, + 0x00, 0x00, 0x3f, 0x3f, 0x78, 0x60, 0x60, 0x20, 0x30, 0x1e, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x3e, + 0x3f, 0x07, 0x00, 0x00, 0x00, 0x7c, 0x7f, 0x27, 0x30, 0x10, 0x00, 0x1c, 0x7f, 0x7f, 0x61, 0x21, + 0x30, 0x10, 0x18, 0x08, 0x00, 0x38, 0x38, 0x60, 0x40, 0x41, 0x23, 0x3f, 0x1f, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x02, 0x02, 0x02, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - switch (get_highest_layer(layer_state)) { - case _MAC: - oled_write_P(PSTR("Mac\n"), false); - break; - default: - // Or use the write_ln shortcut over adding '\n' to the end of your string - oled_write_ln_P(PSTR("Undefined"), false); - } - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + // oled_write_P(my_logo, false); + oled_write_raw_P(my_logo, sizeof(my_logo)); } + +oled_rotation_t oled_init_user(oled_rotation_t rotation) { + return OLED_ROTATION_180; // flips the display 180 degrees +} + +void oled_task_user(void) { + // // Host Keyboard Layer Status + // oled_write_P(PSTR("Layer: "), false); + // + // switch (get_highest_layer(layer_state)) { + // case _MAC: + // oled_write_P(PSTR("Mac\n"), false); + // break; + // case _LOWER: + // oled_write_P(PSTR("Lower\n"), false); + // break; + // default: + // // Or use the write_ln shortcut over adding '\n' to the end of your string + // oled_write_ln_P(PSTR("Undefined"), false); + // } + // + // // Host Keyboard LED Status + // led_t led_state = host_keyboard_led_state(); + // // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + render_logo(); + +} + + + #endif //------------------------------------------------------------------------------ diff --git a/keyboards/jones/v.0.3/keymaps/default_fa/readme.md b/keyboards/jones/v.0.3/keymaps/default_fa/readme.md index 68873532dd8..5a089744bbd 100644 --- a/keyboards/jones/v.0.3/keymaps/default_fa/readme.md +++ b/keyboards/jones/v.0.3/keymaps/default_fa/readme.md @@ -1 +1 @@ -# Defalut FA (=Full Armor) keymap for jones +# Default JP-style keymap for jones diff --git a/keyboards/jones/v.0.3/keymaps/default_fa/rules.mk b/keyboards/jones/v.0.3/keymaps/default_fa/rules.mk index 102827673b0..807e7ad3ffd 100644 --- a/keyboards/jones/v.0.3/keymaps/default_fa/rules.mk +++ b/keyboards/jones/v.0.3/keymaps/default_fa/rules.mk @@ -3,14 +3,10 @@ # Add Link Time Optimization option. # Build Options -# change yes to no to disable +# change yes to no to disableß # MOUSEKEY_ENABLE = no # Mouse keys -AUDIO_ENABLE = yes # Audio output -TAP_DANCE_ENABLE = no # Tap Dance -OLED_DRIVER_ENABLE = yes -# EXTRAKEY_ENABLE = no # reduce 500 bytes - - +AUDIO_ENABLE = yes # Audio outputß +OLED_DRIVER_ENABLE = yes # OLED EXTRAFLAGS += -flto