diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..e9772fc2 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,42 @@ +{ + "editor.minimap.enabled": false, + "terminal.integrated.copyOnSelection": true, + "terminal.integrated.defaultProfile.windows": "Git Bash", + "explorer.confirmDelete": false, + "remote.SSH.remotePlatform": { + "192.168.1.250": "linux", + "192.168.1.206": "linux" + }, + "git.enableSmartCommit": true, + "extensions.ignoreRecommendations": true, + "terminal.integrated.automationProfile.windows": {}, + "terminal.integrated.automationProfile.linux": {}, + "terminal.integrated.profiles.windows": { + + "PowerShell": { + "source": "PowerShell", + "icon": "terminal-powershell" + }, + "Command Prompt": { + "path": [ + "${env:windir}\\Sysnative\\cmd.exe", + "${env:windir}\\System32\\cmd.exe" + ], + "args": [], + "icon": "terminal-cmd" + }, + "Git Bash": { + "source": "Git Bash" + }, + "QMK_MSYS": { + "path": "C:/QMK_MSYS/usr/bin/bash.exe", + "env": { + "MSYSTEM": "MINGW64", + "CHERE_INVOKING": "1" + }, + "args": ["--login"] + }, + "terminal.integrated.cursorStyle": "line" + }, + "git.confirmSync": false +} \ No newline at end of file diff --git a/keyboards/boardsource/unicorne/keymaps/markstos/keymap.c b/keyboards/boardsource/unicorne/keymaps/markstos/keymap.c index d8328654..41963732 100644 --- a/keyboards/boardsource/unicorne/keymaps/markstos/keymap.c +++ b/keyboards/boardsource/unicorne/keymaps/markstos/keymap.c @@ -31,6 +31,7 @@ combo_t key_combos[COMBO_COUNT] = { #define _LOWER 1 #define _RAISE 2 #define _FUNC 3 +#define _SYSTEM 4 // For _QWERTY layer #define OSM_LCTL OSM(MOD_LCTL) @@ -94,6 +95,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, FUNC , XXXXXXX\ //`--------------------------' `--------------------------' + ), + + [_SYSTEM] = LAYOUT_split_3x6_3( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + QK_BOOT, _______, _______, _______, _______, _______, RGB_VAI , RGB_HUI, RGB_SAI, RGB_MOD, RGB_TOG,_______,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + EE_CLR, _______, _______, _______, _______, _______, RGB_VAD, RGB_HUD, RGB_SAD, RGB_RMOD, CK_TOGG,_______,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, _______, _______, _______, _______, _______, _______ , _______, _______, _______, _______,_______,\ + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + _______, _______, _______, _______, FUNC , _______\ + //`--------------------------' `--------------------------' ) }; diff --git a/users/qmk_boardsource_unicorne_default_keymap.c.code-workspace b/users/qmk_boardsource_unicorne_default_keymap.c.code-workspace new file mode 100644 index 00000000..d4781a9a --- /dev/null +++ b/users/qmk_boardsource_unicorne_default_keymap.c.code-workspace @@ -0,0 +1,44 @@ +{ + "folders": [ + { + "path": ".." + } + ], + "settings": { + "terminal.integrated.copyOnSelection": true, + "terminal.integrated.defaultProfile.windows": "Git Bash", + "explorer.confirmDelete": false, + "extensions.ignoreRecommendations": true, + "terminal.integrated.automationProfile.windows": {}, + "terminal.integrated.automationProfile.linux": {}, + "terminal.integrated.profiles.windows": { + "PowerShell": { + "source": "PowerShell", + "icon": "terminal-powershell" + }, + "Command Prompt": { + "path": [ + "${env:windir}\\Sysnative\\cmd.exe", + "${env:windir}\\System32\\cmd.exe" + ], + "args": [], + "icon": "terminal-cmd" + }, + "Git Bash": { + "source": "Git Bash" + }, + "QMK_MSYS": { + "path": "C:/QMK_MSYS/usr/bin/bash.exe", + "env": { + "MSYSTEM": "MINGW64", + "CHERE_INVOKING": "1" + }, + "args": [ + "--login" + ] + }, + "terminal.integrated.cursorStyle": "line" + }, + "git.confirmSync": false + } +} \ No newline at end of file diff --git a/users/unicorne-default-keymap.c b/users/unicorne-default-keymap.c new file mode 100644 index 00000000..cb4db213 --- /dev/null +++ b/users/unicorne-default-keymap.c @@ -0,0 +1,27 @@ +/* THIS FILE WAS GENERATED! + * + * This file was generated by qmk json2c. You may or may not want to + * edit it directly. + */ + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_3x6_3( \ + 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_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, 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_ESC, \ + KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_RALT), + + [1] = LAYOUT_split_3x6_3(_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [2] = LAYOUT_split_3x6_3(\ + QK_BOOT, _______, _______, _______, _______, _______, RGB_VAI, RGB_HUI, RGB_SAI, RGB_MOD, RGB_TOG, _______, \ + EE_CLR, _______, _______, _______, _______, _______, RGB_VAD, RGB_HUD, RGB_SAD, RGB_RMOD, CK_TOGG, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______) +}; + +#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + +}; +#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE \ No newline at end of file