diff options
| author | QMK Bot <hello@qmk.fm> | 2021-06-29 17:19:42 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-06-29 17:19:42 +0000 |
| commit | 1e2378fe7f50d6e9d7dcd5f14e768b6718caec80 (patch) | |
| tree | fac2d416415f039036328aa2a8b76d1d01c6f943 /keyboards | |
| parent | 888cec0290edcdaeed3e7b06b8a621d15494ae13 (diff) | |
| parent | 93e3e777d63b3d166282f9717044b11f69b322bf (diff) | |
| download | qmk_firmware-1e2378fe7f50d6e9d7dcd5f14e768b6718caec80.tar.gz qmk_firmware-1e2378fe7f50d6e9d7dcd5f14e768b6718caec80.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
3 files changed, 8 insertions, 5 deletions
diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c index 970cfb30fb..0a177dec16 100644 --- a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c +++ b/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c @@ -25,6 +25,7 @@ #define FN_CALC LT(1,KC_CALC) #define FN_MENU LT(1,KC_MENU) #define FN_PENT LT(1,KC_PENT) +#define CTALDEL LCA(KC_DEL) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -43,6 +44,6 @@ RESET ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_NLCK,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RESET ,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_JYEN, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_CAPS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,KC_SLCK,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, -LSHNUBS,LSHNUBS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_BRK ,XXXXXXX,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RSHF_RO,RSHF_RO,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,_______, +LSHNUBS,LSHNUBS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_BRK ,CTALDEL,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RSHF_RO,RSHF_RO,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,_______, _______,_______, _______,_______,XXXXXXX, _______, _______, _______,_______,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,KC_PCMM,_______) }; diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/rules.mk b/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/rules.mk new file mode 100644 index 0000000000..36b7ba9cbc --- /dev/null +++ b/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/nopunin10did/jabberwocky/readme.md b/keyboards/nopunin10did/jabberwocky/readme.md index 2164249021..181c8636c6 100644 --- a/keyboards/nopunin10did/jabberwocky/readme.md +++ b/keyboards/nopunin10did/jabberwocky/readme.md @@ -15,10 +15,10 @@ For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w * Hardware Availability: Currently by request only To jump the bootloader, either: -# If loaded with the default layout, use Function-Escape or Function-R *(the function buttons are the 1u keys next to B and N)* **OR** -# Use the physical reset switch near the USB port *(if provided for your version of the board)* **OR** -# Use the physical reset switch on the Elite C **OR** -# Briefly jump the Reset and Ground pins of the Elite C +* If loaded with the default layout, use Function-Escape or Function-R *(the function buttons are the 1u keys next to B and N)* **OR** +* Use the physical reset switch near the USB port *(if provided for your version of the board)* **OR** +* Use the physical reset switch on the Elite C **OR** +* Briefly jump the Reset and Ground pins of the Elite C Make example for this keyboard (after setting up your build environment): |