Browse Source
Wanleg tuneup / additions (#5752)
* change split keyboard tapping term in userspace * fix 5x15 layout numpad movement * minor changes for Nori setup * edit based on 40percentclub refactor change * fix gherkin due to refactor * kbd6x wanleg keymap * kbd6x edits * kbd6x tweak * fn / backlight layer * fix jj40 rgb hex issue * wanleg gherkin lighting * 4x12 layout cleanup * move kbd6x to new kbdfans directory * minor edit related to new kbdfans directory * mac layout for kbd6x * gherkin flip option * tweak tapping term on lets_split * edit for keebio board coalescing * update user readme with git hints * wanleg miniaxe keymap * testing Permissive Hold instead of Mod Tap Interrupt * wiring names * kbd6x keymap * change default backlight behaviour on kbd6x * userspace underglow * userspace underglow * underglow tweaks * user readme update * more layer underglow tweaks * fix userspace for non-underglow-enabled boards * readme edits * readme edits * readme edits * readme edits * Update readme.md * Update readme.md * readme edits * readme edits * update keymap picturepull/5754/head
wanleg
5 years ago
committed by
MechMerlin
MechMerlin
18 changed files with 439 additions and 71 deletions
Split View
Diff Options
-
+82 -0keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c
-
+3 -0keyboards/kbdfans/kbd6x/keymaps/wanleg/rules.mk
-
+11 -0keyboards/miniaxe/keymaps/wanleg/config.h
-
+49 -0keyboards/miniaxe/keymaps/wanleg/keymap.c
-
+18 -0keyboards/miniaxe/keymaps/wanleg/rules.mk
-
+18 -1layouts/community/ortho_3x10/wanleg/config.h
-
+5 -0layouts/community/ortho_3x10/wanleg/keymap.c
-
+4 -4layouts/community/ortho_3x10/wanleg/readme.md
-
+0 -2layouts/community/ortho_3x10/wanleg/rules.mk
-
+7 -0layouts/community/ortho_4x12/wanleg/config.h
-
+8 -9layouts/community/ortho_4x12/wanleg/keymap.c
-
+5 -0layouts/community/ortho_4x12/wanleg/rules.mk
-
+20 -20layouts/community/ortho_5x15/wanleg/keymap.c
-
+13 -6users/wanleg/config.h
-
+122 -11users/wanleg/readme.md
-
+6 -0users/wanleg/rules.mk
-
+39 -2users/wanleg/wanleg.c
-
+29 -16users/wanleg/wanleg.h
+ 82
- 0
keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c
View File
| @ -0,0 +1,82 @@ | |||
| /* Copyright 2018 wanleg | |||
| * | |||
| * 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 "wanleg.h" | |||
| #define LAYOUT_kbd6x_base( \ | |||
| K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ | |||
| K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ | |||
| K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \ | |||
| ) \ | |||
| LAYOUT_wrapper( \ | |||
| 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_BSPC, KC_DEL, \ | |||
| KC_TAB, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_LBRC, KC_RBRC, KC_BSLS, \ | |||
| KC_CAPS, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_QUOT, KC_ENT, \ | |||
| KC_LSFT, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, KC_LSFT, FUNCTION, \ | |||
| KC_LCTL, KC_LGUI, KC_LALT, LT(gDIR,KC_SPC), KC_RALT, KC_RGUI, KC_RCTL \ | |||
| ) | |||
| #define LAYOUT_kbd6x_base_wrapper(...) LAYOUT_kbd6x_base(__VA_ARGS__) | |||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| [gGK] = LAYOUT_kbd6x_base_wrapper( | |||
| _______________Gherkin_Row_0_______________, | |||
| _______________Gherkin_Row_1_______________, | |||
| _______________Gherkin_Row_2_______________ | |||
| ), | |||
| [gNUM] = LAYOUT_kbd6x_base_wrapper( | |||
| _______________Gherkin_NUM_0_______________, | |||
| _______________Gherkin_NUM_1_______________, | |||
| _______________Gherkin_NUM_2_______________ | |||
| ), | |||
| [gDIR] = LAYOUT_kbd6x_base_wrapper( | |||
| _______________Gherkin_DIR_0_______________, | |||
| _______________Gherkin_DIR_1_______________, | |||
| _______________Gherkin_DIR_2_______________ | |||
| ), | |||
| [gETC] = LAYOUT_kbd6x_base_wrapper( | |||
| _______________Gherkin_ETC_0_______________, | |||
| _______________Gherkin_ETC_1_______________, | |||
| _______________Gherkin_ETC_2_______________ | |||
| ), | |||
| [_FN] = LAYOUT_kbd6x_base_wrapper( | |||
| _______________Gherkin_FN_0________________, | |||
| _______________Gherkin_FN_1________________, | |||
| _______________Gherkin_FN_2________________ | |||
| ), | |||
| //mac layout | |||
| [_QW] = LAYOUT_wrapper( | |||
| 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_BSPC, KC_DEL, | |||
| 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_BSLS, | |||
| KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | |||
| KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(ONE), | |||
| KC_LCTL, MO(ONE), KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT, KC_RCTL | |||
| ), | |||
| [ONE] = LAYOUT_wrapper( | |||
| KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, | |||
| _______, BL_BRTG, BL_DEC, BL_INC, BL_TOGG, BL_STEP, BL_ON, KC_PGUP, KC_HOME, _______, _______, _______, _______, _______, | |||
| _______, RGB_M_B, RGB_VAD, RGB_VAI, RGB_TOG, RGB_MOD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, | |||
| _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, KC_PGDN, KC_END, _______, gGHERKIN,_______, _______, | |||
| _______, _______, _______, _______, _______, _______, _______ | |||
| ), | |||
| }; | |||
+ 3
- 0
keyboards/kbdfans/kbd6x/keymaps/wanleg/rules.mk
View File
| @ -0,0 +1,3 @@ | |||
| BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | |||
| EXTRAKEY_ENABLE = no # Audio control and System control(+450) | |||
| CONSOLE_ENABLE = no # Console for debug(+400) | |||
+ 11
- 0
keyboards/miniaxe/keymaps/wanleg/config.h
View File
| @ -0,0 +1,11 @@ | |||
| #pragma once | |||
| /* Select hand configuration */ | |||
| // #define MASTER_LEFT | |||
| // #define MASTER_RIGHT | |||
| #define EE_HANDS | |||
| //#define QMK_ESC_OUTPUT F1 // usually COL | |||
| //#define QMK_ESC_INPUT D6 // usually ROW // connected to nothing on the miniaxe | |||
| //#define QMK_LED D7 //connected to nothing on the miniaxe | |||
+ 49
- 0
keyboards/miniaxe/keymaps/wanleg/keymap.c
View File
| @ -0,0 +1,49 @@ | |||
| #include QMK_KEYBOARD_H | |||
| #include "wanleg.h" | |||
| #define LAYOUT_miniaxe_base( \ | |||
| K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ | |||
| K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ | |||
| K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \ | |||
| ) \ | |||
| LAYOUT_wrapper( \ | |||
| K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ | |||
| K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ | |||
| K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \ | |||
| _______, NUMBER, ETCETERA, KC_SPC, DIRECTION, KC_RGUI \ | |||
| ) | |||
| #define LAYOUT_miniaxe_base_wrapper(...) LAYOUT_miniaxe_base(__VA_ARGS__) | |||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| [_GK] = LAYOUT_miniaxe_base_wrapper( | |||
| _______________Gherkin_Row_0_______________, | |||
| _______________Gherkin_Row_1_______________, | |||
| SFT_T(KC_Z), KC_X, KC_C, LT(NUM,KC_V), LT(ETC,KC_B), LT(_FN,KC_N), LT(DIR,KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC) | |||
| ), | |||
| [NUM] = LAYOUT_wrapper( | |||
| _______________Gherkin_NUM_0_______________, | |||
| _______________Gherkin_NUM_1_______________, | |||
| _______________Gherkin_NUM_2_______________, | |||
| _______, _______, _______, KC_ENT, KC_RSFT, _______ | |||
| ), | |||
| [DIR] = LAYOUT_miniaxe_base_wrapper( | |||
| _______________Gherkin_DIR_0_______________, | |||
| _______________Gherkin_DIR_1_______________, | |||
| _______________Gherkin_DIR_2_______________ | |||
| ), | |||
| [ETC] = LAYOUT_wrapper( | |||
| _______________Gherkin_ETC_0_______________, | |||
| _______________Gherkin_ETC_1_______________, | |||
| _______________Gherkin_ETC_2_______________, | |||
| _______, NUMBER, ETCETERA, LALT(LCTL(KC_DEL)), DIRECTION, KC_RGUI | |||
| ), | |||
| [_FN] = LAYOUT_miniaxe_base_wrapper( | |||
| _______________Gherkin_FN_0________________, | |||
| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | |||
| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | |||
| ), | |||
| }; | |||
+ 18
- 0
keyboards/miniaxe/keymaps/wanleg/rules.mk
View File
| @ -0,0 +1,18 @@ | |||
| # Bootloader selection | |||
| # Teensy halfkay | |||
| # Pro Micro caterina | |||
| # Atmel DFU atmel-dfu | |||
| # LUFA DFU lufa-dfu | |||
| # QMK DFU qmk-dfu | |||
| # atmega32a bootloadHID | |||
| #BOOTLOADER = qmk-dfu | |||
| # If you don't know the bootloader type, then you can specify the | |||
| # Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line | |||
| # Teensy halfKay 512 | |||
| # Teensy++ halfKay 1024 | |||
| # Atmel DFU loader 4096 | |||
| # LUFA bootloader 4096 | |||
| # USBaspLoader 2048 | |||
| # OPT_DEFS += -DBOOTLOADER_SIZE=4096 | |||
+ 18
- 1
layouts/community/ortho_3x10/wanleg/config.h
View File
+ 5
- 0
layouts/community/ortho_3x10/wanleg/keymap.c
View File
+ 4
- 4
layouts/community/ortho_3x10/wanleg/readme.md
View File
+ 0
- 2
layouts/community/ortho_3x10/wanleg/rules.mk
View File
| @ -1,3 +1 @@ | |||
| SWAP_HANDS_ENABLE = no | |||
| BOOTLOADER = qmk-dfu | |||
+ 7
- 0
layouts/community/ortho_4x12/wanleg/config.h
View File
+ 8
- 9
layouts/community/ortho_4x12/wanleg/keymap.c
View File
+ 5
- 0
layouts/community/ortho_4x12/wanleg/rules.mk
View File
+ 20
- 20
layouts/community/ortho_5x15/wanleg/keymap.c
View File
+ 13
- 6
users/wanleg/config.h
View File
+ 122
- 11
users/wanleg/readme.md
View File
| @ -1,14 +1,125 @@ | |||
| Copyright 2018 Brian Fong @wanleg | |||
| # Contents | |||
| * [Git Basics](#git-basics) | |||
| * [Update a Feature Branch](#update-a-development-branch) | |||
| * [Delete Branch Locally and Remotely](#delete-branch-locally-and-remotely) | |||
| * [Merge TEST branch into DEV branch](#merge-test-branch-into-dev-branch) | |||
| * [STM32F103C8T6 Setup](#STM32F103C8T6-setup) | |||
| * [Bootloader](#bootloader) | |||
| * [Flashing QMK](#flashing-qmk) | |||
| 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. | |||
| --- | |||
| ## Git Basics | |||
| ### Update a Development Branch | |||
| 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. | |||
| This is how to update a working branch with upstream changes. | |||
| First we'll update your local master branch. Go to your local project and check out the branch you want to merge into (your local master branch) | |||
| ```bash | |||
| $ git checkout master | |||
| ``` | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| Fetch the remote, bringing the branches and their commits from the remote repository. | |||
| You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to master will be stored in a local branch, remotes/origin/master | |||
| ```bash | |||
| $ git fetch -p origin | |||
| ``` | |||
| Merge the changes from origin/master into your local master branch. This brings your master branch in sync with the remote repository, without losing your local changes. If your local branch didn't have any unique commits, Git will instead perform a "fast-forward". | |||
| ```bash | |||
| $ git merge origin/master | |||
| ``` | |||
| Checkout the branch you want to merge into | |||
| ```bash | |||
| $ git checkout <feature-branch> | |||
| ``` | |||
| Merge your (now updated) master branch into your feature branch to update it with the latest changes from your team. | |||
| ```bash | |||
| $ git merge master | |||
| ``` | |||
| This will open your git-configured text editor. Edit the message as desired, save, and exit the editor. | |||
| The above steps only update your local feature branch. To update it on GitHub, push your changes. | |||
| ```bash | |||
| $ git push origin <feature-branch> | |||
| ``` | |||
| ### Delete Branch Locally and Remotely | |||
| Executive Summary | |||
| ```bash | |||
| $ git push --delete <remote_name> <branch_name> | |||
| $ git branch -d <branch_name> | |||
| ``` | |||
| Note that in most cases the remote name is origin. | |||
| Delete Local Branch | |||
| To delete the local branch use one of the following: | |||
| ```bash | |||
| $ git branch -d branch_name | |||
| $ git branch -D branch_name | |||
| ``` | |||
| Note: The -d option is an alias for --delete, which only deletes the branch if it has already been fully merged in its upstream branch. You could also use -D, which is an alias for --delete --force, which deletes the branch "irrespective of its merged status." [Source: man git-branch] | |||
| Delete Remote Branch [Updated on 8-Sep-2017] | |||
| As of Git v1.7.0, you can delete a remote branch using | |||
| ```bash | |||
| $ git push <remote_name> --delete <branch_name> | |||
| ``` | |||
| which might be easier to remember than | |||
| ```bash | |||
| $ git push <remote_name> :<branch_name> | |||
| ``` | |||
| which was added in Git v1.5.0 "to delete a remote branch or a tag." | |||
| Starting on Git v2.8.0 you can also use `git push` with the `-d` option as an alias for `--delete`. | |||
| Therefore, the version of Git you have installed will dictate whether you need to use the easier or harder syntax. | |||
| ### Merge TEST branch into DEV branch | |||
| Executive Summary | |||
| ```bash | |||
| $ git checkout DEV | |||
| $ git merge TEST | |||
| $ git push <remote_name> DEV | |||
| $ git branch -d TEST | |||
| $ git push <remote_name> :TEST | |||
| ``` | |||
| Note that in most cases the remote name is origin. | |||
| The above code will merge, push to remote, and delete both the local and remote TEST branches | |||
| --- | |||
| ## STM32F103C8T6 Setup | |||
| Cheap "Blue/Black Pills" typically do not come with a bootloader installed. The Black Pill uses [generic_boot20_pb12.bin](https://github.com/rogerclarkmelbourne/STM32duino-bootloader/blob/master/binaries/generic_boot20_pb12.bin). The Blue Pill uses [generic_boot20_pc13.bin](https://github.com/rogerclarkmelbourne/STM32duino-bootloader/blob/master/binaries/generic_boot20_pc13.bin). | |||
| The following instructions have been adapted from [here](http://wiki.stm32duino.com/index.php?title=Burning_the_bootloader). | |||
| ### Bootloader | |||
| Flashing a bootloader on to a Black Pill can be done via a USB to Serial converter (e.g. CP2102). This process should be roughly the same for all F103 boards. | |||
| 1. Download the correct bootloader binary | |||
| 2. Set the 'boot 0' pin/jumper high, and 'boot 1' low | |||
| B0+ to center pin | |||
| B1- to center pin | |||
| 3. Connect the board to the PC using a USB to serial converter | |||
| RX to PA9 | |||
| TX to PA10 | |||
| GND to Ground | |||
| 3.3V to 3.3 Volts | |||
| 4. Download and install __Flash Loader Demonstrator__ from [here](http://www.st.com/content/st_com/en/products/development-tools/software-development-tools/stm32-software-development-tools/stm32-programmers/flasher-stm32.html) | |||
| 5. Use __Flash Loader Demonstrator__ to flash the bootloader | |||
| Ensure the correct COM port is selected. Leave other options with their default values/selections. | |||
| Use the "Download to Device" option, with "Erase necessary pages" selected | |||
| 6. After a successful flash, set 'boot 0' pin/jumper low | |||
| B0- to center pin | |||
| B1- to center pin (no change) | |||
| ### Flashing QMK | |||
| As of April 2019, the `:dfu-util` target doesn't work on a \*Pill. You will need to use dfu-util directly. | |||
| 1. Use QMK to build your `.bin` | |||
| 2. Run `dfu-util.exe -d 1eaf:0003 -a 2 -D YOUR_FIRMWARE.bin"` | |||
| If this is the first QMK flash on the \*Pill, you will need to synchronize your Reset Button-push with starting the command. By default, the \*Pill only stays in bootloader mode for about 3 seconds before returning to normal operation. | |||
| See [this page](https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader) if Windows can't see anything to upload to. | |||
| --- | |||