aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwanleg <32079073+wanleg@users.noreply.github.com>2018-02-21 14:46:57 -0800
committerJack Humbert <jack.humb@gmail.com>2018-02-23 13:14:22 -0500
commit3b4d26e3443771dfaeb7a45c4d9ee08e3e00866d (patch)
tree407a0f0021ecf96def2bf7950d13ffd1ae25ddf1
parent767f7a8cf0e2ee616505286553d4164e7ddd8ed7 (diff)
downloadqmk_firmware-3b4d26e3443771dfaeb7a45c4d9ee08e3e00866d.tar.gz
qmk_firmware-3b4d26e3443771dfaeb7a45c4d9ee08e3e00866d.zip
flashing instructions, keymap changes
* added flashing instructions for Linux & Windows * minor keymap changes
-rw-r--r--keyboards/gherkin/keymaps/wanleg/config.h7
-rw-r--r--keyboards/gherkin/keymaps/wanleg/keymap.c16
-rw-r--r--keyboards/gherkin/keymaps/wanleg/readme.md51
3 files changed, 58 insertions, 16 deletions
diff --git a/keyboards/gherkin/keymaps/wanleg/config.h b/keyboards/gherkin/keymaps/wanleg/config.h
index 6b69b2150..84af739b2 100644
--- a/keyboards/gherkin/keymaps/wanleg/config.h
+++ b/keyboards/gherkin/keymaps/wanleg/config.h
@@ -49,6 +49,13 @@
49/*tap dance definition */ 49/*tap dance definition */
50#define TAPPING_TERM 200 50#define TAPPING_TERM 200
51 51
52//Mousekeys Settings
53#define MOUSEKEY_INTERVAL 1
54#define MOUSEKEY_DELAY 0
55#define MOUSEKEY_TIME_TO_MAX 1
56#define MOUSEKEY_MAX_SPEED 15
57#define MOUSEKEY_WHEEL_DELAY 0
58
52 59
53#ifdef RGB_DI_PIN 60#ifdef RGB_DI_PIN
54#define RGBLIGHT_ANIMATIONS 61#define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/gherkin/keymaps/wanleg/keymap.c b/keyboards/gherkin/keymaps/wanleg/keymap.c
index b16c15a90..46b3b8c71 100644
--- a/keyboards/gherkin/keymaps/wanleg/keymap.c
+++ b/keyboards/gherkin/keymaps/wanleg/keymap.c
@@ -173,14 +173,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
173// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 173// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
174// * | left | down | right | PrScr | SHIFT | CTRL | PgDn | END | [ | ] | 174// * | left | down | right | PrScr | SHIFT | CTRL | PgDn | END | [ | ] |
175// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 175// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
176// * | | | | | | | | | ALT | / | 176// * | P-Brk | | | | | | | RGUI | ALT | / |
177// * '-----------------------------------------------------------------------------------------' 177// * '-----------------------------------------------------------------------------------------'
178// */ 178// */
179// 179//
180[DIR] = KEYMAP( /* Directional Modifiers */ 180[DIR] = KEYMAP( /* Directional Modifiers */
181 KC_TAB, KC_UP, KC_TRNS, KC_INS, KC_LCTL, KC_RSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL , 181 KC_TAB, KC_UP, KC_TRNS, KC_INS, KC_LCTL, KC_RSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL ,
182 KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_RCTL, KC_PGDN, KC_END, KC_LBRC, KC_RBRC , 182 KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_RCTL, KC_PGDN, KC_END, KC_LBRC, KC_RBRC ,
183 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_SLSH 183 KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_LALT, KC_SLSH
184), 184),
185// 185//
186// /* 186// /*
@@ -205,17 +205,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
205// /* 205// /*
206// * ETC 206// * ETC
207// * .-----------------------------------------------------------------------------------------. 207// * .-----------------------------------------------------------------------------------------.
208// * | ` | | | | | | | | | \ | 208// * | ` | mUP | | | | SHIFT | mUp | mDown | | \ |
209// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 209// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
210// * | CAPS | P-Brk | | | | | | | ; | ' | 210// * | mLeft | mDown | mRight | | SHIFT | | mBtn1 | mBtn2 | ; | ' |
211// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 211// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
212// * | SHIFT | | | | | C-A-D | | GUI | | DEL | 212// * | Sft//Cp| | | | | C-A-D | | | ALT | DEL |
213// * '-----------------------------------------------------------------------------------------' 213// * '-----------------------------------------------------------------------------------------'
214// */ 214// */
215// 215//
216[ETC] = KEYMAP( /* ETC */ 216[ETC] = KEYMAP( /* ETC */
217 KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS , 217 KC_GRV, KC_MS_U, _______, _______, _______, KC_RSFT, KC_WH_U, KC_WH_D, _______, KC_BSLS ,
218 KC_CAPS, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT , 218 KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_LSFT, KC_TRNS, KC_BTN1, KC_BTN2, KC_SCLN, KC_QUOT ,
219 KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LALT(LCTL(KC_DEL)), KC_TRNS, KC_RGUI, KC_TRNS, KC_DEL 219 TD(TD_SFT_CAPS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LALT(LCTL(KC_DEL)), KC_TRNS, KC_TRNS, KC_LALT, KC_DEL
220 ), 220 ),
221}; 221};
diff --git a/keyboards/gherkin/keymaps/wanleg/readme.md b/keyboards/gherkin/keymaps/wanleg/readme.md
index a364fcabc..8fed18b6c 100644
--- a/keyboards/gherkin/keymaps/wanleg/readme.md
+++ b/keyboards/gherkin/keymaps/wanleg/readme.md
@@ -1,12 +1,47 @@
1![Gherkin Wanleg Layout Image](https://i.imgur.com/RpN5N42.png) 1![Gherkin Wanleg Layout Image](https://i.imgur.com/mXsgoro.png)
2 2
3# Gherkin Wanleg Layout 3# Gherkin Wanleg Layout
4
5Here is the layout I came up with to preserve a standard QWERTY layout as much as possible, in as few layers as possible for a 30 key board. 4Here is the layout I came up with to preserve a standard QWERTY layout as much as possible, in as few layers as possible for a 30 key board.
6I originally set up a few Tap Dance keys, but eventually dropped most of them in favor of chorded versions, since in actual use, they tended to impede typing speed more than their (current) two-key versions. 5I originally set up a few Tap Dance keys, but dropped half of them in favor of chorded versions, since in actual use, they tended to impede typing speed more than their (current) two-key versions.
7I've left them in my layout ready for use if anyone wants to try them out: 6I've left them in my layout ready for use if anyone wants to try them out:
8Single tap - Double tap - Hold 7
9space - enter - shift 8Legend Name | Single Tap | Double Tap | Hold
10backspace - delete - control 9--- | --- | --- | ---
11shift - caps lock - XXXX 10*null* | space | enter | shift
12KC_Q - escape - XXXX \ No newline at end of file 11*null* | backspace | delete | control
12Sft//Cp | shift | caps lock | *null*
13Q//Esc | KC_Q | escape | *null*
14
15# Gherkin Flashing
16## Linux
17The ProMicro doesn't like dfu-programmer, so we have to use AVRdude. What follows below are instructions for Linux taken from https://deskthority.net/workshop-f7/how-to-use-a-pro-micro-as-a-cheap-controller-converter-like-soarer-s-t8448.html
18
19`ls /dev/tty*`
20
21Next, plug in your device and re-run the command, the same as before:
22
23`ls /dev/tty*`
24
25There should be one more output device than was seen previously. For me, it's /dev/ttyACM0.
26To flash the device, you need to have AVRdude installed. On Linux, you can do this with your normal package manager.
27Once you have AVRdude set up, navigate to the directory with your .hex file in it. Then, run the following:
28
29`avrdude -p atmega32u4 -P YOUR_SERIAL_PORT -c avr109 -U flash:w:YOUR_FILENAME.hex`
30
31Of course, replace YOUR_SERIAL_PORT with your serial port's device name, and YOUR_FILENAME.hex with the appropriate filename. For me, this line looks like this:
32
33`avrdude -p atmega32u4 -P /dev/ttyACM0 -c avr109 -U flash:w:Soarer_at2usb_v1.12_atmega32u4.hex`
34
35If it says ''device not in sync'' or similar, your device is no longer in bootloader mode. Unplug it, and get it back into bootloader mode like you did in the previous step (or short the reset pin), and try again.
36If this still doesn't work, try running the command again as root
37
38`sudo avrdude -p atmega32u4 -P /dev/ttyACM0 -c avr109 -U flash:w:Soarer_at2usb_v1.12_atmega32u4.hex`
39
40## Windows
411. Install the latest version of AVRdude for Windows from http://savannah.nongnu.org/projects/avrdude/
42Test that it installed correctly by running "avrdude" from Command Prompt. It should display a usage message with version information at the end
432. Open Device Manager and take a look at your "Ports (COM & LPT)" section
443. Plug in the Gherkin and short the RESET pin on the microcontroller to Ground to put it into bootloader mode. Take note of the new COM device that shows up. After 8 seconds or so the microcontroller will leave bootloader mode and it will disappear from that section
454. Open Command Prompt and run the following (substituting "com7" with whatever port you saw earlier)
46
47`avrdude -p atmega32u4 -P com7 -c avr109 -U flash:w:YOURHEX.hex`