Merge from master #4
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
…/OTG control (#10460) Co-authored-by: s-ol <[email protected]>
Co-authored-by: Ryan <[email protected]> Co-authored-by: Erovia <[email protected]>
* first pass at fixing the key labeling * second pass of fixing key labeling * third pass of this key naming * another pass of changing key naming * another pass * another pass * another pass * renamed it all * give a good vid and pid * add via keymap * add on to the comments * update readme and comments * one more small change
* Adding 2x2u default layout for Boardwalk * Defining the _RAISE layer
Co-authored-by: Ryan <[email protected]>
* Add via configurator support * Remove layers to fix via * Re-add extra via layers since it seems to work now * Replace tabs with spaces * Update readme.md
* Add 64_ansi Community Layout * Add 64_iso Community Layout * Add readme.md with layout drawings * Edit readme.md - fix layout drawings Fix 65_ansi_blocker_split_bs and 65_ansi_blocker_tsangan drawings. * Edit readme.md - suggestions per fauxpark Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan <[email protected]>
Co-authored-by: Erovia <[email protected]>
* Update feature_advanced_keycodes.md * Update mod_tap.md
* BM60RGB ISO: fix and extend default keymap - correctly assigns the Non-US Backslash and Hash keys - adds Function and Navigation keys - use KC_GESC instead of KC_ESC to make Grave accent available * Update layout macro The layout is the ISO equivalent of QMK's `LAYOUT_60_ansi_arrow`.
* 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
* Add new keyboard: wsk/g4m3ralpha
* Added license attribution to .{c,h} files
* Update keyboards/wsk/g4m3ralpha/config.h
Co-authored-by: Joel Challis <[email protected]>
* Update keyboards/wsk/g4m3ralpha/rules.mk
Co-authored-by: Joel Challis <[email protected]>
* Update keyboards/wsk/g4m3ralpha/g4m3ralpha.c
Co-authored-by: Joel Challis <[email protected]>
* Update keyboards/wsk/g4m3ralpha/keymaps/default/keymap.c
Co-authored-by: Joel Challis <[email protected]>
* Update keyboards/wsk/g4m3ralpha/config.h
Co-authored-by: James Young <[email protected]>
* Update keyboards/wsk/g4m3ralpha/info.json
Co-authored-by: James Young <[email protected]>
* Update keyboards/wsk/g4m3ralpha/rules.mk
Co-authored-by: Ryan <[email protected]>
Co-authored-by: worldspawn00 <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: James Young <[email protected]>
Co-authored-by: Ryan <[email protected]>
* added replacement pcb for the matrix cain keyboard * update usb descriptor * fixed led polarity * Update keyboards/matrix/cain/cain.c Co-authored-by: Joel Challis <[email protected]> * Update keyboards/matrix/cain/rules.mk Co-authored-by: Ryan <[email protected]> * Apply suggestions from code review Co-authored-by: James Young <[email protected]> * rename from cain to cain_re * Update keyboards/matrix/cain_re/readme.md Co-authored-by: James Young <[email protected]> Co-authored-by: Joel Challis <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: James Young <[email protected]>
* Fixed some small things and replaced deprecated definitions * Improvements * Reverted kemyap change
* 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 * Added BM60 Poker * Apply suggestions from code review * Added license * updated license * updated license * Fixed remaining licenses and added layout to rules
* Initializing Boardwalk layout * rules.mk newline * config.h newline * qwerty num toggle -> tap-toggle * errant K, and _LOWER momentary toggles * Lack of autosave sucks * Converting to HHKB layout * TT(_NUM) added to num layer * Final updates for Boardwalk initialization * Final refinements * newline * Removal of extra includes * Update keyboards/boardwalk/keymaps/niclake/config.h #pragma once * Removing comment block from rules * Updates to my layout
* Added via support * Now uses LTO_ENABLE * Deactivated console to save space * Update keyboards/sofle/keymaps/via/readme.md * Added GPL license * Update keyboards/sofle/keymaps/via/keymap.c * Update keyboards/sofle/keymaps/via/keymap.c * Update keyboards/sofle/keymaps/via/keymap.c * Update keyboards/sofle/keymaps/via/keymap.c
* 1 Oct 20 * Update keyboards/clawsome/fightpad/config.h * Update keyboards/clawsome/fightpad/rules.mk * Update keyboards/clawsome/fightpad/info.json * Update keyboards/clawsome/fightpad/readme.md * Update keyboards/clawsome/fightpad/readme.md * Update keyboards/clawsome/fightpad/info.json * Update keyboards/clawsome/fightpad/config.h
Co-authored-by: Erovia <[email protected]>
- add data for LAYOUT_all macro - correct some rounding errors - make the indentation consistent - remove trailing whitespace
* Update reference_info_json.md key_count is now an optional field because it is better to get the keycount by counting the elements in the layout array. * Updated Japanese documentation as well
Currently the XD75 is missing a info.json attributing to non standardised use of QMK
* Fix issue with data transfer of CS1_SW7 to CS18_SW7. * Fix issue with handling of scaling register buffer's dirty flag. * Remove unused extern declaration. * Compaction of struct is31_led utilizing bit fields.
* Fix dirtying in oled_write_pixel() Set the dirty bit for the block only if oled_write_pixel() actually changed the buffer state. Without this check oled_write_pixel() could not be used inside the oled_task_user() code using the “redraw always” style, because the blocks touched by oled_write_pixel() would always appear dirty, and oled_render() would not proceed beyond the first such dirty block. * Fix oled_write_pixel() with 90/270 degree rotation Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated display would be handled correctly. * Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE Some OLED sizes (e.g., 64×48) may require a nonstandard value of OLED_BLOCK_COUNT. The documentation says that this value may be redefined in config.h, but actually trying to redefine it caused a compile error, because the macro was redefined in oled_driver.c. Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any user override, and do the same for OLED_BLOCK_SIZE just in case. * Fix handling of out-of-range bits in oled_dirty If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty may not correspond to existing blocks; however, if those bits are set somewhere (e.g., by code with sets oled_dirty to ~0 or even -1), oled_render() would try to handle them and could access memory beyond oled_buffer and perform hardware operations with out of range values. Prevent this by masking off unused bits in oled_render(), and also avoid setting those bits in other functions. * Fix potentially wrong dirtying in oled_write_char() oled_write_char() tried to mark the position just beyond the written character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position still belonging to the character instead. * Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because some bit shifts were performed using 16-bit int. Add explicit casts to OLED_BLOCK_TYPE to those shifts.
Co-authored-by: swampmonster <>
* add hannah60rgb_rev2 * add * Update rev2.c * fixed rgb matrix * Update rev2.c * update rules.mk * update readme * update * Update config.h * Update rules.mk
* First pass at manuform layout. * Updates from actual usage on my board. Fixed a couple of bugs, added a stormlight quote randomizer. * Use a 32-bit timer that can actually hit 5 minutes. * Some updates after a day of usage: * Turn off WPM. It's too inaccurate and takes up a decent amount of space that can be devoted to quotes. * Turn off the OLEDs after 5 minutes * Move the keys around a bit. * Add many more quotes. * Adjust the quotes to make room for missing and misswritten WoT quote. Adjusted the keymap slightly. Adjust the mods display to include one_shots. * Revert osm on lgui as it makes start menu search impossible to use. * Use LTO_ENABLE flag. * License all of my (333fred's) keymaps as MIT. * Update users/333fred/rgb.c Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan <[email protected]>
* add layout macro * add beegboy keymaps * fix matrix pins * Change PID * Update keyboards/handwired/swiftrax/beegboy/config.h Co-authored-by: Ryan <[email protected]> Co-authored-by: Swiftrax <[email protected]> Co-authored-by: Ryan <[email protected]>
* Add The Railroad keyboard, rev 0 * Update keyboards/nopunin10did/railroad/config.h Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/nopunin10did/railroad/config.h Co-authored-by: ridingqwerty <[email protected]> * Update config.h * Update keyboards/nopunin10did/railroad/rules.mk Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/nopunin10did/railroad/config.h Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/nopunin10did/railroad/keymaps/nopunin10did/keymap.c Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/nopunin10did/railroad/keymaps/nopunin10did/keymap.c Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/nopunin10did/railroad/keymaps/nopunin10did/keymap.c Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/nopunin10did/railroad/keymaps/default/keymap.c Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/nopunin10did/railroad/keymaps/default/keymap.c Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/nopunin10did/railroad/rules.mk Co-authored-by: ridingqwerty <[email protected]> * Update rules.mk * Update config.h * Update keymap.c * Update keyboards/nopunin10did/railroad/railroad.h Co-authored-by: ridingqwerty <[email protected]> * Update railroad.h * Update keyboards/nopunin10did/railroad/railroad.c Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/nopunin10did/railroad/keymaps/default/keymap.c Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/nopunin10did/railroad/rules.mk Co-authored-by: Joel Challis <[email protected]> * Update keyboards/nopunin10did/railroad/config.h Co-authored-by: James Young <[email protected]> * Update keyboards/nopunin10did/railroad/readme.md Co-authored-by: James Young <[email protected]> * Updates from peer review to correct render * Update keyboards/nopunin10did/railroad/info.json Co-authored-by: James Young <[email protected]> * Update keyboards/nopunin10did/railroad/readme.md Co-authored-by: Ryan <[email protected]> * Update keyboards/nopunin10did/railroad/info.json Co-authored-by: James Young <[email protected]> * Relocate most files inside rev0 Co-authored-by: ridingqwerty <[email protected]> Co-authored-by: Joel Challis <[email protected]> Co-authored-by: James Young <[email protected]> Co-authored-by: Ryan <[email protected]>
* Add Z70Ultra which is a Hotsawp RGB 65% keyboard * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/readme.md Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan <[email protected]> * Update readme.md * Update info.json update the name of layout to consistent the keyboard. * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan <[email protected]> * Add Z70Ultra * Support Z70Ultra [Modified] info.json to support two different layouts [Add] rules.mk to support default folder * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/z70ultra/config.h Co-authored-by: Ryan <[email protected]> * remove excessive arguments from LAYOUT_split_space * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: James Young <[email protected]> * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: James Young <[email protected]> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <[email protected]> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: James Young <[email protected]> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: James Young <[email protected]> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <[email protected]> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <[email protected]> * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: James Young <[email protected]> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <[email protected]> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <[email protected]> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <[email protected]> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <[email protected]> * Use macro replace with the literal for CS & SW * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <[email protected]> * [Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <[email protected]> * [Keyboard] MJ61 Add license header for files and the link for readme * Update keyboards/melgeek/mj61/readme.md Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/mj61/rev1/config.h Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/mj61/rev1/rules.mk Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <[email protected]> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <[email protected]> * Add GPL for files * Update keymaps/default/keymap.c * Update keymaps/via/keymap.c * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <[email protected]> * [Fixed] remove this code cause it's useless. Co-authored-by: Ryan <[email protected]> Co-authored-by: James Young <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]>
* Firmware initial commit, still has a few bugs - mainly rotary encoders do not work and needs cleaning up * Fixed the volume control issue and limited the RGB brightness (can be really bright), added the ability to switch LED mode with left encoder click, and added via support (untested) * Remove define that should go in config.h * Removed define that should be in config.h * Removed LTO_ENABLE as suggested - has issues on ARM Co-authored-by: Drashna Jaelre <[email protected]> * Added the correct define for OLED screen size * Applied suggested change to remove description Co-authored-by: Ryan <[email protected]> * Made suggested change to remove backslashes Co-authored-by: Ryan <[email protected]> * Suggested change made to rgblight Co-authored-by: Ryan <[email protected]> * Suggested change made to rgblight Co-authored-by: Ryan <[email protected]> * Suggested change made to remove backslashes Co-authored-by: Ryan <[email protected]> * Suggested change made to rgblight Co-authored-by: Ryan <[email protected]> * Update keyboards/rocketboard_16/rocketboard_16.c Co-authored-by: Ryan <[email protected]> * Added suggested comments Co-authored-by: Ryan <[email protected]> * Made suggested changes to rules file Co-authored-by: Ryan <[email protected]> * Added suggested change to rgblight Co-authored-by: Ryan <[email protected]> * Added info.json for QMK configurator * Update readme.md * This change makes the firmware work... through magic... seriously, no idea - but it works! * Updated dimming step, OLED functionality, and rules for formatting - Changed the dimming step size for smoother dimming with the reduced range - Added lots of OLED functionality - QMK logo and title at top, num/caps/scroll lock status, and backlight brightness level - Updated the rules.mk file to comply more closely with the formatting guidelines * Fixed tab issues Co-authored-by: Ryan <[email protected]> * Updated to use bootmagic lite with the key that usually turns rgb on/off Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]>
* Adding Evan Travers' Keyboardio Atreus branch. Initial commit of my KeyboardIO Atreus layout. This is a direct copy of my default Atreus layout, with blank spaces for the two additional keys. * Added MACLOCK macro to keymap.c * Updates to Keyboardio Atreus keymap and readme. * Adding arrows to bottom row of RAISE and LOWER layers * bringing the rest of the master branch to my working branch. * Changes to my KeyboardIO Atreus keymap & readme * Changes to keymap. * Adding Evan Travers' Keyboardio Atreus branch. Initial commit of my KeyboardIO Atreus layout. This is a direct copy of my default Atreus layout, with blank spaces for the two additional keys. * Added MACLOCK macro to keymap.c * Updates to Keyboardio Atreus keymap and readme. * Adding arrows to bottom row of RAISE and LOWER layers * bringing the rest of the master branch to my working branch. * Changes to my KeyboardIO Atreus keymap & readme * Changes to keymap. * Added GPL2+ compatible license header. Co-authored-by: Ian Sterling <[email protected]>
* Add keysofkings folder and twokey keyboard * Update readme.md * Update readme.md * Update config.h * Update config.h * Update keymap.c * Update twokey.c * Update twokey.h * Update keyboards/keysofkings/twokey/config.h Co-authored-by: Ryan <[email protected]> * Update keyboards/keysofkings/twokey/readme.md Co-authored-by: Ryan <[email protected]> * Update keyboards/keysofkings/twokey/rules.mk Co-authored-by: Ryan <[email protected]> * Update keyboards/keysofkings/twokey/rules.mk Co-authored-by: Ryan <[email protected]> * Update keyboards/keysofkings/twokey/readme.md Co-authored-by: Ryan <[email protected]> * Update info.json * Update keymap.c * Update keyboards/keysofkings/twokey/info.json Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan <[email protected]>
* add bebol keyboard * Change PID * Update keyboards/handwired/swiftrax/bebol/rules.mk Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Swiftrax <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]>
* add 65_ansi_split_bs to default community layouts * Update layouts/default/65_ansi_split_bs/layout.json Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan <[email protected]>
* Added ad/freebird60. * Moved freebird60 keyboard. Added VIA keymap. * Updated `keebsforall/freebird60` README to include image. * Update keyboards/keebsforall/freebird60/readme.md Co-authored-by: Ryan <[email protected]> * Update keyboards/keebsforall/freebird60/readme.md Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan <[email protected]>
* exent VIA support * minor cleanups * Update keyboards/exent/config.h Co-authored-by: Ryan <[email protected]> * Update keyboards/exent/config.h Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan <[email protected]>
* nullbitsco/nibble: rework LAYOUT_all ... and update via keymap accordingly. * compress info.json LAYOUT_all tree Only changes the white space. * rebuild info.json LAYOUT_all tree Note: this commit makes the visual layout the ANSI layout with a split left Shift, instead of being the same as the ISO layout. * unify code styles Make logically-unchanged code blocks similar in appearance to logically-changed blocks. * correct LAYOUT_iso key sequence Move ISO Enter's object to its proper place.
* fix matrix scan rate * Update trinityxttkl.c * Update rev2.c
Co-authored-by: Ryan <[email protected]> Co-authored-by: ai03 <[email protected]>
* NK65 define hack for 128kb 256kb versions of F303 * Updated to chibios define
* Add OLED support for Riblee F422 * Fix typo
Co-authored-by: Ryan <[email protected]> Co-authored-by: katawajojo <vibri@localhost> Co-authored-by: katawajojo <[email protected]>
* Add keymap for Polaris * Change back to KC_NUBS for <> key * Add GPL header from default files * Change to new way of flashing in readme
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Types of Changes
Issues Fixed or Closed by This PR
Checklist