aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsparkyman215 <4030760+sparkyman215@users.noreply.github.com>2018-03-01 14:13:28 -0500
committerJack Humbert <jack.humb@gmail.com>2018-03-09 13:34:37 -0500
commit141a52982e9d6d5bc290b831713b6d4f400fbf83 (patch)
tree08ad9da2cf51900b0cbb44898a30dd6514cb27c4
parentac5326595c88503cc183e7b93af45b7d13e2a557 (diff)
downloadqmk_firmware-141a52982e9d6d5bc290b831713b6d4f400fbf83.tar.gz
qmk_firmware-141a52982e9d6d5bc290b831713b6d4f400fbf83.zip
update ymdk96 files
-rw-r--r--keyboards/ymd96/README.md25
-rw-r--r--keyboards/ymd96/config.h5
-rw-r--r--keyboards/ymd96/keymaps/default/keymap.c18
3 files changed, 22 insertions, 26 deletions
diff --git a/keyboards/ymd96/README.md b/keyboards/ymd96/README.md
index a60323ab9..5de5062ec 100644
--- a/keyboards/ymd96/README.md
+++ b/keyboards/ymd96/README.md
@@ -10,7 +10,7 @@ using Bootmapper Client to change any keyboard settings, since not all the
10USB report options are supported. 10USB report options are supported.
11 11
12Here is the default layout, it is fairly simple with a few function keys: 12Here is the default layout, it is fairly simple with a few function keys:
13![YMD96 Layout](https://i.imgur.com/qCwE2ns.png) 13![YMD96 Layout](https://i.imgur.com/3QnqVPn.png)
14If you have a different layout (since there were many options during the GB), please feel free to contribute! 14If you have a different layout (since there were many options during the GB), please feel free to contribute!
15 15
16Keyboard maintainer: [Andrew](https://github.com/sparkyman215) 16Keyboard maintainer: [Andrew](https://github.com/sparkyman215)
@@ -29,27 +29,18 @@ This firmware was modified from [ps2avrGB](https://github.com/qmk/qmk_firmware/t
29 29
30## Installing and Building 30## Installing and Building
31 31
32First, install the requirements. These commands are for OSX, but all you 32Since the YMD96 uses an ATmega32a chip instead of the 32u4, you need to download [HIDBootFlash v.1.0](http://vusb.wikidot.com/project:hidbootflash) for Windows. If anyone knows of a Linux/Mac bootflasher that works, edit this readme!
33need is the AVR toolchain and `bootloadHID` for flashing: 33On Windows, I use [MINGw](http://www.mingw.org/) to compile the keymaps. On Linux, you can simply use the terminal.
34
35```
36$ brew cask install crosspack-avr
37$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
38```
39
40In order to use the `./program` script, which can reboot the board into
41the bootloader, you'll need Python 2 with PyUSB installed:
42
43```
44$ pip install pyusb
45```
46 34
35Once you have those two pieces of software:
47Build the keyboard with 36Build the keyboard with
48``` 37```
49$ make ymd96:default 38$ make ymd96-default
50``` 39```
51If you make your own layout, change the `default` word to whatever your layout is. 40If you make your own layout, change the `default` word to whatever your layout is.
52 41
42And flash the compiled hex file with `HIDBootFlash`. Simply put the board in flashing mode by plugging it in while holding control, and click `find device`. Then you can specify the .hex file and flash it to the device.
43
53## Troubleshooting 44## Troubleshooting
54 45
55From my experience, it's really hard to brick these boards. But these 46From my experience, it's really hard to brick these boards. But these
@@ -60,3 +51,5 @@ tricks have been useful when it got stuck in a weird scenario.
60 done, just reflash the board with the original firmware. 51 done, just reflash the board with the original firmware.
612. Sometimes USB hubs can act weird, so try connecting the board directly 522. Sometimes USB hubs can act weird, so try connecting the board directly
62 to your computer or plugging/unplugging the USB hub. 53 to your computer or plugging/unplugging the USB hub.
54
55Lastly, if you still need help, you can add me on Discord and I'll be happy to help.
diff --git a/keyboards/ymd96/config.h b/keyboards/ymd96/config.h
index e0a2aa138..8a0668ac9 100644
--- a/keyboards/ymd96/config.h
+++ b/keyboards/ymd96/config.h
@@ -31,10 +31,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
31#define MATRIX_COLS 15 31#define MATRIX_COLS 15
32#define DIODE_DIRECTION ROW2COL 32#define DIODE_DIRECTION ROW2COL
33 33
34#define RGBLED_NUM 20 34#define RGB_DI_PIN C4
35#define RGBLED_NUM 18
35#define RGBLIGHT_ANIMATIONS 36#define RGBLIGHT_ANIMATIONS
37#define RGBLIGHT_VAL_STEP 20
36 38
37#define NO_UART 1 39#define NO_UART 1
40#define BOOTLOADHID_BOOTLOADER 1
38 41
39/* key combination for command */ 42/* key combination for command */
40#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) 43#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
diff --git a/keyboards/ymd96/keymaps/default/keymap.c b/keyboards/ymd96/keymaps/default/keymap.c
index ae2b3ed19..1ca3d22a3 100644
--- a/keyboards/ymd96/keymaps/default/keymap.c
+++ b/keyboards/ymd96/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32 * | Tab | Q | W | E | R | T | Y | U | I | O | P | { | } | \ | 7 | 8 | 9 | - | 18 keys 32 * | Tab | Q | W | E | R | T | Y | U | I | O | P | { | } | \ | 7 | 8 | 9 | - | 18 keys
33 * | Caps | A | S | D | F | G | H | J | K | L | ; | ' | Return | 4 | 5 | 6 | + | 17 keys 33 * | Caps | A | S | D | F | G | H | J | K | L | ; | ' | Return | 4 | 5 | 6 | + | 17 keys
34 * | LShft | Z | X | C | V | B | N | M | , | . | / | RShft | 1 | 2 | 3 | En | 16 keys 34 * | LShft | Z | X | C | V | B | N | M | , | . | / | RShft | 1 | 2 | 3 | En | 16 keys
35 * | Ctrl | Win | Alt | Space | Fn | Win | Left | Down | Up | Right| 0 | . | ter | 12 keys 35 * | Ctrl | Win | Alt | Space | Fn | Win | Left | Down | Up | Right| 0 | . | | 12 keys
36 */ 36 */
37 37
38 [_DEFLT] = KEYMAP( 38 [_DEFLT] = KEYMAP(
@@ -46,17 +46,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
46 /* Layer 1, raise layer 46 /* Layer 1, raise layer
47 * | | | | | | | | | | | | | | | | | | | | 47 * | | | | | | | | | | | | | | | | | | | |
48 * | | | | | | | | | | | | | | | | | | | 48 * | | | | | | | | | | | | | | | | | | |
49 * | | | | | | | | | | | | | | | | | | | 49 * | | |rgb_up|rgb_dn|rgb_mo| | | | | | F22 | F23 | F24 | | | | | |
50 * | | | | | | | | | | | | | | | | | | 50 * | | | | | | | | | | | | | | | | | |
51 * | | | | | | | | | VolDn| VolUp| Mute | Play/Pause | | | | | 51 * | | | | | | | | | VolDn| VolUp| Mute | Play/Pause | | | | |
52 * | | | | | | | | | | | | | | 52 * | | | | | | |MPrev | | | MNext| | | |
53 */ 53 */
54 [_RAISE] = KEYMAP( 54 [_RAISE] = KEYMAP(
55 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \ 55 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
56 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \ 56 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
57 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_F22, KC_F23, KC_F24, ______, ______, ______, ______, ______, \ 57 ______, ______, RGB_VAI, RGB_VAD, RGB_MOD, ______, ______, ______, ______, ______, KC_F22, KC_F23, KC_F24, ______, ______, ______, ______, ______, \
58 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \ 58 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
59 ______, ______, ______, ______, ______, ______, ______, ______, KC_VOLD,KC_VOLU, KC_MUTE, KC_MPLY, ______, ______, ______, ______, \ 59 ______, ______, ______, ______, ______, ______, ______, ______, KC_VOLD,KC_VOLU, KC_MUTE, KC_MPLY, ______, ______, ______, ______, \
60 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \ 60 ______, ______, ______, ______, ______, ______, KC_MPRV, ______, ______, KC_MNXT, ______, ______ \
61 ) 61 )
62}; \ No newline at end of file 62}; \ No newline at end of file