This repository has been archived by the owner on Mar 16, 2024. It is now read-only.
Merge qmk master into annepro2 branch #34
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add Hub20 support * Keymap formatting cleanup Co-authored-by: Ryan <[email protected]> * Delete bootloader_defs.h as no longer required * Correct make / flashing example Co-authored-by: Ryan <[email protected]> * Update rules.mk Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan <[email protected]>
* Adding new breeze keyboard under afternoonlabs * Compiling only Rev0, moving readme there * Apply suggestions from code review Addressing review comments, removing legacy description config. Removing copy paste leftovers Co-authored-by: Drashna Jaelre <[email protected]> * Addressing review, remove empty rules.mk * typos * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> Co-authored-by: Eithan Shavit <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]>
* - * - * - * - * - Co-authored-by: online <[email protected]>
* Add VIA support made changes to add VIA support for the CA66 - added VIA keymap.c, readme.md, rules.mk - changes made to main rules.mk to keep firmware size down (mousekey_enable = no; backlight_enable = no) - changed VENDOR_ID in config.h from 0xFEED to 0x504B (PK) * Minor changes to CA66 for VIA support edited keymap info enabled backlight * Update vendorID Change to vendorID to remove conflict with previously chosen vendorID already in use * Update keyboards/playkbtw/ca66/rules.mk Co-authored-by: Joel Challis <[email protected]> * Update keyboards/playkbtw/ca66/keymaps/via/readme.md Co-authored-by: Joel Challis <[email protected]> * Update keyboards/playkbtw/ca66/keymaps/via/keymap.c Co-authored-by: Joel Challis <[email protected]> Co-authored-by: Joel Challis <[email protected]>
* Added Ortho support * Updated JSON
Co-authored-by: Ryan <[email protected]> Co-authored-by: Danny <[email protected]>
* Initialize domnantas layout * Update oled status display * Layout and oled changes * Updates to keymap * Add F keys and page moves * Add media keys, rearrange home and end * Add instructions * Swap backspace and enter * Remove unnecesary Enter keymap * - Change display timeout - Update minus sign to work on both English and Lithuanian layouts * Add copyright header * Replace static strings with PSTR * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboards/lily58/keymaps/domnantas/rules.mk Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan <[email protected]>
* allow customizing decrease delay of rgb heatmap * rename rgb typing heatmap decrease delay variable * address review comments * nix-shell: add clang-tools required for formatting the C code * heatmap: use real timer to track decrement rate * heatmap: fix ifndef var name typo * heatmap: add docs * Update docs/feature_rgb_matrix.md Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]>
Custom layout for macropad. It shows the usage of macros with unicode, and other layouts (ISO-DE) with unicode, emojis, and git commands.
* 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 <[email protected]> * update keymap.c (add licence) * Update keyboards/cool836a/keymaps/default/readme.md removed "<br>" in line 2 Co-authored-by: Ryan <[email protected]> * Update keyboards/cool836a/keymaps/default/readme.md remove "<br>" in line 4 Co-authored-by: Ryan <[email protected]> * Update keyboards/cool836a/keymaps/default/readme.md remove "<br>" in line 8 Co-authored-by: Ryan <[email protected]> * Update keyboards/cool836a/cool836a.h remove cool836a.h line 30:36 Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan <[email protected]>
* human-friendly formatting * correct key order (ISO Enter)
* human-friendly formatting * correct key order
* 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 <[email protected]>
* add byte order bgr for ws2812 * update docs for driver change * Update ws2812_driver.md * Update docs/ws2812_driver.md Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan <[email protected]>
* 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 <[email protected]>
* Update keyboards/walletburner/cajal/keymaps/ortho/keymap.c
Co-authored-by: Drashna Jaelre <[email protected]>
* Rename 'ortho' keymap to 'default_ortho'
* Update keyboards/walletburner/cajal/cajal.c
Co-authored-by: Drashna Jaelre <[email protected]>
* Update readme.md
Adding bootloader instructions.
Co-authored-by: worldspawn00 <[email protected]>
Co-authored-by: James Young <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
* 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
* 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 <[email protected]> * Update keyboards/nibiria/stream15/keymaps/via/rules.mk Co-authored-by: Ryan <[email protected]> * Update keyboards/nibiria/stream15/readme.md Co-authored-by: Ryan <[email protected]> * resolved 2 more issues Co-authored-by: Ryan <[email protected]>
* generate version.h when compiling json files * make flake8 happy * fix formatting and verbose * quiet up the compile output
* Add fallback syscalls to ChibiOS builds that are present but able to be overridden as appropriate. * Modified location to be ChibiOS-specific.
* Support for Monstargear XO87 Hot-Swap PCB * Remove manufacturer from product line * Removed alternate bootloaders * Updated info.json * Missed RGB_DISABLE_WHEN_USB_SUSPENDED in config.h * Delete kb.h * Update rgb.h * Update rules.mk * Add files via upload * Delete kb.h * Update keymap.c * Update config.h * Update rgb.c * Add via RGB support * Update info.json * Update readme.md * Update readme.md * Update config.h * Update rgb.h * Update config.h * Mirror factory layout * Mirror factory layout * Update rgb.h * Update keyboards/xo87/rgb/rgb.c * Update rgb.c * Update keyboards/xo87/rgb/config.h * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/keymaps/via/keymap.c * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/keymaps/via/keymap.c * Update config.h * Update keyboards/xo87/rgb/readme.md * Update keyboards/xo87/rgb/readme.md * Update keyboards/xo87/rgb/readme.md * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * remove deprecated action_get_macro() * rearrange layout per request * rearrange layout per request * Update keyboards/xo87/rgb/rgb.h * Update keyboards/xo87/rgb/keymaps/default/readme.md * Update keyboards/xo87/rgb/readme.md * Bugfix for RGB Matrix * Bugfix for RGB Matrix * Moved to new subdirectory and updated build commands to reflect changes * Remove old files
* info.json: human-friendly formatting * info.json: correct key object order * info.json: replace Unicode characters They don't play nice with `qmk info -l`. * info.json: correct keyboard dimensions
Co-authored-by: Richard Nunez <[email protected]>
* adding personal keymaps * Update keyboards/xd60/keymaps/semicolonsnet/keymap.c Co-authored-by: Drashna Jaelre <[email protected]> * added license * added license Co-authored-by: Drashna Jaelre <[email protected]>
* Change VID and PID * Add via kyemap * Update keymap.c * Update keymap.c Co-authored-by: yynmt <[email protected]>
* [Keyboard] Concertina * Added a novel handwired keyboard. * Concertina lint * Perfunctory changes to pass CI. * Concertina line width * Changes from code review: GPL headers, modernization, full-width representation of matrix to match info.json.
ANAVI Macro Pad 2 is an open source mini mechanical keyboard with 2 keys and backlit. Powered by ATtiny 85 microcontroller and with microUSB connector. Designed with KiCad. Provides the following keymaps for ANAVI Macro Pad 2: - Default (with a, b and combo to control the LEDs) - Copy & paste - Tap dance example with a, b and c - Mute - Volume - Zoom - Jitsi Meet Co-authored-by: Drashna Jaelre <[email protected]> Signed-off-by: Leon Anavi <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Joel Challis <[email protected]> Co-authored-by: Ryan <[email protected]>
…11139) Co-authored-by: luc wastiaux <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: James Skeen <[email protected]>
Co-authored-by: Ryan <[email protected]> Co-authored-by: James Young <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]> Co-authored-by: James Young <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Maxime Coirault <[email protected]>
|
Closes #32 |
Codetector1374
added a commit
that referenced
this pull request
Feb 26, 2021
This reverts commit 27ddc0b.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Sync up with latest qmk code changes
Types of Changes
Issues Fixed or Closed by This PR
#32
Checklist
Managed to to build and flash the default layout without issues.
Note: other profiles using layer_state_t layer_state_set_user(layer_state_t layer) are not working anymore likely a mainstream change. Ill take a look.