summaryrefslogtreecommitdiff
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)
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 6b69b21501..84af739b27 100644
--- a/keyboards/gherkin/keymaps/wanleg/config.h
+++ b/keyboards/gherkin/keymaps/wanleg/config.h
@@ -49,6 +49,13 @@
/*tap dance definition */
#define TAPPING_TERM 200
+//Mousekeys Settings
+#define MOUSEKEY_INTERVAL 1
+#define MOUSEKEY_DELAY 0
+#define MOUSEKEY_TIME_TO_MAX 1
+#define MOUSEKEY_MAX_SPEED 15
+#define MOUSEKEY_WHEEL_DELAY 0
+
#ifdef RGB_DI_PIN
#define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/gherkin/keymaps/wanleg/keymap.c b/keyboards/gherkin/keymaps/wanleg/keymap.c
index b16c15a907..46b3b8c713 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] = {
// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
// * | left | down | right | PrScr | SHIFT | CTRL | PgDn | END | [ | ] |
// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-// * | | | | | | | | | ALT | / |
+// * | P-Brk | | | | | | | RGUI | ALT | / |
// * '-----------------------------------------------------------------------------------------'
// */
//
[DIR] = KEYMAP( /* Directional Modifiers */
KC_TAB, KC_UP, KC_TRNS, KC_INS, KC_LCTL, KC_RSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL ,
KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_RCTL, KC_PGDN, KC_END, KC_LBRC, KC_RBRC ,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_SLSH
+ KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_LALT, KC_SLSH
),
//
// /*
@@ -205,17 +205,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// /*
// * ETC
// * .-----------------------------------------------------------------------------------------.
-// * | ` | | | | | | | | | \ |
+// * | ` | mUP | | | | SHIFT | mUp | mDown | | \ |
// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-// * | CAPS | P-Brk | | | | | | | ; | ' |
+// * | mLeft | mDown | mRight | | SHIFT | | mBtn1 | mBtn2 | ; | ' |
// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-// * | SHIFT | | | | | C-A-D | | GUI | | DEL |
+// * | Sft//Cp| | | | | C-A-D | | | ALT | DEL |
// * '-----------------------------------------------------------------------------------------'
// */
//
[ETC] = KEYMAP( /* ETC */
- KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS ,
- KC_CAPS, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT ,
- KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LALT(LCTL(KC_DEL)), KC_TRNS, KC_RGUI, KC_TRNS, KC_DEL
+ KC_GRV, KC_MS_U, _______, _______, _______, KC_RSFT, KC_WH_U, KC_WH_D, _______, KC_BSLS ,
+ KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_LSFT, KC_TRNS, KC_BTN1, KC_BTN2, KC_SCLN, KC_QUOT ,
+ TD(TD_SFT_CAPS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LALT(LCTL(KC_DEL)), KC_TRNS, KC_TRNS, KC_LALT, KC_DEL
),
};
diff --git a/keyboards/gherkin/keymaps/wanleg/readme.md b/keyboards/gherkin/keymaps/wanleg/readme.md
index a364fcabca..8fed18b6c4 100644
--- a/keyboards/gherkin/keymaps/wanleg/readme.md
+++ b/keyboards/gherkin/keymaps/wanleg/readme.md
@@ -1,12 +1,47 @@
-![Gherkin Wanleg Layout Image](https://i.imgur.com/RpN5N42.png)
+![Gherkin Wanleg Layout Image](https://i.imgur.com/mXsgoro.png)
# Gherkin Wanleg Layout
-
Here 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.
-I 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.
+I 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.
I've left them in my layout ready for use if anyone wants to try them out:
-Single tap - Double tap - Hold
-space - enter - shift
-backspace - delete - control
-shift - caps lock - XXXX
-KC_Q - escape - XXXX \ No newline at end of file
+
+Legend Name | Single Tap | Double Tap | Hold
+--- | --- | --- | ---
+*null* | space | enter | shift
+*null* | backspace | delete | control
+Sft//Cp | shift | caps lock | *null*
+Q//Esc | KC_Q | escape | *null*
+
+# Gherkin Flashing
+## Linux
+The 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
+
+`ls /dev/tty*`
+
+Next, plug in your device and re-run the command, the same as before:
+
+`ls /dev/tty*`
+
+There should be one more output device than was seen previously. For me, it's /dev/ttyACM0.
+To flash the device, you need to have AVRdude installed. On Linux, you can do this with your normal package manager.
+Once you have AVRdude set up, navigate to the directory with your .hex file in it. Then, run the following:
+
+`avrdude -p atmega32u4 -P YOUR_SERIAL_PORT -c avr109 -U flash:w:YOUR_FILENAME.hex`
+
+Of 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:
+
+`avrdude -p atmega32u4 -P /dev/ttyACM0 -c avr109 -U flash:w:Soarer_at2usb_v1.12_atmega32u4.hex`
+
+If 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.
+If this still doesn't work, try running the command again as root
+
+`sudo avrdude -p atmega32u4 -P /dev/ttyACM0 -c avr109 -U flash:w:Soarer_at2usb_v1.12_atmega32u4.hex`
+
+## Windows
+1. Install the latest version of AVRdude for Windows from http://savannah.nongnu.org/projects/avrdude/
+Test that it installed correctly by running "avrdude" from Command Prompt. It should display a usage message with version information at the end
+2. Open Device Manager and take a look at your "Ports (COM & LPT)" section
+3. 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
+4. Open Command Prompt and run the following (substituting "com7" with whatever port you saw earlier)
+
+`avrdude -p atmega32u4 -P com7 -c avr109 -U flash:w:YOURHEX.hex`