0c97bc5179
Merge remote-tracking branch 'origin/master' into develop
2021-08-25 23:40:04 +00:00
4c5334cb9e
[converter/a1200] Changing layout macro reference info.json ( #14143 )
...
* Rename keyboards/converter/a1200/config.h to keyboards/converter/a1200/teensy2pp/config.h
* Rename keyboards/converter/a1200/rules.mk to keyboards/converter/a1200/teensy2pp/rules.mk
* Create dummy
* Add files via upload
* Delete dummy
* Update readme.md
* Update info.json
2021-08-26 00:39:34 +01:00
329c130202
Merge remote-tracking branch 'origin/master' into develop
2021-08-25 19:04:06 +00:00
89f2b9486f
[Keymap] mechmaster48 keymap for OLKB Preonic rev3 ( #14137 )
2021-08-25 12:03:27 -07:00
527b1e52aa
Move nix folder alongside vagrant ( #14132 )
2021-08-25 15:27:48 +01:00
a84de5e22b
Revert 14083 && 14144 ( #14150 )
...
* Revert "Short term bodge for firmware size bloat (#14144 )"
This reverts commit a8d6547346#14083 )"
This reverts commit c4dbf4bf01
2021-08-25 01:16:59 +01:00
3855713ca0
Merge remote-tracking branch 'origin/master' into develop
2021-08-24 22:10:04 +00:00
bb1b822247
[Keyboard] Update Technik ortholinear RGB matrix points ( #14124 )
...
Co-authored-by: filterpaper <filterpaper@localhost>
2021-08-24 15:09:26 -07:00
622c3cac3a
Fix merge artifacts ( #14146 )
2021-08-24 17:18:25 +01:00
2cade3a483
Align some quantum sub-directories ( #14134 )
...
* Misc folder tidy
* Review comments
* Remove redundant entry
2021-08-24 17:07:11 +01:00
2827a3cf75
Merge remote-tracking branch 'origin/master' into develop
2021-08-24 15:44:36 +00:00
b4867e1600
[Keyboard] Add yoichiro/lunakey_macro ( #13849 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-24 08:44:00 -07:00
a8d6547346
Short term bodge for firmware size bloat ( #14144 )
2021-08-24 16:09:23 +01:00
e3b68ddfe8
Merge remote-tracking branch 'origin/master' into develop
2021-08-24 07:32:31 -07:00
c9c60d227e
add wait_cpuclock() macro for AVR and CPU_CLOCK macro ( #12755 )
2021-08-24 14:34:24 +01:00
c4dbf4bf01
Tidy up quantum.c now some of tmk_core has been merged ( #14083 )
2021-08-24 14:28:37 +01:00
097e85e930
[Keyboard] Add serneity65 ( #13889 )
2021-08-24 02:50:56 -07:00
c4a2dc9a2d
fix ( #14142 )
2021-08-24 19:39:24 +10:00
3ef978cb13
[Keyboard] Fix keyprez qmk configurator ( #14119 )
2021-08-24 01:54:17 -07:00
a4aa6ccf7b
[Keyboard] Add QEZ keyboard ( #14131 )
2021-08-24 01:49:50 -07:00
b8c74d6b5d
[Keyboard] Update Technik staggered RGB matrix points ( #14125 )
...
Co-authored-by: filterpaper <filterpaper@localhost>
2021-08-24 01:49:13 -07:00
eaad654798
[Keymap] Fixed GMMK Pro -> stickandgum keymap readme.md ( #14123 )
...
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-08-24 01:48:35 -07:00
e1c264f579
[Keyboard] Update info.json for ocean/gin_v2 ( #14121 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-24 01:42:23 -07:00
bc239cd520
[Keymap] Drashna keymap fixups ( #14140 )
2021-08-24 01:37:14 -07:00
3455e2408d
[Keyboard] Fix default keymap for quark squared keyboard ( #14139 )
2021-08-24 01:19:00 -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
47a38c3f0e
Remove more unused files ( #14135 )
2021-08-24 14:02:53 +10:00
6fd20acf4b
Fix Mouse Shared EP functionality ( #14136 )
...
Specifically, if you enable the shared endpoint for mouse reports (or keyboard, which force enables it for mouse), and you don't have mousekeys enabled, it does not properly enable shared mouse EP for pointing device (which uses mouse reports). This cause it to error out in compiling. This fixes up some of the logic to ensure that all use cases are supported, and consolidates some of the code.
2021-08-24 11:40:24 +10:00
e3483b4126
[Keyboard] Add new keyboard version: keychron/q1/rev_0102 ( #14029 )
...
* Add keyboard Q1
* Update keyboards/keychron/q1/readme.md
* Update keyboards/keychron/q1/rev_0100/rules.mk
* Update keyboards/keychron/q1/readme.md
* Change layer switch function to "default_layout_set"
* Update keyboards/keychron/q1/rev_0100/info.json
* Update keyboards/keychron/q1/q1.c
* Mask out the DIP switch to fix sleeping issue when switch is ON
* Added and changed readme.md
Added keyboards\q1\rev_0100\readme.md
Changed keyboards\q1\readme.md since different MCU may used in other version.
* update
* update keymap name
* update keymap for keychron/q1/rev_0102
* Update info.json
2021-08-23 17:32:15 -07:00
d57d9aec4f
Fix bootloadHID comments breaking :flash ( #14133 )
2021-08-23 23:46:06 +01:00
e756a21636
eeprom_stm32: implement high density wear leveling ( #12567 )
...
* eeprom_stm32: implement wear leveling
Update EECONFIG_MAGIC_NUMBER
eeprom_stm32: check emulated eeprom size is large enough
* eeprom_stm32: Increasing simulated EEPROM density on stm32
* Adding utility script to decode emulated eeprom
* Adding unit tests
* Applying qmk cformat changes
* cleaned up flash mocking
* Fix for stm32eeprom_parser.py checking via signature with wrong base
* Fix for nk65 keyboard
Co-authored-by: Ilya Zhuravlev <whatever@xyz.is>
Co-authored-by: zvecr <git@zvecr.com>
2021-08-23 23:15:34 +01:00
2481e109a0
Merge remote-tracking branch 'origin/master' into develop
2021-08-23 22:06:37 +00:00
9472c4b8cb
Fix US_RDQU keycode ( #13464 )
...
`US_RDQU` and `US_LDQU` were aliased to the same keycode. `US_RDQU`
should use the right bracket.
2021-08-24 08:06:04 +10:00
f314705921
adding uf2 flash support for blackpill 401 ( #13968 )
...
* adding uf2 flash support for blackpill 401
* forgot to add blackpill to keyboard header file
* making changes requested by drashna
* fixing tzarc s comments
* removing the keyboard
* undo the change to dactyl_manuform.h
2021-08-24 08:05:10 +10:00
718f0a2482
Merge remote-tracking branch 'origin/master' into develop
2021-08-23 14:26:24 +00:00
a72b562141
[Keyboard] update default and via keymap for ocean/wang_v2 ( #14122 )
2021-08-23 07:25:51 -07:00
d8778eba92
Fixup line endings.
2021-08-23 19:37:16 +10:00
71df135254
[Keymap] Feature rich keymap for GMMK Pro (ANSI) ( #14120 )
...
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-08-22 19:19:11 -07:00
355872cc1d
Merge remote-tracking branch 'origin/master' into develop
2021-08-23 02:10:58 +00:00
5cd7999bc4
[Keyboard] Update rgb matrix config in kbdfans/kbd67/mkiirgb/v3/v3.c ( #14094 )
...
This patch corrects 2 issues with the LED matrix of the KDBFans KBD67 Lite (v3)
* Incorrect mapping of the right-shift, down-arrow, and right-arrow. (i.e. `NO_LED` positions of the `g_led_config` key matrix in the .c file do not match the `LAYOUT_65_ansi_blocker` matrix in the .h file.
* Remapping of the *LED Index to Physical Position* using physical measurements from actual keyboard and accounting for the southpaw LED position to define the true centre of the keyboard (more relevant to circular animations).
2021-08-22 19:10:23 -07:00
9af069ecf3
Fix typo ( #14118 )
2021-08-23 09:31:38 +10:00
f043b8be38
Merge remote-tracking branch 'origin/master' into develop
2021-08-22 21:43:07 +00:00
aa28335651
Add fix for brew upgrade ( #12921 )
...
Add a fix for `brew upgrade` so only formulae is upgraded and not casks
2021-08-22 14:42:34 -07:00
4b87c1f40b
Merge remote-tracking branch 'origin/master' into develop
2021-08-22 16:29:18 +00:00
5319727b70
Fix line endings for `quark_squared` info.json ( #14113 )
2021-08-22 17:28:48 +01:00
7dfa93d9b6
Merge remote-tracking branch 'origin/master' into develop
2021-08-22 06:04:52 +00:00
46fb874269
[Keyboard] add support for Quark² ( #14109 )
...
Quark² is a hotswap version of the Quark PCB
2021-08-21 23:04:20 -07:00
34d0376ab9
Merge remote-tracking branch 'origin/master' into develop
2021-08-22 05:12:24 +00:00
9a51076859
[Keyboard] Keyprez bison ( #14100 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-21 22:11:56 -07:00
f709394442
Merge remote-tracking branch 'origin/master' into develop
2021-08-22 05:11:44 +00:00
QMK Bot
8bits4ever
MechMaster48
Joel Challis
Albert Y
Yoichiro Tanaka
Drashna Jael're
Takeshi ISHII
GG
Xelus22
Christian Sandven
kb-elmo
stickandgum
Rifaa Subekti
lalalademaxiya1
Donald Kjer
Olli Helenius
Path Nirvana
Nick Brassel
Vino Rodrigues
Dasky
Bror Winther
Ryan
npspears