summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-232-44/+32
|\|
| * [Keyboard] Atreus62update (#17179)Xyverz2022-05-222-44/+32
| | | | | | | | | | Co-authored-by: Ian Sterling <503326@MC02YT9K9LVCF.tld> Co-authored-by: Ian Sterling <80361942+iansterlingaaa@users.noreply.github.com> Co-authored-by: Ian Sterling <xyverz@paeroa-arch.localdomain>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-211-0/+122
|\|
| * Add massdrop/alt:charlesrocket keymap (#17173)-k2022-05-211-0/+122
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-217-0/+193
|\|
| * Added Cantor keyboard (#16552)Diego Palacios2022-05-217-0/+193
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-209-151/+818
|\|
| * PJB Eros Community Layout Support (#17158)James Young2022-05-205-38/+703
| |
| * Ryan Skidmore rskeys100 Community Layout Support (#17159)James Young2022-05-204-113/+115
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-202-0/+54
|\|
| * Dailycraft Sandbox Configurator Data (#17169)James Young2022-05-202-0/+54
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-201-1/+1
|\|
| * Small Markdown Patch for docs/feature_rgb_matrix.md (#17171)James Young2022-05-201-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-201-5/+12
|\|
| * [Docs] Align LED Matrix docs with RGB matrix docs (#17140)jpe2302022-05-201-5/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-2023-45/+139
|\|
| * [Keyboard] yeti LED index correction (#17138)Albert Y2022-05-201-5/+5
| |
| * [Keyboard] Add eeprom IC-less rev for MechWild OBE and Waka60 (#17126)Kyle McCreery2022-05-2022-40/+134
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-201-5/+1
|\|
| * [Keyboard] rskeys100 LED index correction (#17139)Albert Y2022-05-201-5/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-2028-101/+847
|\|
| * [Docs] Update Steno Keycode Table (#17155)Kyle McCreery2022-05-201-1/+1
| |
| * [Keyboard] Update Layouts for MB-65S and MB-65H (#17160)AnthonyNguyen1682022-05-2027-100/+846
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-200-0/+0
|\|
| * [CI] Format code according to conventions (#17164)QMK Bot2022-05-201-1/+1
| |
* | [CI] Format code according to conventions (#17165)QMK Bot2022-05-201-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-202-17/+27
|\|
| * [Keyboard] 0xc_pad LED index correction (#17120)Albert Y2022-05-191-8/+12
| |
| * [Keyboard] launch_1 LED index correction (#17118)Albert Y2022-05-191-9/+15
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-2018-0/+594
|\|
| * [Keyboard] Add Eu isolation Keyboard (#17102)aadriance2022-05-1918-0/+594
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: TuckTuckFloof <stnashmore@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-2010-0/+244
|\|
| * [Keyboard] add rad keyboard (#17088)anubhav dhiman2022-05-1910-0/+244
| | | | | | Co-authored-by: zvecr <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-2010-0/+688
|\|
| * [Keyboard] Add miniZone keyboard (#16644)takashicompany2022-05-1910-0/+688
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Move GMMK Pro to allow for multiple revisions (#16423)GloriousThrall2022-05-20125-23/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Continue Caps Word when AltGr (right Alt) is held. (#17156)Pascal Getreuer2022-05-202-1/+34
| | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-195-38/+137
|\|
| * KBDfans Tiger80 Community Layout Support and Keymap Touch-Up (#17149)James Young2022-05-195-38/+137
| | | | | | | | | | | | | | | | | | * info.json: apply friendly formatting * rename LAYOUT_all to LAYOUT_tkl_f13_ansi_tsangan * enable Community Layout support * refactor keymaps to use grid alignment
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-1910-1/+1061
|\|
| * KBDfans Phase One Layout Macro Additions and Configurator Data (#17148)James Young2022-05-1910-1/+1061
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-193-724/+340
|\|
| * Hineybush Ibis Layout Additions and Configurator Rendering Update (#17132)James Young2022-05-193-724/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-181-1/+2
|\|
| * Fix platforms/avr/drivers/ws2812.c (#17043)Takeshi ISHII2022-05-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-1823-679/+609
|\|
| * Update mtei's keymap (helix/rev2:five_rows, helix/pico:mtei, ↵Takeshi ISHII2022-05-1923-679/+609
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Workaround for recent -Werror=array-bounds AVR issues (#17136)Joel Challis2022-05-181-0/+5
| |
* | Recommend pillow as part of manual MSYS install (#17133)Joel Challis2022-05-171-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-171-38/+33
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 14:24:39 +0000