summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\|
| * Keymap FAQ updates (#17130)Ryan2022-05-181-38/+33
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-173-11/+16
|\|
| * Frooastside Walnut Community Layout Support (#17112)James Young2022-05-173-11/+16
| | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-171-1/+1
|\|
| * Update pr_checklist.md (#17122)durken12022-05-171-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-174-5/+51
|\|
| * Adding VIA support for bfo-9000 (#17116)John-Schreiber2022-05-172-0/+43
| |
| * fix non-working builds (#17123)Xelus222022-05-172-5/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-173-3/+3
|\|
| * [Keyboard] Fixed Gas75 info.json and keymap for M64 RGB (#17081)HorrorTroll2022-05-163-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-171-10/+10
|\|
| * [Keyboard] lulu LED index correction (#17108)Albert Y2022-05-161-10/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-172-14/+12
|\|
| * [Keyboard] Latinpad LED index correction (#17109)Albert Y2022-05-161-11/+9
| |
| * [Keyboard] mach3 LED index correction (#17110)Albert Y2022-05-161-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-1728-1/+973
|\|
| * [Keyboard] Add Iron165R2 PCB support (#16948)Álvaro A. Volpato2022-05-1627-0/+972
| |
| * [Keyboard] Fix too many elements in g_led_config for quark_lp (#17117)Drashna Jaelre2022-05-161-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-173-24/+14
|\|
| * [Keyboard] Fix compilation issues for Quark LP (#17009)Drashna Jaelre2022-05-163-24/+14
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-171-2/+149
|\|
| * DigiCarpice Configurator Rendering Fix (#17113)James Young2022-05-171-2/+149
| | | | | | | | | | * info.json: apply friendly formatting * info.json: rebuild layout data
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-161-1/+1
|\|
| * fix tiger80 matrix error (#17107)moyi46812022-05-161-1/+1
| |
* | Warn about LTO with arm_atsam, not ChibiOS. (#17106)Nick Brassel2022-05-161-2/+2
| |
* | Various fixes for g_led_config lint warnings (#17104)Joel Challis2022-05-167-12/+32
| |
* | Data driven `g_led_config` (#16728)Joel Challis2022-05-167-4/+303
| |
* | RESET -> QK_BOOT default keymaps (#17037)Joel Challis2022-05-151893-2240/+2240
| |
* | Rename keymap_extras headers for consistency (#16939)Ryan2022-05-15131-151/+151
| |
* | [Feature] Add support for multiple switchs/solenoids to Haptic Feedback ↵Drashna Jaelre2022-05-157-69/+163
| | | | | | | | engine (#15657)
* | Check for ongoing transfers on the OUT endpoint (#16974)Stefan Kerkmann2022-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...when attempting to start a receiving USB transfer. Previously, we would check on the IN endpoint which is the transmitting part of the USB endpoint. This is wrong and lead to two USB transfers being started immediately after each other in case of e.g. RAW HID endpoints: 1. When finishing an OUT transfer the low level USB driver calls the out_cb callback, which in turn initiates another OUT transfer by calling qmkusbDataReceived. 2. When the raw hid receive channel runs empty inside the raw_hid task, another OUT transfer is started to potentially fill the channel again. This happens by calling ibnotify. Both events occur directly after each other, thus triggering the bug.
* | Format code according to conventions (#17096)QMK Bot2022-05-141-3/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-141-2/+2
|\|
| * Fix anchors with <code> in table of content (#15169)Mateusz Ż2022-05-141-2/+2
| |
* | Enhancement and fixes of "Secure" feature (#16958)Drashna Jaelre2022-05-148-2/+379
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-145-20/+1111
|\|
| * Eason Capsule65 Community Layout Support (#17090)James Young2022-05-145-20/+1111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * capsule65.h: modify matrix diagram Taken from the VIA layout data. * rename LAYOUT to LAYOUT_all * add LAYOUT_65_ansi macro * add LAYOUT_65_ansi_blocker macro * add LAYOUT_65_ansi_blocker_tsangan macro * add LAYOUT_65_ansi_split_bs macro * add LAYOUT_65_ansi_blocker_split_bs macro * add LAYOUT_65_ansi_blocker_tsangan_split_bs macro * add LAYOUT_65_iso macro * add LAYOUT_65_iso_split_bs macro * add LAYOUT_65_iso_blocker macro * add LAYOUT_65_iso_blocker_split_bs macro * add LAYOUT_65_iso_blocker_tsangan macro * add LAYOUT_65_iso_blocker_tsangan_split_bs macro * enable Community Layout support * info.json: update maintainer value This field is meant to reference the maintainer's GitHub username.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-145-11/+17
|\|
| * Axolstudio Foundation Gamma: Community Layout Support (#17080)James Young2022-05-145-11/+17
| | | | | | | | | | | | | | * LAYOUT_tkl_f13_ansi_tsangan support Renames `LAYOUT_ansi_tsangan` to `LAYOUT_tkl_f13_ansi_tsangan`. Also enables Community Layout support. * LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift support