diff options
author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-01-31 16:37:13 -0800 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-01-31 16:37:13 -0800 |
commit | 8c5c1fd7fe8866f61081ec4cf953f48352d7c088 (patch) | |
tree | 269347952dfc43fd2d49bfa1d39048b51f956ca7 | |
parent | aa6cc28d431f2659a1a531bd7467011aa6713d03 (diff) | |
download | qmk_firmware-8c5c1fd7fe8866f61081ec4cf953f48352d7c088.tar.gz qmk_firmware-8c5c1fd7fe8866f61081ec4cf953f48352d7c088.zip |
Space65 Updates (#5008)
* update reset sequence info
* fix my rgb underglow led number flub
* add a more sensible keymap
* add caps lock led support
* remove unused #define
* swap the spacebar sizes around to match the space65
* use vomindoraan's suggestion in PR to use IS_LED_ON
-rw-r--r-- | keyboards/gray_studio/space65/info.json | 2 | ||||
-rw-r--r-- | keyboards/gray_studio/space65/keymaps/default/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/gray_studio/space65/readme.md | 4 | ||||
-rw-r--r-- | keyboards/gray_studio/space65/space65.c | 5 | ||||
-rw-r--r-- | keyboards/gray_studio/space65/space65.h | 2 |
5 files changed, 12 insertions, 7 deletions
diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/info.json index aafae5b08..9c1d439b4 100644 --- a/keyboards/gray_studio/space65/info.json +++ b/keyboards/gray_studio/space65/info.json | |||
@@ -6,7 +6,7 @@ | |||
6 | "height": 5, | 6 | "height": 5, |
7 | "layouts": { | 7 | "layouts": { |
8 | "LAYOUT": { | 8 | "LAYOUT": { |
9 | "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] | 9 | "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] |
10 | } | 10 | } |
11 | } | 11 | } |
12 | } \ No newline at end of file | 12 | } \ No newline at end of file |
diff --git a/keyboards/gray_studio/space65/keymaps/default/keymap.c b/keyboards/gray_studio/space65/keymaps/default/keymap.c index c42bbe0f0..229a0c574 100644 --- a/keyboards/gray_studio/space65/keymaps/default/keymap.c +++ b/keyboards/gray_studio/space65/keymaps/default/keymap.c | |||
@@ -23,10 +23,10 @@ enum custom_keycodes { | |||
23 | 23 | ||
24 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 24 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
25 | [0] = LAYOUT( \ | 25 | [0] = LAYOUT( \ |
26 | 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_BSLS, KC_GRV, KC_INS, \ | 26 | 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_BSPC, KC_DEL, \ |
27 | 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_BSPC, KC_DEL, \ | 27 | 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_INS, \ |
28 | 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_PGUP, \ | 28 | 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_PGUP, \ |
29 | KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, \ | 29 | KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, \ |
30 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT \ | 30 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT \ |
31 | ), | 31 | ), |
32 | [1] = LAYOUT( \ | 32 | [1] = LAYOUT( \ |
diff --git a/keyboards/gray_studio/space65/readme.md b/keyboards/gray_studio/space65/readme.md index 83387d4b4..00d289e3b 100644 --- a/keyboards/gray_studio/space65/readme.md +++ b/keyboards/gray_studio/space65/readme.md | |||
@@ -1,11 +1,13 @@ | |||
1 | # Gray Studio Space65 | 1 | # Gray Studio Space65 |
2 | 2 | ||
3 | A 65% keyboard with RGB underglow, backlighting and USB C, whose design was inspired by the Voyager I space probe and Apple II home computer. | 3 | A 65% keyboard with RGB underglow, backlighting, and USB C. Its design was inspired by the Voyager I space probe and Apple II home computer. |
4 | 4 | ||
5 | Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin) | 5 | Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin) |
6 | Hardware Supported: Gray Studio Space65 | 6 | Hardware Supported: Gray Studio Space65 |
7 | Hardware Availability: [Geekhack Group Buy](https://geekhack.org/index.php?topic=98768.0) | 7 | Hardware Availability: [Geekhack Group Buy](https://geekhack.org/index.php?topic=98768.0) |
8 | 8 | ||
9 | **Reset Sequence:** Using this firmware sets `BOOTLOADER_ENABLE` to `lite`. While plugging in, hold the top left key, commonly programmed as `Esc` to put your board into bootloader mode. | ||
10 | |||
9 | Make example for this keyboard (after setting up your build environment): | 11 | Make example for this keyboard (after setting up your build environment): |
10 | 12 | ||
11 | make gray_studio/space65:default | 13 | make gray_studio/space65:default |
diff --git a/keyboards/gray_studio/space65/space65.c b/keyboards/gray_studio/space65/space65.c index 26d80e00e..f9f2224ab 100644 --- a/keyboards/gray_studio/space65/space65.c +++ b/keyboards/gray_studio/space65/space65.c | |||
@@ -38,6 +38,11 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | |||
38 | 38 | ||
39 | void led_set_kb(uint8_t usb_led) { | 39 | void led_set_kb(uint8_t usb_led) { |
40 | // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here | 40 | // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here |
41 | if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { | ||
42 | writePinHigh(E6); | ||
43 | } else { | ||
44 | writePinLow(E6); | ||
45 | } | ||
41 | 46 | ||
42 | led_set_user(usb_led); | 47 | led_set_user(usb_led); |
43 | } | 48 | } |
diff --git a/keyboards/gray_studio/space65/space65.h b/keyboards/gray_studio/space65/space65.h index c2158fd92..b7d8580c0 100644 --- a/keyboards/gray_studio/space65/space65.h +++ b/keyboards/gray_studio/space65/space65.h | |||
@@ -17,8 +17,6 @@ | |||
17 | 17 | ||
18 | #include "quantum.h" | 18 | #include "quantum.h" |
19 | 19 | ||
20 | #define XXX KC_NO | ||
21 | |||
22 | /* This a shortcut to help you visually see your layout. | 20 | /* This a shortcut to help you visually see your layout. |
23 | * | 21 | * |
24 | * The first section contains all of the arguments representing the physical | 22 | * The first section contains all of the arguments representing the physical |