Merge remote-tracking branch 'origin/master' into develop
Generate version.h when compiling json files (#11581)
* generate version.h when compiling json files
* make flake8 happy
* fix formatting and verbose
* quiet up the compile output
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] add Stream15 keyboard (#11515)
* add keyboard Stream15
* committted changes as suggested by drashna
* committed further changes as suggested
* Update info.json
removed excessive comma
* Update keyboards/nibiria/stream15/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/nibiria/stream15/keymaps/via/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/nibiria/stream15/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* resolved 2 more issues
Co-authored-by: Ryan <fauxpark@gmail.com>
ChibiOS conf upgrade for hub20 (#11588)
hub20 - 089b49b233c4e9b8ab643c6b338c91f5c3136e32
Merge remote-tracking branch 'origin/master' into develop
Improve the compile and flash subcommands (#11334)
* add support for --clean to compile and flash
* compile standalone JSON keymaps without polluting the tree
* Add support for passing environment vars to make
* make flake8 happy
* document changes to qmk compile and flash
* add -e support to json export compiling
* Fix python 3.6
* honor $MAKE
* add support for parallel builds
Merge remote-tracking branch 'origin/master' into develop
New Keyboard: walletburner/cajal (#10458)
* adding alpha variants
* adding cajal layouts
* adding V2 PCB support
adding additional layouts for new PCB version, and correecting incorrect image in info file
* Cleanup master -- remove alpha9
* Cleanup master -- remove g4m3ralpha
* Cleanup master -- remove cajal & sl40
* Master cleanup -- re-add sl40
* Master cleanup -- correct SL40 image
* New Keyboard: walletburner/cajal
* Added license attribution to *.{c,h} files
* Update keyboards/walletburner/cajal/config.h
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/walletburner/cajal/keymaps/ortho/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Rename 'ortho' keymap to 'default_ortho'
* Update keyboards/walletburner/cajal/cajal.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update readme.md
Adding bootloader instructions.
Co-authored-by: worldspawn00 <mcmancuso@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Merge remote-tracking branch 'origin/master' into develop
Add BGR byte order for WS2812 drivers (#11562)
* add byte order bgr for ws2812
* update docs for driver change
* Update ws2812_driver.md
* Update docs/ws2812_driver.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
Modify my keymap (#11407)
Merge remote-tracking branch 'origin/master' into develop
Adds VIA support for the KPRepublic's BM60 Poker (#11267)
* WIP working on new keymap
* tweaking keymap
* updated keymap
* cleaned up a little bit
* New preonic keymap
* my preonic keymap
* added mac layout
* preonic map update
* cleaning up old repo
* cleaning up to match upstream
* more cleanup
* removing old keymaps
* cleaned up commit history for bm60poker via support
* cleaned up via keymap
* fixed copywrite
Co-authored-by: Peter Peterson <ppeterson@noao.edu>
Merge remote-tracking branch 'origin/master' into develop
Afternoon Labs Breeze Rev0: Configurator key sequence fix (#11550)
* human-friendly formatting
* correct key order
Merge remote-tracking branch 'upstream/master' into develop
Cutie Club Borsdorf: Configurator key sequence fix (#11549)
* human-friendly formatting
* correct key order (ISO Enter)
[Keyboard] Add cool836A 1_2 (#11467)
* 1st trial on 1_2
* remove keymaps/default/km_default.c
* fix cool836A.h
* fix keymap.c into 3x12
* rename to cool836a (not 'A')
* remove cool836A (not a)
* remove backslashes at keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* update keymap.c (add licence)
* Update keyboards/cool836a/keymaps/default/readme.md
removed "<br>" in line 2
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/cool836a/keymaps/default/readme.md
remove "<br>" in line 4
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/cool836a/keymaps/default/readme.md
remove "<br>" in line 8
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/cool836a/cool836a.h
remove cool836a.h line 30:36
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>