summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-094-10/+69
|\
| * Migrate preonic/rev3 to pwm ws2812 driver (#13142)Joel Challis2021-06-094-10/+69
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-082-2/+2
|\|
| * Fix Bug with (RGB|LED)_DISABLE_WHEN_USB_SUSPENDED define (#13060)Drashna Jaelre2021-06-092-2/+2
| |
* | `spi_master` Kinetis support (#13098)Ryan2021-06-082-11/+78
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-08178-209/+556
|\|
| * Set `BOOTLOADER = stm32-dfu` for all applicable STM32 boards (#12956)Ryan2021-06-08178-209/+556
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Set bootloader to stm32-dfu for STM32F303 * Set bootloader to stm32-dfu for STM32F0x2 * Set bootloader to stm32-dfu for STM32F4x1 * Set bootloader to stm32duino for sowbug * Delete redundant bootloader_defs headers * Add some missing MCU name comments * Move APM32 dfu-suffix overrides underneath bootloader * Remove redundant STM32_BOOTLOADER_ADDRESS defines/rules
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-071-1/+1
|\|
| * Update requirements.txt (#13135)Joel Challis2021-06-081-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-072-2/+2
|\|
| * Move hid and pyusb to requirements.txt (#13134)Zach White2021-06-072-2/+2
| | | | | | | | | | * Add his and pyusb to * Update requirements-dev.txt
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-071-3/+3
|\|
| * Update Japanese newbs_building_firmware_configurator.md document. (#12836)shela2021-06-081-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-071-3/+3
|\|
| * update ref_functions.md translation (#12784)umi2021-06-081-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-071-3/+3
|\|
| * update one_shot_keys.md translation (#12771)umi2021-06-081-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-071-3/+3
|\|
| * update hardware_avr.md translation (#12760)umi2021-06-081-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-071-3/+3
|\|
| * update feature_rawhid.md translation (#12759)umi2021-06-081-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-071-2/+10
|\|
| * [Docs] update Japanese translation of custom_quantum_functions.md (#12715)umi2021-06-081-2/+10
| | | | | | | | | | | | | | | | | | | | | | * update custom_quantum_functions.md translation * update custom_quantum_functions.md translation * explicitly describe pronoun * update based on comment * update based on comment
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-074-0/+30
|\|
| * Add default `ortho_1x1` layout (#13118)Ryan2021-06-074-0/+30
| |
* | Add readPort() and some API to 'tmk_core/common/*/gpio.h' (#12754)Takeshi ISHII2021-06-072-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add readPort() and some API to 'tmk_core/common/*/gpio.h' The following macros have been added to gpio.h. * readPort(port) * setPortBitInput(port, bit) * setPortBitInputHigh(port, bit) * setPortBitOutput(port, bit) * writePortBitLow(port, bit) * writePortBitHigh(port, bit) * add data type 'port_data_t' into gpio.h * rename qmk_pin to pin
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-073-113/+262
|\|
| * [Docs] added basic midi documention of common features (#13113)wxyangf2021-06-063-113/+262
| | | | | | | | | | Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Fix firmware size check with avr-libc 1:2.0.0+Atmel3.6.2-1.1 (Debian ↵Sergey Vlasov2021-06-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bullseye) (#12951) Debian bullseye (testing at the moment, but seems close to release) has avr-libc 1:2.0.0+Atmel3.6.2-1.1 with some changes taken from the Atmel-distributed toolchain. In particular, the <avr/io.h> header for ATmega32A (avr/iom32a.h) now defines the FLASHEND constant as `0x7FFFU`, and that `U` suffix breaks the firmware size check code, because the shell arithmetic expansion that is used to calculate `MAX_SIZE` does not support those C-specific suffixes. As a workaround, add `-D__ASSEMBLER__` to the C preprocessor invocation that is used to expand those macros; in this case avr/iom32a.h defines `FLASHEND` without the `U` suffix, and everything works as it did before with older avr-libc versions. The exact same code is present in two places; they are both changed, even though the code in `tmk_core/avr.mk` is actually never used for ATmega32A (and the header for ATmega32U4 does not add that `U` suffix to `FLASHEND` for some reason).
* | [Keymap] RGB Matrix working for Sofle RGB (#12861)Carlos Martins2021-06-066-0/+602
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Core] ChibiOS fix O3 and LTO breakage of extra keys and joystick (#12819)Stefan Kerkmann2021-06-063-35/+36
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-075-1/+92
|\|
| * [Keyboard] Add program yoink via keymap (#12645)Matthew Dias2021-06-065-1/+92
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-0711-0/+3890
|\|
| * [Keyboard] add molecule (#12601)bbrfkr2021-06-0611-0/+3890
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-075-9/+9
|\|
| * Fixed ISO keyboard layout for the Mysterium rev1.1 board (#12531)HalfHeuslerAlloy2021-06-065-9/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-074-0/+88
|\|
| * [Keymap] add id80/ansi/keymaps/msf (#11957)Miguel Filipe2021-06-064-0/+88
| |
* | core: bump USB spec version in device descriptor to 2.0 (#13078)Michael Stapelberg2021-06-071-1/+1
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-061-4/+4
|\|
| * Corrected Number-pad numbers (#13057)Nathan_Blais2021-06-071-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-058-0/+277
|\|
| * JETVAN: Add initial support (#12790)TerryMathews2021-06-068-0/+277
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-051-19/+26
|\|
| * Update Japanese document (#10670)shela2021-06-061-19/+26
| | | | | | Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-051-5/+3
|\|
| * update feature_layers.md translation (#12752)umi2021-06-061-5/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-052-20/+6
|\|
| * Fix includes for pmw3360 driver (#13108)Drashna Jaelre2021-06-052-20/+6
| |