Skip to content

Commit

Permalink
Bluetooth接続Win辞書式、Linux辞書式
Browse files Browse the repository at this point in the history
  • Loading branch information
Satoru NAKAYA authored and Satoru NAKAYA committed Dec 30, 2023
1 parent b1c43d8 commit 0bb1842
Show file tree
Hide file tree
Showing 5 changed files with 341 additions and 339 deletions.
6 changes: 3 additions & 3 deletions keyboards/ble_micro_pro/keymaps/naginata_v15m/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ enum custom_keycodes {
const key_string_map_t custom_keys_user =
{
.start_kc = LOWER,
// .end_kc = RAISE,
// .key_strings = "LOWER\0RAISE\0"
// .end_kc = RAISE,
// .key_strings = "LOWER\0RAISE\0"
.end_kc = NG_KOTI,
.key_strings = "LOWER\0RAISE\0NG_Q\0NG_W\0NG_E\0NG_R\0NG_T\0NG_Y\0NG_U\0NG_I\0NG_O\0NG_P\0NG_A\0NG_S\0NG_D\0NG_F\0NG_G\0NG_H\0NG_J\0NG_K\0NG_L\0NG_SCLN\0NG_Z\0NG_X\0NG_C\0NG_V\0NG_B\0NG_N\0NG_M\0NG_COMM\0NG_DOT\0NG_SLSH\0NG_SHFT\0NG_SHFT2\0NG_ON\0NG_OFF\0NG_CLR\0NGSW_WIN\0NGSW_MAC\0NGSW_LNX\0NGSW_MD\0NGSW_IOS\0NG_MLV\0NG_SHOS\0NG_TAYO\0NG_KOTI\0"
.key_strings = "LOWER\0RAISE\0NG_Q\0NG_W\0NG_E\0NG_R\0NG_T\0NG_Y\0NG_U\0NG_I\0NG_O\0NG_P\0NG_A\0NG_S\0NG_D\0NG_F\0NG_G\0NG_H\0NG_J\0NG_K\0NG_L\0NG_SCLN\0NG_Z\0NG_X\0NG_C\0NG_V\0NG_B\0NG_N\0NG_M\0NG_COMM\0NG_DOT\0NG_SLSH\0NG_SHFT\0NG_SHFT2\0NG_ON\0NG_OFF\0NG_CLR\0NGSW_WIN\0NGSW_MAC\0NGSW_LNX\0NGSW_IOS\0NG_MLV\0NG_SHOS\0NG_TAYO\0NG_KOTI\0"
};

enum layers {
Expand Down
10 changes: 5 additions & 5 deletions users/naginata_v15m/gpk60_51r/KEYMAP_naginata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "NG_SHFT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS","KC_TRNS","KC_TRNS"],

[ "KC_TRNS", "Q", "W", "E", "R", "T", ":", "KC_P7", "KC_P8", "KC_P9", "KC_PSLS", "KC_PMNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "A", "S", "D", "F", "G", "KC_PEQL", "KC_P4", "KC_P5", "KC_P6", "KC_PPLS", "KC_PAST", "KC_TRNS",
"KC_TRNS", "A", "S", "D", "F", "G", "=", "KC_P4", "KC_P5", "KC_P6", "KC_PPLS", "KC_PAST", "KC_TRNS",
"KC_TRNS", "Z", "X", "C", "V", "B", "KC_P0", "KC_P1", "KC_P2", "KC_P3", "KC_PDOT", "%", "KC_TRNS",
"TO(0)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "LT(4,KC_PENT)", "KC_TRNS", "KC_TRNS", "KC_TRNS","KC_TRNS","KC_TRNS"],
"TO(0)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "LT(4,KC_PENT)", "\,", "KC_TRNS", "KC_TRNS","KC_TRNS","KC_TRNS"],

[ "`", "^", "]", "&", "[", "\\", ":", "7", "8", "9", "KC_PSLS", "KC_PMNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "!", "@", "|", "(", ")", "=", "4", "5", "6", "KC_PPLS", "KC_PAST", "KC_TRNS",
"KC_TRNS", "~", "$", "#", "{", "}", "0", "1", "2", "3", "KC_PDOT", "%", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "LT(5,KC_PENT)", "KC_TRNS", "KC_TRNS", "KC_TRNS","KC_TRNS","KC_TRNS"],

[ "KC_PWR", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_MS_L", "KC_MS_D", "KC_MS_U", "KC_MS_R", "KC_BTN1", "KC_BTN2", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT", "KC_BTN3","SGUI(KC_4)", "KC_TRNS",
"KC_TRNS", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT", "KC_BTN3","SGUI(KC_5)", "KC_TRNS",
"KC_TRNS", "KC_F11", "KC_F12", "KC_PSCR", "KC_SLCK", "KC_PAUS", "KC_HOME", "KC_PGDN", "KC_PGUP", "KC_END", "KC_WH_D", "KC_WH_U", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(5)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS","KC_TRNS","KC_TRNS"],

[ "RESET", "KC_NO", "KC_NO", "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO",
[ "RESET", "KC_NO", "KC_NO", "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_NO","NGSW_IOS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO",
"RGB_TOG", "RGB_HUI", "RGB_SAI", "RGB_VAI", "KC_VOLU", "KC_BRIU", "KC_NO", "NG_CLR", "NG_KOTI", "NG_MLV", "KC_NO", "KC_NO", "KC_NO",
"RGB_MOD", "RGB_HUD", "RGB_SAD", "RGB_VAD", "KC_VOLD", "KC_BRID", "KC_NO", "NGSW_MD","NGSW_IOS", "NG_TAYO", "NG_SHOS", "KC_RSFT", "KC_NO",
"RGB_MOD", "RGB_HUD", "RGB_SAD", "RGB_VAD", "KC_VOLD", "KC_BRID", "NGSW_WIN","NGSW_MAC","NGSW_LNX", "NG_TAYO", "NG_SHOS", "KC_RSFT", "KC_NO",
"KC_NO", "KC_NO", "MO(6)", "KC_TRNS", "ENT_SLP", "KC_TRNS", "MO(6)", "KC_NO", "KC_NO", "KC_NO", "KC_NO"],

[ "ENT_DFU", "DEL_ID0", "DEL_ID1", "DEL_ID2", "DEL_ID3", "DEL_ID4", "DEL_ID5", "DEL_ID6", "DEL_ID7", "KC_NO", "KC_NO", "DELBNDS", "KC_NO", "KC_NO",
Expand Down
6 changes: 2 additions & 4 deletions users/naginata_v15m/naginata.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,8 @@ void ng_saihenkan(void);
void ng_eof(void);
void ng_ime_cancel(void);
void ng_ime_complete(void);
#ifdef NG_BMP
void dic_send_string(const char *);
void dic_send_string_with_cut_paste(const char *);
#endif

void ng_send_kana(const char *str);

#define NG_SEND_KANA(string) ng_send_kana(PSTR(string))
Expand Down Expand Up @@ -163,7 +160,6 @@ typedef enum naginata_keycodes {
NGSW_MAC,
NGSW_LNX,
#ifdef NG_BMP
NGSW_MD,
NGSW_IOS,
#endif
NG_MLV,
Expand All @@ -190,5 +186,7 @@ user_config_t naginata_config;
#define NG_WIN 1
#define NG_MAC 2
#define NG_LINUX 3
#define NG_WIN_DIC 251
#define NG_MAC_DIC 252
#define NG_LINUX_DIC 253
#define NG_IOS 254
Loading

0 comments on commit 0bb1842

Please sign in to comment.