qmk

Unnamed repository; edit this file 'description' to name the repository.
git clone git://git.z3bra.org/qmk.git
Log | Files | Refs | Submodules | LICENSE

commit 0e92d99cdc2da358f14e6faf421b71edd0ef7f6c
parent 3d92b21a3b12b03cd7d96e2efe9ced5b3f7e6bbe
Author: Jason Barnachea <jrbarnachea@gmail.com>
Date:   Mon, 19 Feb 2018 11:07:59 -0800

Readme img link updates (#2410)

* QMK and JC65 pcb img links updated

link fixes

* personal keymap updates

new v32u4 keymap, updated v32a keymap

* Update readme.md

Diffstat:
keyboards/jc65/readme.md | 6+++---
keyboards/jc65/v32a/keymaps/naut/keymap.c | 49++++++++++++++++++++++++++-----------------------
keyboards/jc65/v32a/readme.md | 2++
keyboards/jc65/v32u4/keymaps/naut/keymap.c | 94+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
keyboards/jc65/v32u4/keymaps/naut/readme.md | 18++++++++++++++++++
keyboards/jc65/v32u4/keymaps/naut/rules.mk | 2++
keyboards/jc65/v32u4/readme.md | 2+-
7 files changed, 146 insertions(+), 27 deletions(-)

diff --git a/keyboards/jc65/readme.md b/keyboards/jc65/readme.md @@ -1,7 +1,8 @@ JC65 === -![JC65](https://imgur.com/a/C2oa5) +![JC65 with 32u4](https://i.imgur.com/I4hCyBI.jpg) +![JC65 with 32a](https://i.imgur.com/9cJ9UbX.jpg) The JC65 PCB actually has two revisions: A QMK native version, and a PS2AVRGB version. Jchan offered both PCBs as options during the M65-A Round 1 group buy and are now currently available on [keyclack.com](https://keyclack.com/) @@ -11,4 +12,4 @@ Make example native QMK version (after setting up your build environment): Make example ps2avrGB version (after setting up your build environment): - make jc65/v32a:default- \ No newline at end of file + make jc65/v32a:default diff --git a/keyboards/jc65/v32a/keymaps/naut/keymap.c b/keyboards/jc65/v32a/keymaps/naut/keymap.c @@ -9,11 +9,14 @@ // Define Macros #define M_PRTS M(0) #define M_PRTA M(1) -#define M_MSSN M(2) -#define M_APPS M(3) -#define M_SPOT M(4) -#define M_LEFT M(5) -#define M_RGHT M(6) +#define M_PRTSC M(2) +#define M_PRTAC M(3) +#define M_MSSN M(4) +#define M_APPS M(5) +#define M_SPOT M(6) +#define M_LEFT M(7) +#define M_RGHT M(8) +#define RGB_WHT M(9) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Base Layer @@ -35,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Mac Layer [_MAC] = KEYMAP( TO(0), KC_F14, KC_F15, M_APPS, M_MSSN, KC_F11, KC_F12,KC_MRWD,KC_MPLY,KC_MFFD,KC_MUTE,KC_VOLD,KC_VOLU,KC_EJCT, KC_NO, KC_NO, - KC_TRNS, M_PRTS, M_PRTA,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, - KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, - KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, TO(0), M_MSSN,KC_TRNS, - KC_TRNS,KC_TRNS,KC_TRNS, M_SPOT, M_SPOT, M_SPOT, KC_TRNS,KC_TRNS,KC_TRNS, M_LEFT, M_APPS, M_RGHT + KC_NO, M_PRTS, M_PRTA, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSPC, KC_NO, + KC_NO,M_PRTSC,M_PRTAC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ENT, KC_NO, + KC_NO, KC_NO, KC_NO, KC_X, KC_C, KC_V, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0), M_MSSN, KC_NO, + KC_NO, KC_NO,KC_LGUI, M_SPOT, M_SPOT, M_SPOT, KC_RGUI, KC_NO, KC_NO, M_LEFT, M_APPS, M_RGHT ), // RGB and BL Layer [_RGB] = KEYMAP( TO(0), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0), - KC_NO,RGB_HUD,RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,BL_TOGG, + KC_NO,RGB_HUD,RGB_HUI,RGB_WHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,BL_TOGG, KC_NO,RGB_SAD,RGB_SAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,RGB_TOG, KC_NO, KC_NO,RGB_VAD,RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,RGB_MOD,RGB_RMOD, KC_NO,RGB_M_P,RGB_M_R, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,RGB_M_G,RGB_M_SW @@ -55,25 +58,25 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { if (record->event.pressed) { switch(id) { case 0: - return MACRO(D(LGUI), D(LSFT), T(3), U(LSFT), U(LGUI), END); //Mac print screen - break; + return MACRO(D(LGUI), D(LSFT), T(3), U(LSFT), U(LGUI), END); // Mac print screen case 1: - return MACRO(D(LGUI), D(LSFT), T(4), U(LSFT), U(LGUI), END); //Mac print area - break; + return MACRO(D(LGUI), D(LSFT), T(4), U(LSFT), U(LGUI), END); // Mac print area case 2: - return MACRO(D(LCTL), T(UP), U(LCTL), END); //Mac mission control - break; + return MACRO(D(LCTL), D(LSFT), D(LGUI), T(3), D(LCTL), D(LSFT), D(LGUI), END); // Mac print screen to clipboard case 3: - return MACRO(D(LCTL), T(DOWN), U(LCTL), END); //Mac applications - break; + return MACRO(D(LCTL), D(LSFT), D(LGUI), T(4), D(LCTL), D(LSFT), D(LGUI), END); // Mac print area to clipboard case 4: - return MACRO(D(LGUI), T(SPC), U(LGUI), END); //Mac spotlight search - break; + return MACRO(D(LCTL), T(UP), U(LCTL), END); // Mac mission control case 5: - return MACRO(D(LCTL), T(LEFT), U(LCTL), END); //Mac mission left - break; + return MACRO(D(LCTL), T(DOWN), U(LCTL), END); // Mac app windows case 6: - return MACRO(D(LGUI), T(RGHT), U(LGUI), END); //Mac mission right + return MACRO(D(LGUI), T(SPC), U(LGUI), END); // Mac spotlight search + case 7: + return MACRO(D(LCTL), T(LEFT), U(LCTL), END); // Mac mission left + case 8: + return MACRO(D(LCTL), T(RGHT), U(LCTL), END); // Mac mission right + case 9: + rgblight_setrgb(0xff, 0xff, 0xff); // White rgb shortcut break; } } diff --git a/keyboards/jc65/v32a/readme.md b/keyboards/jc65/v32a/readme.md @@ -1,6 +1,8 @@ JC65 ps2avrGB ======= +![JC65](https://i.imgur.com/9cJ9UbX.jpg) + A 65% keyboard with RGB Keyboard Maintainer: [Jason Barnachea](https://github.com/nautxx) diff --git a/keyboards/jc65/v32u4/keymaps/naut/keymap.c b/keyboards/jc65/v32u4/keymaps/naut/keymap.c @@ -0,0 +1,93 @@ +#include "v32u4.h" + +// Define Layers +#define _BASE 0 +#define _FNX 1 +#define _MAC 2 +#define _RGB 3 +#define _OFF 4 + +// Define Macros +#define M_PRTS M(0) +#define M_PRTA M(1) +#define M_PRTSC M(2) +#define M_PRTAC M(3) +#define M_MSSN M(4) +#define M_APPS M(5) +#define M_SPOT M(6) +#define M_LEFT M(7) +#define M_RGHT M(8) +#define RGB_WHT M(9) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // Base Layer + [_BASE] = KEYMAP( + 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, + 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, + KC_LCTL, 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, + KC_LSFT, KC_NO, 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, + MO(1),KC_LALT,KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_NO,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT + ), + // Fn Layer + [_FNX] = KEYMAP( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,KC_TRNS, TG(4), TG(3), + KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, TG(2),KC_VOLU,KC_MPLY, + KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_MRWD,KC_VOLD,KC_MFFD + ), + // Mac Layer + [_MAC] = KEYMAP( + TO(0), KC_F14, KC_F15, M_APPS, M_MSSN, KC_F11, KC_F12,KC_MRWD,KC_MPLY,KC_MFFD,KC_MUTE,KC_VOLD,KC_VOLU,KC_EJCT, KC_NO, KC_NO, + KC_NO, M_PRTS, M_PRTA, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSPC, KC_NO, + KC_NO,M_PRTSC,M_PRTAC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ENT, KC_NO, + KC_NO, KC_NO, KC_NO, KC_X, KC_C, KC_V, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0), M_MSSN, KC_NO, + KC_NO, KC_NO,KC_LGUI, M_SPOT, M_SPOT, M_SPOT, KC_RGUI, KC_NO, KC_NO, M_LEFT, M_APPS, M_RGHT + ), + // RGB and BL Layer + [_RGB] = KEYMAP( + TO(0), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0), + KC_NO,RGB_HUD,RGB_HUI,RGB_WHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,BL_TOGG, + KC_NO,RGB_SAD,RGB_SAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,RGB_TOG, + KC_NO, KC_NO,RGB_VAD,RGB_VAI, BL_DEC, BL_INC, KC_NO, KC_NO, KC_NO, KC_NO,RGB_MOD,RGB_RMOD, KC_NO,RGB_M_P,RGB_M_R, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,RGB_M_G,RGB_M_SW + ), + // Mash Layer + [_OFF] = KEYMAP( + TO(0), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ), +}; + +// The Macros +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { + if (record->event.pressed) { + switch(id) { + case 0: + return MACRO(D(LGUI), D(LSFT), T(3), U(LSFT), U(LGUI), END); // Mac print screen + case 1: + return MACRO(D(LGUI), D(LSFT), T(4), U(LSFT), U(LGUI), END); // Mac print area + case 2: + return MACRO(D(LCTL), D(LSFT), D(LGUI), T(3), D(LCTL), D(LSFT), D(LGUI), END); // Mac print screen to clipboard + case 3: + return MACRO(D(LCTL), D(LSFT), D(LGUI), T(4), D(LCTL), D(LSFT), D(LGUI), END); // Mac print area to clipboard + case 4: + return MACRO(D(LCTL), T(UP), U(LCTL), END); // Mac mission control + case 5: + return MACRO(D(LCTL), T(DOWN), U(LCTL), END); // Mac app windows + case 6: + return MACRO(D(LGUI), T(SPC), U(LGUI), END); // Mac spotlight search + case 7: + return MACRO(D(LCTL), T(LEFT), U(LCTL), END); // Mac mission left + case 8: + return MACRO(D(LCTL), T(RGHT), U(LCTL), END); // Mac mission right + case 9: + rgblight_setrgb(0xff, 0xff, 0xff); // White rgb shortcut + break; + } + } + return MACRO_NONE; +};+ \ No newline at end of file diff --git a/keyboards/jc65/v32u4/keymaps/naut/readme.md b/keyboards/jc65/v32u4/keymaps/naut/readme.md @@ -0,0 +1,18 @@ +Naut's Keymap +======= + +Layer 1: HHKB Split backspace, 6.25u space, control on caps, Fn on L-Ctl. + +Layer 2: F Row on numrow, caps on tab, media shortcuts on arrows + +Layer 3: Mac Media buttons on numrow + +Layer 4: RGB control + +Layer 5: Keyboard off (for mashing purposes and reset) + +Keymap Maintainer: [Jason Barnachea](https://github.com/nautxx) + +Difference from base layout: HHKBish layout. HHKB Fn layer. Mac media layer. RGB control layer. Button mashing layer. + +Intended usage: Daily driver for keyboard peacocking. diff --git a/keyboards/jc65/v32u4/keymaps/naut/rules.mk b/keyboards/jc65/v32u4/keymaps/naut/rules.mk @@ -0,0 +1,2 @@ +RGBLIGHT_ENABLE = yes +BACKLIGHT_ENABLE = yes diff --git a/keyboards/jc65/v32u4/readme.md b/keyboards/jc65/v32u4/readme.md @@ -1,7 +1,7 @@ JC65 === -![JC65](https://imgur.com/a/C2oa5) +![JC65](https://i.imgur.com/I4hCyBI.jpg) The JC65 PCB actually has two revisions: A QMK native version, and a PS2AVRGB version. Jchan offered both PCBs as options during the M65-A Round 1 group buy, and were also available choices for the 65% acrylic case group buy. In the near future both PCB versions should be available from keyclack.com when the storefront part opens.