summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move to correct location (#14171)Joel Challis2021-08-262-0/+0
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-261-1/+1
|\
| * Skeletn87 - Fix RGB pin (#14170)kb-elmo2021-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add Skeletn87 * update skeletn87 files * update skeletn87 soldered * update readme image * update readme (again) * fix skeletn87 indicator LEDs * fix led pin for production PCB
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-259-0/+442
|\|
| * [keyboard] Add 0x3E (#14088)Charles2021-08-269-0/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 0x3E - default config * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review 2 Firmware size optimization Co-authored-by: Drashna Jaelre <drashna@live.com> * Rename files as per project guidelines + remove empty * Update link in readme.md Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-251-1/+1
|\|
| * [converter/a1200] Changing layout macro reference info.json (#14143)8bits4ever2021-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-254-0/+317
|\|
| * [Keymap] mechmaster48 keymap for OLKB Preonic rev3 (#14137)MechMaster482021-08-254-0/+317
| |
* | Move nix folder alongside vagrant (#14132)Joel Challis2021-08-255-2/+2
| |
* | Revert 14083 && 14144 (#14150)Joel Challis2021-08-258-118/+104
| | | | | | | | | | | | | | | | | | * Revert "Short term bodge for firmware size bloat (#14144)" This reverts commit a8d65473461c337fb1e168d907bfb8c3ac8fdbd0. * Revert "Tidy up quantum.c now some of tmk_core has been merged (#14083)" This reverts commit c4dbf4bf0118dd785802861beb247433b5b7411d.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-241-9/+9
|\|
| * [Keyboard] Update Technik ortholinear RGB matrix points (#14124)Albert Y2021-08-241-9/+9
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Fix merge artifacts (#14146)Joel Challis2021-08-245-0/+0
| |
* | Align some quantum sub-directories (#14134)Joel Challis2021-08-2417-13/+6
| | | | | | | | | | | | | | * Misc folder tidy * Review comments * Remove redundant entry
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-2411-0/+426
|\|
| * [Keyboard] Add yoichiro/lunakey_macro (#13849)Yoichiro Tanaka2021-08-2411-0/+426
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Short term bodge for firmware size bloat (#14144)Joel Challis2021-08-243-4/+21
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-08-2454-288/+2135
|\|
| * [Keyboard] Add serneity65 (#13889)GG2021-08-2419-0/+945
| |
| * [Keyboard] Fix keyprez qmk configurator (#14119)Christian Sandven2021-08-242-81/+89
| |
| * [Keyboard] Add QEZ keyboard (#14131)kb-elmo2021-08-249-0/+374
| |
| * [Keyboard] Update Technik staggered RGB matrix points (#14125)Albert Y2021-08-241-9/+9
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
| * [Keyboard] Update info.json for ocean/gin_v2 (#14121)Rifaa Subekti2021-08-241-6/+68
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Fix default keymap for quark squared keyboard (#14139)Drashna Jaelre2021-08-241-1/+1
| |
| * Remove more unused files (#14135)Joel Challis2021-08-242-24/+0
| |
| * [Keyboard] Add new keyboard version: keychron/q1/rev_0102 (#14029)lalalademaxiya12021-08-2320-171/+653
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | add wait_cpuclock() macro for AVR and CPU_CLOCK macro (#12755)Takeshi ISHII2021-08-242-5/+8
| |
* | Tidy up quantum.c now some of tmk_core has been merged (#14083)Joel Challis2021-08-246-101/+98
| |
* | fix (#14142)Xelus222021-08-241-1/+1
| |
* | [Keymap] Fixed GMMK Pro -> stickandgum keymap readme.md (#14123)stickandgum2021-08-242-11/+10
| | | | | | Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | [Keymap] Drashna keymap fixups (#14140)Drashna Jaelre2021-08-247-27/+21
| |
* | [Core] Refactor OLED to allow easy addition of other types (#13454)Xelus222021-08-24500-1387/+1579
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Fix Mouse Shared EP functionality (#14136)Drashna Jaelre2021-08-242-3/+4
| | | | | | 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.
* | Fix bootloadHID comments breaking :flash (#14133)Drashna Jaelre2021-08-231-2/+2
| |
* | eeprom_stm32: implement high density wear leveling (#12567)Donald Kjer2021-08-2312-177/+1529
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-232-2/+2
|\|
| * Fix US_RDQU keycode (#13464)Olli Helenius2021-08-242-2/+2
| | | | | | | | `US_RDQU` and `US_LDQU` were aliased to the same keycode. `US_RDQU` should use the right bracket.
* | adding uf2 flash support for blackpill 401 (#13968)Path Nirvana2021-08-244-2/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-232-2/+2
|\|
| * [Keyboard] update default and via keymap for ocean/wang_v2 (#14122)Rifaa Subekti2021-08-232-2/+2
| |
* | Fixup line endings.Nick Brassel2021-08-232-139/+139
| |
* | [Keymap] Feature rich keymap for GMMK Pro (ANSI) (#14120)stickandgum2021-08-224-0/+441
| | | | | | Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-231-10/+13
|\|
| * [Keyboard] Update rgb matrix config in kbdfans/kbd67/mkiirgb/v3/v3.c (#14094)Vino Rodrigues2021-08-221-10/+13
| | | | | | | | | | 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).
* | Fix typo (#14118)Dasky2021-08-231-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-221-1/+1
|\|
| * Add fix for brew upgrade (#12921)Bror Winther2021-08-221-1/+1
| | | | | | Add a fix for `brew upgrade` so only formulae is upgraded and not casks
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-221-15/+15
|\|
| * Fix line endings for `quark_squared` info.json (#14113)Ryan2021-08-221-15/+15
| |