Commit Graph

22356 Commits

Author SHA1 Message Date
QMK Bot
1e8c96cea3 Merge remote-tracking branch 'origin/develop' into xap 2022-05-20 00:47:56 +00:00
GloriousThrall
83fa6fe916
Move GMMK Pro to allow for multiple revisions (#16423)
* Added GMMK PRO Rev2 WBG7 MCU compatibility. Added GMMK 2 WBG7 MCU compatibility.

* GMMK PRO MCU Updates only (removed other kbs)

* fix problems

* Optimize the code.

* Update form develop branch

* Update

* Updater from qmk/develop

* Update

* Update config.h

* Update config.h

* Remove gmmk pro rev2

* move moults31/keymap.c

* Update

* tidy up

Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: zvecr <git@zvecr.com>
2022-05-20 01:47:22 +01:00
QMK Bot
8356cb615f Merge remote-tracking branch 'origin/develop' into xap 2022-05-20 00:39:32 +00:00
Pascal Getreuer
b5608cbb6d
Continue Caps Word when AltGr (right Alt) is held. (#17156)
This is a minor bug fix for Caps Word. Currently, Caps Word turns off
whenever a non-shift mod becomes active. This is done to avoid
interfering with hotkeys.

This commit makes an exception to continue Caps Word when AltGr (right
Alt) is held. Outside the US, the AltGr key is used to type additional
symbols (https://en.wikipedia.org/wiki/AltGr_key). Depending on the
language, these may include symbols used within words like accented
letters where it would be desirable to continue Caps Word.
2022-05-20 01:39:00 +01:00
QMK Bot
4e87e4b074 Merge remote-tracking branch 'origin/develop' into xap 2022-05-19 20:27:07 +00:00
QMK Bot
36c8462f0a Merge remote-tracking branch 'origin/master' into develop 2022-05-19 20:26:30 +00:00
James Young
c4c67f2eb2
KBDfans Tiger80 Community Layout Support and Keymap Touch-Up (#17149)
* info.json: apply friendly formatting

* rename LAYOUT_all to LAYOUT_tkl_f13_ansi_tsangan

* enable Community Layout support

* refactor keymaps to use grid alignment
2022-05-19 13:25:56 -07:00
QMK Bot
7cac1ee2d1 Merge remote-tracking branch 'origin/develop' into xap 2022-05-19 17:56:24 +00:00
QMK Bot
b4d65aac7f Merge remote-tracking branch 'origin/master' into develop 2022-05-19 17:55:45 +00:00
James Young
394f147897
KBDfans Phase One Layout Macro Additions and Configurator Data (#17148)
* phaseone.h: add matrix diagram

* add QMK Configurator data

* add LAYOUT_65_ansi_blocker_split_bs macro

* add LAYOUT_65_ansi_wkl_split_bs macro

* add LAYOUT_65_iso_blocker macro

* add LAYOUT_65_iso_blocker_split_bs macro

* add LAYOUT_65_iso_wkl macro

* add LAYOUT_65_iso_wkl_split_bs macro

* rename LAYOUT_65_ansi_wkl to LAYOUT_65_ansi_blocker_tsangan_wkl

Differentiates the layout supported here from QMK's `65_ansi_blocker_tsangan` Community Layout, which is equivalent to this but with a 1u GUI key between Left Ctrl and Left Alt.

* rename new layout macros for codebase consistency

- `LAYOUT_65_ansi_wkl_split_bs` -> `LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs`
- `LAYOUT_65_iso_wkl` -> `LAYOUT_65_iso_blocker_tsangan_wkl`
- `LAYOUT_65_iso_wkl_split_bs` -> `LAYOUT_65_iso_blocker_tsangan_wkl_split_bs`

* add reference keymaps

Add keymaps which demonstrate the layout macro implementations.
2022-05-19 10:54:57 -07:00
QMK Bot
349a42357d Merge remote-tracking branch 'origin/develop' into xap 2022-05-19 07:49:19 +00:00
QMK Bot
19e6e6d1de Merge remote-tracking branch 'origin/master' into develop 2022-05-19 07:48:36 +00:00
James Young
89e0fba75d
Hineybush Ibis Layout Additions and Configurator Rendering Update (#17132)
* info.json: apply friendly formatting

* info.json: remove dead space from rendering

* info.json: insert line breaks between physical rows in layout data

* info.json: fix overlap in key rendering

Fixes an issue where the ANSI Enter key renders on top of the ISO Hash/Tilde key, visually hiding the latter.

* add LAYOUT_ansi_all macro with associated keymap

Duplicates `LAYOUT_all`, but with the ISO Hash/Tilde and ISO Backslash keys removed.

    - ANSI Enter and 2.25u Left Shift
    - Backspace, Right Shift, Numpad Plus and Numpad Enter all split
    - 1.5 / 1 / 1.5 / 6.25 / 1.25 / 1.25 / 1.25 Bottom Row

* add LAYOUT_iso_all macro with associated keymap

Duplicates `LAYOUT_all`, but with the ANSI Backslash key removed.

    - ISO Enter and 1.25u Left Shift
    - Backspace, Right Shift, Numpad Plus and Numpad Enter all split
    - 1.5 / 1 / 1.5 / 6.25 / 1.25 / 1.25 / 1.25 Bottom Row
2022-05-19 00:48:01 -07:00
QMK Bot
57741e11fd Merge remote-tracking branch 'origin/develop' into xap 2022-05-18 19:59:08 +00:00
QMK Bot
ce9a5aaef3 Merge remote-tracking branch 'origin/master' into develop 2022-05-18 19:58:37 +00:00
Takeshi ISHII
80405c6d96
Fix platforms/avr/drivers/ws2812.c (#17043)
* Fix platforms/avr/drivers/ws2812.c

`platforms/avr/drivers/ws2812.c` has been changed to use `DDRx_ADDRESS()` and `PORTx_ADDRESS()` instead of `_SFR_IO8()` in #8646.  To use them, `#include <pin_defs.h>` is required.

 ## Error Log
* create new keyboard
```shell
bash-3.2$ qmk new-keyboard
Ψ Generating a new QMK keyboard directory

Name Your Keyboard Project
For more infomation, see:
https://docs.qmk.fm/#/hardware_keyboard_guidelines?id=naming-your-keyboardproject

Keyboard Name? ws2812_test
..................................
     36. WB32F3G71
Please enter your choice:  [12]
Ψ Created a new keyboard called ws2812_test.
Ψ To start working on things, `cd` into keyboards/ws2812_test,
Ψ or open the directory in your preferred text editor.
Ψ And build with qmk compile -kb ws2812_test -km default.
```
* Enable RGBLIGHT.
```shell
bash-3.2$ echo RGBLIGHT_ENABLE=yes >> ./keyboards/ws2812_test/rules.mk
bash-3.2$ echo '#define RGB_DI_PIN B1' >> ./keyboards/ws2812_test/config.h
bash-3.2$ echo '#define RGBLED_NUM 6' >> ./keyboards/ws2812_test/config.h
```
* Compile
```shell
bash-3.2$ make ws2812_test:default

QMK Firmware 0.16.9
Making ws2812_test with keymap default

avr-gcc (Homebrew AVR GCC 8.4.0_2) 8.4.0
Copyright (C) 2018 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

.....................
Compiling: quantum/process_keycode/process_rgb.c                                                    [OK]
Compiling: platforms/avr/drivers/ws2812.c                                                          platforms/avr/drivers/ws2812.c: In function 'ws2812_setleds':
platforms/avr/drivers/ws2812.c:40:5: error: implicit declaration of function 'DDRx_ADDRESS' [-Werror=implicit-function-declaration]
     DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(RGB_DI_PIN);
     ^~~~~~~~~~~~
In file included from <command-line>:
./keyboards/ws2812_test/config.h:21:20: error: 'B1' undeclared (first use in this function); did you mean 'PB1'?
 #define RGB_DI_PIN B1
                    ^~
platforms/avr/drivers/ws2812.c:40:18: note: in expansion of macro 'RGB_DI_PIN'
     DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(RGB_DI_PIN);
                  ^~~~~~~~~~
./keyboards/ws2812_test/config.h:21:20: note: each undeclared identifier is reported only once for each function it appears in
 #define RGB_DI_PIN B1
                    ^~
platforms/avr/drivers/ws2812.c:40:18: note: in expansion of macro 'RGB_DI_PIN'
     DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(RGB_DI_PIN);
                  ^~~~~~~~~~
platforms/avr/drivers/ws2812.c:42:47: error: implicit declaration of function 'PORTx_ADDRESS' [-Werror=implicit-function-declaration]
     uint8_t masklo = ~(pinmask(RGB_DI_PIN)) & PORTx_ADDRESS(RGB_DI_PIN);
                                               ^~~~~~~~~~~~~
In file included from /usr/local/Cellar/avr-gcc@8/8.4.0_2/avr/include/avr/io.h:99,
                 from /usr/local/Cellar/avr-gcc@8/8.4.0_2/avr/include/avr/interrupt.h:38,
                 from platforms/avr/drivers/ws2812.c:24:
platforms/avr/drivers/ws2812.c: In function 'ws2812_sendarray_mask':
./keyboards/ws2812_test/config.h:21:20: error: 'B1' undeclared (first use in this function); did you mean 'PB1'?
 #define RGB_DI_PIN B1
                    ^~
platforms/avr/drivers/ws2812.c:167:69: note: in expansion of macro 'RGB_DI_PIN'
                      : "r"(curbyte), "I"(_SFR_IO_ADDR(PORTx_ADDRESS(RGB_DI_PIN))), "r"(maskhi), "r"(masklo));
                                                                     ^~~~~~~~~~
cc1: all warnings being treated as errors
 [ERRORS]
 |
 |
 |
make[1]: *** [.build/obj_ws2812_test_default/ws2812.o] Error 1
make: *** [ws2812_test:default] Error 1
Make finished with errors
```

* change include order
2022-05-18 20:58:03 +01:00
QMK Bot
817b2ffb8c Merge remote-tracking branch 'origin/develop' into xap 2022-05-18 17:34:31 +00:00
QMK Bot
3904a6afbe Merge remote-tracking branch 'origin/master' into develop 2022-05-18 17:33:52 +00:00
Takeshi ISHII
33d568e29b
Update mtei's keymap (helix/rev2:five_rows, helix/pico:mtei, helix/rev3_5rows:five_rows) (#16966)
* add users/mtei/key_blocks.h

This change does not alter the binary of the build result.

Moved common macro definitions in the following files to users/mtei/key_blocks.h.
 * keyboards/helix/rev2/keymaps/five_rows/keymap.c
 * keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c

* remove INIT_HELIX_OLED() in helix:five_rows

This change does not alter the binary of the build result.

* update helix/pico/keymaps/mtei/keymap.c

Changed helix/pico/keymaps/mtei/keymap.c to use users/mtei/key_blocks.h.

This change does not alter the binary of the build result.

* Remove old SSD1306OLED code from users/mtei/oled_display.c

This change does not alter the binary of the build result.

* add options ENABLE_COLEMAK, ENABLE_DVORAK and ENABLE_EUCALYN into five_rows/keymap.c

* add users/mtei/{config.h,rules.mk,user_featues.mk,user_options.mk}

* move layer_names[] from users/mtei/oled_display.c to keymaps/five_rows/keymap.c

* Update keyboards/helix/pico/keymaps/mtei/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/helix/pico/keymaps/mtei/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/helix/pico/keymaps/mtei/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/helix/rev2/keymaps/five_rows/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/helix/rev2/keymaps/five_rows/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/helix/rev2/keymaps/five_rows/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/helix/rev3_5rows/keymaps/five_rows/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/helix/rev3_5rows/keymaps/five_rows/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update users/mtei/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update users/mtei/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update users/mtei/cpp_map.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update users/mtei/cpp_map.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update users/mtei/debug_config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update users/mtei/debug_config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update users/mtei/layer_number_util.h

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
2022-05-19 02:33:17 +09:00
QMK Bot
de71c9bc0f Merge remote-tracking branch 'origin/develop' into xap 2022-05-18 10:07:52 +00:00
Joel Challis
6503987c84
Workaround for recent -Werror=array-bounds AVR issues (#17136) 2022-05-18 11:06:55 +01:00
QMK Bot
287ff0066b Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 20:51:29 +00:00
Joel Challis
40e33d03a8
Recommend pillow as part of manual MSYS install (#17133) 2022-05-17 21:50:48 +01:00
QMK Bot
f6cf52c10b Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 18:50:08 +00:00
QMK Bot
37eee020ed Merge remote-tracking branch 'origin/master' into develop 2022-05-17 18:49:34 +00:00
Ryan
d241e80533
Keymap FAQ updates (#17130) 2022-05-18 04:48:59 +10:00
QMK Bot
5ef912ead7 Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 16:14:08 +00:00
QMK Bot
6a11331a41 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 16:13:31 +00:00
James Young
f736828fa8
Frooastside Walnut Community Layout Support (#17112)
* LAYOUT_iso: move Enter to home row

This commit makes the layout macro compatible with QMK's `tkl_nofrow_iso` Community Layout.

* rename LAYOUT_ansi to LAYOUT_tkl_nofrow_ansi

* rename LAYOUT_iso to LAYOUT_tkl_nofrow_iso

* enable Community Layout support
2022-05-17 09:12:52 -07:00
QMK Bot
237c0fdc3e Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 13:21:32 +00:00
QMK Bot
8b79f30cd5 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 13:20:51 +00:00
durken1
dba5b730a3
Update pr_checklist.md (#17122) 2022-05-17 14:20:13 +01:00
QMK Bot
af5745832b Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 12:02:08 +00:00
QMK Bot
cc8c539d00 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 12:01:31 +00:00
John-Schreiber
6560903350
Adding VIA support for bfo-9000 (#17116) 2022-05-17 13:01:26 +01:00
Xelus22
654baebb2c
fix non-working builds (#17123) 2022-05-17 13:00:26 +01:00
QMK Bot
1138b51961 Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 05:06:33 +00:00
QMK Bot
7541e75c3e Merge remote-tracking branch 'origin/master' into develop 2022-05-17 05:05:36 +00:00
HorrorTroll
e9e83b4da7
[Keyboard] Fixed Gas75 info.json and keymap for M64 RGB (#17081) 2022-05-16 22:05:05 -07:00
QMK Bot
da07c5e44a Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 05:04:09 +00:00
QMK Bot
978e2fcd14 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 05:03:38 +00:00
QMK Bot
778e7683f5 Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 05:03:20 +00:00
Albert Y
b6ee006060
[Keyboard] lulu LED index correction (#17108) 2022-05-16 22:03:08 -07:00
QMK Bot
1a61f1f578 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 05:02:48 +00:00
Albert Y
8b9cb030a7
[Keyboard] Latinpad LED index correction (#17109) 2022-05-16 22:02:35 -07:00
Albert Y
aa970e8560
[Keyboard] mach3 LED index correction (#17110) 2022-05-16 22:02:14 -07:00
QMK Bot
25efe0a376 Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 04:46:49 +00:00
QMK Bot
68f466db87 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 04:46:07 +00:00
Álvaro A. Volpato
467f3ae872
[Keyboard] Add Iron165R2 PCB support (#16948) 2022-05-16 21:45:56 -07:00
Drashna Jaelre
f22e8585a1
[Keyboard] Fix too many elements in g_led_config for quark_lp (#17117) 2022-05-16 21:45:11 -07:00