09daafd489
Corrected keyboard layout which was causing issue in QMK configurator ( #14891 )
2021-10-22 23:03:49 -07:00
84d5198ef9
Align PS/2 GPIO defines ( #14745 )
...
* Align PS/2 GPIO
* Align PS/2 GPIO
* refactor more keyboards
* Remove more defines
* Put back avr/chibios split
* format
2021-10-20 20:07:40 +01:00
e50867d52d
[Core] Add support for RISC-V builds and GD32VF103 MCU ( #12508 )
...
* Add support for RISC-V builds and GD32VF103 MCU
* Add toolchain selection in chibios.mk based on the mcu selected in
mcu_selection.mk
* Reorder and added comments to chibios.mk to have a streamlined makefile
* Add GD32VF103 mcu to possible targets for QMK.
* Add STM32 compatibility for GD32VF103 MCU, this is hacky but more efficent
then rewriting every driver.
* Add GigaDevice DFU bootloader as flash target, please note that
dfu-util of at least version 0.10 is needed.
* Add analog driver compatibility
* Add apa102 bitbang driver compatibility
* Add ws2812 bitbang driver compatibility
* Add eeprom in flash emulation compatibility
* Allow faster re-builds with ccache
* Add SiPeed Longan Nano to platform files
* Add SiPeed Longan Nano Onekeys
* Make quine compatible with other bootloaders
* Support builds with picolibc
* Add risc-v toolchain to arch and debian/ubuntu scripts
2021-10-18 16:23:20 +11:00
ede6122ac6
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 05:34:23 +00:00
6b299fab6e
[Keymap] Update Miryoku ( #14827 )
2021-10-15 22:33:45 -07:00
e5662aa53d
Merge remote-tracking branch 'origin/master' into develop
2021-10-15 22:32:41 -07:00
9a0addc77e
[Keymap] Drashna Keymap Updates ( #14842 )
...
* Fix issues with user split transport code
* Improve OLED (More font stuff, improved keylogger, etc)
* Add `KEYLOCK` macro to disable USB, borrowed from command feature.
* Convert Kyria fully to proton C (no more AVR kyria)
* Add Work Louder Work Board keymap
2021-10-15 22:30:23 -07:00
a27c949a32
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 05:10:08 +00:00
a8422cca03
[Keyboard] Tractyl Manuform Updates ( #14841 )
2021-10-15 22:09:40 -07:00
5c8953387e
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 01:09:53 +00:00
8385ab32d0
[Keyboard] Add Split65 to keyboards/handwired ( #13264 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joris Wachsmuth <jwachsmuth@techfak.uni-bielefeld.de>
2021-10-11 18:09:25 -07:00
5043980c36
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 13:42:09 +00:00
633ef1441b
handwired/nicekey optimisation ( #14788 )
...
* handwired/nicekey optimisation
* Add some consts
* Read address from progmem, pass it into send_string_with_delay_P
2021-10-11 14:41:31 +01:00
bdb19faafa
Merge remote-tracking branch 'origin/master' into develop
2021-10-09 18:31:45 +00:00
82bf688e44
[Keyboard] Update Tractyl Manuform config for F411 ( #14770 )
2021-10-09 11:31:13 -07:00
db41a3426c
Improve Adafruit BLE configuration defines ( #14749 )
...
* Improve Adafruit BLE configuration defines
* Formatting
2021-10-08 16:15:20 +01:00
d47f0c10fe
Merge remote-tracking branch 'origin/master' into develop
2021-10-05 01:36:24 +00:00
85ba507482
[Keyboard] Added DC MC 001 ( #14661 )
2021-10-04 18:35:48 -07:00
1667f1375b
Merge remote-tracking branch 'origin/master' into develop
2021-09-30 14:49:11 +00:00
292b7b3835
Remove firmware size impact notes from <keyboard>/rules.mk ( #14652 )
2021-09-30 15:48:36 +01:00
e5d48f6d16
Merge remote-tracking branch 'origin/master' into develop
2021-09-30 09:17:50 +00:00
0b37e07f90
Remove redundant `MIDI_ENABLE = no` in keyboard-level rules.mk ( #14649 )
2021-09-30 19:17:20 +10:00
922c8071e4
Merge remote-tracking branch 'upstream/master' into develop
2021-09-29 23:23:10 -07:00
36bc3c867e
Remove redundant `UNICODE_ENABLE = no` in keyboard-level rules.mk ( #14633 )
2021-09-30 08:14:21 +10:00
f58095fab7
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 16:30:58 +00:00
0338481090
[Keyboard] Updates for Tractyl Manuform config ( #14641 )
2021-09-29 09:30:25 -07:00
1d10a78068
Merge remote-tracking branch 'upstream/master' into develop
2021-09-26 03:16:04 -07:00
03f4c53564
Unicomp Mini M handwired Configurator fix ( #14609 )
...
* apply human-friendly formatting
* correct info.json data
2021-09-26 03:10:40 -07:00
843b9a7e4d
Merge remote-tracking branch 'upstream/master' into develop
2021-09-26 03:04:11 -07:00
6f36eb469d
Remove unused `IS_COMMAND()` instances and Magic Key definitions ( #14610 )
...
* Remove unused IS_COMMAND() instances from keyboard-level config.h, 0-9
* Remove unused IS_COMMAND() instances from keyboard-level config.h, A-B
* Remove unused IS_COMMAND() instances from keyboard-level config.h, C-D
* Remove unused IS_COMMAND() instances from keyboard-level config.h, E-G
* Remove unused IS_COMMAND() instances from keyboard-level config.h, handwired
* Remove unused IS_COMMAND() instances from keyboard-level config.h, H-M
* Remove unused IS_COMMAND() instances from keyboard-level config.h, N-R
* Remove unused IS_COMMAND() instances from keyboard-level config.h, S-Z
* Remove unused Magic Key definitions from keyboard-level config.h, 0-9
* Remove unused Magic Key definitions from keyboard-level config.h, A
* Remove unused Magic Key definitions from keyboard-level config.h, B
* Remove unused Magic Key definitions from keyboard-level config.h, C
* Remove unused Magic Key definitions from keyboard-level config.h, D-E
* Remove unused Magic Key definitions from keyboard-level config.h, F-H
* Remove unused Magic Key definitions from keyboard-level config.h, handwired
* Remove unused Magic Key definitions from keyboard-level config.h, I-K
* Remove unused Magic Key definitions from keyboard-level config.h, L-M
* Remove unused Magic Key definitions from keyboard-level config.h, N-R
* Remove unused Magic Key definitions from keyboard-level config.h, S-V
* Remove unused Magic Key definitions from keyboard-level config.h, W-Z
* Merge remote-tracking branch 'upstream/master' into clean/command_and_magic
* Remove remaining unused IS_COMMAND() instances from keyboard-level config.h
2021-09-26 02:57:20 -07:00
327b1c0298
Merge remote-tracking branch 'origin/master' into develop
2021-09-26 07:01:41 +00:00
95733d1c16
Remove references to KBFirmware JSON Parser ( #14608 )
...
* remove refs: exclusive/e85/soldered
* remove refs: handwired/bigmac
* remove refs: handwired/boss566y/redragon_vara
* remove refs: handwired/marauder
* remove refs: id67
* remove refs: kprepublic/bm60rgb
* remove refs: playkbtw/helen80
* remove refs: sam/sg81m
* remove refs: sawnsprojects/satxri6key
* remove refs: yncognito/batpad
2021-09-26 00:01:11 -07:00
a857956a3c
Merge remote-tracking branch 'origin/master' into develop
2021-09-25 08:31:52 +00:00
68c327f672
Remove keyboard-level `COMBO_ENABLE` rules ( #14550 )
2021-09-25 18:31:24 +10:00
3a2a39e5ec
Initial pass of F405 support ( #14584 )
...
* Initial pass of F405 support
* remove some conf files
* docs
* clang
2021-09-25 00:19:41 +01:00
675c5a5e12
Merge remote-tracking branch 'origin/master' into develop
2021-09-24 12:21:32 -07:00
863d9c35fe
[Keyboard] Create the battleship gamepad keyboard. ( #14551 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 09:27:29 -07:00
1aaef6c988
Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22) ( #14567 )
...
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22)
* update keyboards/handwired/slash/rules.mk per fauxpark
2021-09-22 12:33:41 -07:00
cbdaf686ff
Merge remote-tracking branch 'origin/master' into develop
2021-09-21 16:55:10 +00:00
d84794b352
Remove keyboard-level `TAP_DANCE_ENABLE` rules ( #14538 )
2021-09-21 17:54:36 +01:00
94572d74b5
Merge remote-tracking branch 'upstream/master' into develop
2021-09-21 20:19:07 +10:00
6b74e48f81
Remove audio pin references in rules.mk ( #14532 )
2021-09-21 20:04:03 +10:00
c38a730805
Merge remote-tracking branch 'upstream/master' into develop
2021-09-20 16:58:29 +10:00
574b6734af
Remove backlight pin references in rules.mk ( #14513 )
2021-09-20 16:51:00 +10:00
6fcc5cdde9
Merge remote-tracking branch 'origin/master' into develop
2021-09-18 06:52:51 +00:00
09b66c06d4
[Keyboard] Add Dosa40RGB + dtisaac01 ( #14476 )
2021-09-17 23:52:18 -07:00
bcf4551f74
Move Bluetooth config to common_features.mk ( #14404 )
...
* Move Bluetooth config to common_features.mk
* Update common_features.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-12 08:22:03 -07:00
0fa217a5b7
Align ChibiOS I2C defs with other drivers ( #14399 )
...
* Align ChibiOS I2C defs with other drivers
* Update keyboards/xelus/valor_frl_tkl/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-12 15:41:33 +01:00
bda8924795
Merge remote-tracking branch 'origin/master' into develop
2021-09-12 05:28:01 +00:00
5af1799735
Remove BLUETOOTH_ENABLE from keyboard-level rules.mk ( #14379 )
2021-09-12 15:27:29 +10:00
1895151a9c
Merge remote-tracking branch 'upstream/master' into develop
2021-09-12 14:10:26 +10:00
4791cfae1a
Remove width, height and key_count from info.json ( #14274 )
2021-09-12 14:04:56 +10:00
b6a6217f85
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 13:11:50 +00:00
7277f1febe
Remove BLUETOOTH_ENABLE from defaultish keymaps ( #14375 )
2021-09-10 14:11:17 +01:00
a7c972b329
Merge remote-tracking branch 'upstream/master' into develop
2021-09-10 17:36:17 +10:00
d5cb7de5e4
Change USBasp and bootloadHID bootloaders to lowercase ( #14354 )
2021-09-10 17:17:54 +10:00
d971020cd8
Fix number of elements in info.json does not match errors ( #14213 )
...
* evyd13/atom47/rev3: best guess at fixing info.json
* evyd13/atom47: best guess at fixing info.json
* eyeohdesigns/sprh: best guess at fixing info.json
* handwired/unicomp_mini_m: best guess at fixing info.json
* lazydesigners/the60/rev2: best guess at fixing info.json
* melgeek/mj6xy: best guess at fixing info.json
* pizzakeyboards/pizza65: best guess at fixing info.json
* plx: best guess at fixing info.json
* rojectcain/vault45: best guess at fixing info.json
* sidderskb/majbritt/rev2: best guess at fixing info.json
* spacey: best guess at fixing info.json
2021-09-09 21:33:23 -07:00
e6ff638abf
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 03:36:14 +00:00
7eea780a7d
Remove bootloader listings from rules.mk ( #14330 )
2021-09-10 13:35:46 +10:00
504c00c2e1
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 03:32:53 +00:00
2cb9219a3e
Remove commented out BLUETOOTH_ENABLE rules ( #14361 )
2021-09-10 13:32:22 +10:00
8fa2a7ea2a
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 00:28:34 +00:00
9e77cdf4e6
Bugfix for Joystick and JSON schema ( #14295 )
2021-09-09 10:27:58 +10:00
24000ef2e1
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 23:53:13 +00:00
4294aa0f1e
[Keyboard] Tractyl Manuform - configuration updates ( #14314 )
...
* [Keyboard] Tractyl Manuform - configuration updates
* Update readmes
* Add more details
* Fix issues with encoder pins
* Additional fixes for pin config
* Fix up some comments
2021-09-08 16:52:43 -07:00
38afc7e4cc
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 22:44:49 +00:00
2e0659f7fd
Fixes for recent i2c migrations ( #14352 )
2021-09-08 15:44:18 -07:00
f6b0484f0f
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 01:23:43 +00:00
60c5bd7b5e
handwired/dactyl - Refactor use of legacy i2c implementation ( #14344 )
2021-09-07 18:23:11 -07:00
d72f29556a
Merge remote-tracking branch 'origin/master' into develop
2021-09-05 22:36:16 +00:00
1e1be4c229
[Bug] Fix compile issues for boards with custom matrix ( #14323 )
2021-09-05 23:35:42 +01:00
147289e173
Merge remote-tracking branch 'origin/master' into develop
2021-09-05 20:37:03 +00:00
fe6d6cf76d
Remove empty override functions ( #14312 )
...
* Remove empty override functions, 0-9
* Remove empty override functions, A-D
* Remove empty override functions, E-H
* Remove empty override functions, handwired
* Remove empty override functions, I-L
* Remove empty override functions, M-P
* Remove empty override functions, Q-T
* Remove empty override functions, U-Z
2021-09-05 21:36:31 +01:00
337be283ca
Merge remote-tracking branch 'origin/master' into develop
2021-09-03 16:10:08 +00:00
8574bf20d3
Remove more cruft in keyboard files ( #14288 )
2021-09-03 17:09:30 +01:00
98436577d7
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 04:09:36 +00:00
37aef4ebe1
[Keymap] Fix Drashna Keymap issues missed before Develop merge ( #14271 )
2021-09-01 21:08:58 -07:00
41c50bb653
Change keyboard level include guards to `pragma once` ( #14248 )
...
* Change keyboard level include guards to `pragma once`
And clean up a lot of layout macros
* Oops
* Remove dangling endif
2021-09-01 19:03:14 +10:00
7830d671d3
Merge remote-tracking branch 'origin/master' into develop
2021-08-31 18:23:39 +00:00
6f5428687c
[Keymap] reflects current rick's keymap ( #14169 )
2021-08-31 11:23:02 -07:00
1fdf766988
handwired/symmetric70_proto use post_rules.mk ( #14235 )
2021-08-31 16:58:43 +09:00
bc239cd520
[Keymap] Drashna keymap fixups ( #14140 )
2021-08-24 01:37:14 -07:00
4e1c5887c5
[Core] Refactor OLED to allow easy addition of other types ( #13454 )
...
* add docs
* core changes
* update keyboards to new OLED
* updated users to new OLED
* update layouts to new OLED
* fixup docs
* drashna's suggestion
* fix up docs
* new keyboards with oled
* core split changes
* remaining keyboard files
* Fix The Helix keyboards oled options
* reflect develop
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
2021-08-24 16:28:26 +10:00
f4a2f2bb7e
[Keyboard] Fix compile issues for Tractyl Manuform ( #14105 )
2021-08-21 18:34:16 -07:00
58a5030661
[Keymap] Drashna's Improve OLEDs and custom Split code ( #14063 )
...
* Fill the oleds with right mods
* Enable double mods on x32 oleds
* Disable forced NKRO
* Make oleds fancy only on good MCUs
* Overhaul oled display
* Further enhance oled, with kitty!
* Final oled form
* Not working transport
* Transport id of woring
* Add acceleration
* fix button placement for accel macro
* Fix accelartion location and behavior
* Remove OLED sync code
* Fix alignment issue
* Remove audio hack
* Fix up zima keymap
* Add matrix slave scan function and cleanup drashna.h
* Clean up user space
* Allow userspace sync to be disable-able
* Fix weird issue with audio
* Fix alignment issue with user split sync
* Disable second rgb matrix task
* Disable additional animations
* Change dynamic keymap settings
* Hacky fix for borked corne
* Add Blackpill (F411) support to tractyl manuform
* remove manual via eeprom reset
* Remove all references to rgblight twinkle
* Fix issues with config processing
2021-08-21 13:34:44 -07:00
da1c011afc
Improve pmw3360 sensor and make it more hardware agnostic ( #14097 )
2021-08-20 21:14:23 -07:00
4279b14adf
Merge remote-tracking branch 'upstream/master' into develop
...
Conflicts:
keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
keyboards/space_space/rules.mk
2021-08-19 11:32:23 -07:00
c592128219
[Keyboard] Add Elrgo S to keyboards/handwired ( #13893 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-19 11:15:30 -07:00
3b4c35da6b
[Keymap] Quark AJP10304 layout ( #13290 )
2021-08-19 10:36:20 -07:00
cf5e40c251
Merge remote-tracking branch 'origin/master' into develop
2021-08-17 22:33:17 -07:00
33587254a0
[Keyboard] Fix pins, add VIA support for Stream Cheap 2x4 ( #14001 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-17 17:33:28 -07:00
75b49aff56
Digitizer HID interface : absolute coordinates for mouse cursor ( #12851 )
...
* Add digitizer HID interface for setting the mouse cursor position at
absolute screen coordinates. Tested on Pro Micro, Proton C and
Blackpill.
* Update docs/feature_digitizer.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update tmk_core/protocol/usb_descriptor.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add missing copyrights
Add V-USB support
* Add support for digitizer dedicated endpoint for lufa and chibios.
Fix formatting issues
Move digitizer_task definition to the feature's base implementation file
* Run cformat on modified files
* Change digitizer report usage to Digitizer instead of Pen to avoid
pointer disappearing on Windows.
* Update tmk_core/protocol/vusb/vusb.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Run cformat from docker image
* Remove send_digitizer from host_driver_t and instead rely on the
declaration being the interface to the implementation in each
HW-specific usb implementation.
* Fix build : send_digitizer shouldn't be static in vusb and add
weak-linkage implementation for tests without usb implementation
* Change digitizer user interface to match pointing device's
* Update documentation with new API
Co-authored-by: a-chol <nothing@none.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-18 04:52:44 +10:00
e443fa2892
Fix wait_us overflow in matrix for dactyl based boards ( #14039 )
2021-08-17 08:20:01 -07:00
8d9bfdc254
Add a lot more data to info.json ( #13366 )
...
* add some split data to info.json
* add tags
* add half of config_options.md to info.json
* add support for designating master split
* sort out split transport and primary
* fix bad data in UNUSED_PINS
* fixup custom transport
* wip
* allow for setting split right half keyboard matrix
* add SPLIT_USB_DETECT
* minor cleanup
* fix an erroneous message
* rework split.usb_detect
* adding missing rgblight vars to info.json
* add mouse_key to info.json
* add all remaining options from docs/config_options.md
* fix audio voices
* qmk info: Change text output to use dotted notation
* tweak layout output
* resolve alias names
* break out some functions to make flake8 happy
* add a field for bootloader instructions
* qmk generate-info-json: add a write-to-file argument
Adds an argument that instructs qmk generate-info-json to write the output to a file instead of just to the terminal.
* -arg_only, +action
Because it was never my intention that one would have to specify a value for the argument that enables writing the file.
* Bring qmk generate-info-json inline with other generate commands
* pytest fixup
* fix esca/getawayvan
* fix data driven errors for bpiphany converters
* features.force_nkro -> usb.force_nkro
* split.primary->split.main
* fix esca/getawayvan_f042
* fix the bpiphany converters for real
* fix bpiphany/tiger_lily
* Apply suggestions from code review
Co-authored-by: Nick Brassel <nick@tzarc.org>
* fix generate-api errors
* fix matrix pin extraction for split boards
* fix ploopyco/trackball_nano/rev1_001
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-08-16 23:33:30 +01:00
4b453dca92
Remove MIDI Configuration boilerplate ( #11151 )
...
* remove keyboard-level instances of `MIDI_ENABLE = no`
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]*MIDI_ENABLE[ \t]*=[ \t]*no/d' {} +
```
Co-Authored-By: Nick Brassel <nick@tzarc.org>
* fix case-sensitivity issues on MIDI_ENABLE
Change instances of `MIDI_ENABLE = YES` to `MIDI_ENABLE = yes`.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE[ \t]*=[ \t]*[Yy][Ee][Ss];MIDI_ENABLE = yes;g' {} +
```
* replace `# MIDI controls` with `# MIDI support`
Replace `# MIDI controls` with `# MIDI support` in keyboard-level `rules.mk` files.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*MIDI[ \t]*\(controls\|support\).*;# MIDI support;g' {} +
```
* align inline comments
Aligns the inline comments to the length used by the QMK AVR rules.mk template.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE *= *yes.*;MIDI_ENABLE = yes # MIDI support;g' {} +
```
* remove commented instances of `MIDI_ENABLE` from keyboard `rules.mk` files
Commands:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#\([ \t]*MIDI_ENABLE\) = yes; \1 = no ;' {} +
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;^\([ \t]*\)\(MIDI_ENABLE = no\);\2\1;' {} +
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]\+MIDI_ENABLE *= *no/d' {} +
```
* remove MIDI configuration boilerplate from keyboard config.h files
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-08-16 06:51:13 +10:00
fa1ec32e39
Merge remote-tracking branch 'origin/master' into develop
2021-08-13 18:31:14 +00:00
2c9957eb7e
[Keyboard] Add dtisaac01 keyboard ( #13967 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 11:30:43 -07:00
345f6dc4e6
Merge remote-tracking branch 'upstream/master' into develop
...
Fixes merge conflicts in:
- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
- Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
- Conflict from PR 13947
2021-08-11 09:48:25 -07:00
3161f10b1f
Update USB Device strings for VIA identification ( #13962 )
2021-08-11 00:19:55 -07:00
8d1255ccab
Handwired/Stream_Cheap/2x4: Add via support ( #13297 )
...
* Handwired/Stream_Cheap/2x4: Add via support
Signed-off-by: Luigi311 <luigi311.lg@gmail.com>
* Handwired/Stream_Cheap: Update readme for via
Signed-off-by: Luigi311 <luigi311.lg@gmail.com>
* Handwired/Stream_Cheap/2x4: Add 2x4 to via json
Signed-off-by: Luigi311 <luigi311.lg@gmail.com>
* Handwired/Stream_Cheap/2x4: Add GPL2+ License to keymap
Signed-off-by: Luigi311 <luigi311.lg@gmail.com>
2021-08-11 07:40:30 +10:00
jurassic73
Joel Challis
Stefan Kerkmann
QMK Bot
Manna Harbour
Drashna Jael're
Joris Wachsmuth
Ryan
Daniel Cormier
James Young
Andrew Braini
Dao Tak Isaac
Zach White
Ibnu Daru Aji
Takeshi ISHII
Xelus22
Yaroslav Smirnov
Alan Pocklington
Matthias Liffers
a-chol
Luigi311