forked from qmk/qmk_firmware
-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[pull] master from qmk:master #737
Open
pull
wants to merge
4,835
commits into
also-pvinis:master
Choose a base branch
from
qmk:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
Co-authored-by: Nick Brassel <[email protected]> Co-authored-by: Sergey Vlasov <[email protected]>
* Alter ZXC row to have y index of 4 and bottom row to have index of 5 * Fix other issues with `]}`, `'"` & Enter - pointed out by noroadsleft
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Duncan Sutherland <[email protected]>
Bumps [rollup](https://github.com/rollup/rollup) from 4.16.4 to 4.22.4. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](rollup/rollup@v4.16.4...v4.22.4) --- updated-dependencies: - dependency-name: rollup dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update support S6xty5 * Delete chconf.h * Update manufacturer, community layout for hhkb * Update layout * fix row index * Update tyson60s * Update community layout and layout name * Update remove rgb test mode * Update capslock led * Apply suggestions from code review Co-authored-by: Duncan Sutherland <[email protected]> * Add support for S6xty5Neo Rev.2 * Remove deprecated s6xty5 * Update layout * Apply suggestions from code review Co-authored-by: Duncan Sutherland <[email protected]> * Move mcuconf and config to outer folder --------- Co-authored-by: Trần Thanh Sơn <[email protected]> Co-authored-by: Duncan Sutherland <[email protected]>
* initial commit * small updates * matrix fix * fix rgb lighting * updates * fix rgb pin * pin fixes * readme update * json formatting * Update keyboards/hineybush/h88_g2/config.h Co-authored-by: Drashna Jaelre <[email protected]> --------- Co-authored-by: jack <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]>
* jourkey * rotary encoder * fix keymap * jourkey * format json * Update keyboards/takashicompany/jourkey/readme.md Co-authored-by: Joel Challis <[email protected]> * fix layout * Update readme.md --------- Co-authored-by: Joel Challis <[email protected]>
* Add Halcyon Kyria Rev4 * Remove bootmagic and unused features * Fix encoderindex * Update readme.md * Remove rgblight * Implement requested changes * Add encoder update user * Remove rules.mk and add VIK configuration * Move options to config.h * Update RGB keycodes (#24484) * implement changes --------- Co-authored-by: harvey-splitkb <[email protected]>
* ADD NCR80 ALPS SKFL/FR * fix * Update config.h * Update config.h * Update keyboards/salane/ncr80alpsskfl/keyboard.json Co-authored-by: Duncan Sutherland <[email protected]> * Update keyboards/salane/ncr80alpsskfl/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland <[email protected]> * Update keyboards/salane/ncr80alpsskfl/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland <[email protected]> * Update keyboards/salane/ncr80alpsskfl/keyboard.json Co-authored-by: jack <[email protected]> * Update keyboards/salane/ncr80alpsskfl/readme.md Co-authored-by: jack <[email protected]> --------- Co-authored-by: Duncan Sutherland <[email protected]> Co-authored-by: jack <[email protected]>
* add keyboard reviung46 * modified keyboards/reviung/reviung46/readme.md * modified keyboards/reviung/reviung46/keyboard.json * modified keyboards/reviung/reviung46/readme.md * fix keyboards/reviung/reviung46/keyboard.json * fix keyboards/reviung/reviung46/keymaps/default/keymap.c fix keyboards/reviung/reviung46/keymaps/via/keymap.c * fix keyboards/reviung/reviung46/keymaps/via/keymap.c * fix keyboards/reviung/reviung46/keyboard.json * fix keyboards/reviung/reviung46/keyboard.json * modified reviung/reviung46/readme.md * fixed keyboards/reviung/reviung46/keyboard.json * fixed keyboards/reviung/reviung46/keymaps/default/keymap.c deleted keyboards/reviung/reviung46/keymaps/via/keymap.c deleted keyboards/reviung/reviung46/keymaps/via/rules.mk * fix keyboards/reviung/reviung46/keyboard.json and keyboards/reviung/reviung46/keymaps/default/keymap.c * Update keyboards/reviung/reviung46/readme.md --------- Co-authored-by: jack <[email protected]>
Corrected a typo in the phrase "iOS device need lessthan 100" to "iOS devices need less than 100." This was to improve clarity and professionalism of the doc.
Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.7.1 to 4.7.2. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.7.1...v4.7.2) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add cornia keyboard * Update Fire keymap * [Cornia/Doc] Host image on imgur * [Cornia/config] Remove unnecessary defines * [Cornia] Move I2C stuff to keyboard level * [Cornia/config] Remove unnecessary defines & move all callbacks to keymap.c * [Cornia] Use tri-layer in default keymap * [Cornia/makefiles] remove license headers & root makefile * [Cornia] Put common configuration to top keyboard level * [Cornia] Remove unecessary custom keycodes * [Cornia] Fix readme * [Cornia] Fix RGB keycodes * [Cornia] Fix config files * [Cornia] Fix readme * [Cornia] Fix mcuconf.h license
…23827) * add the keyboard * Update keyboards/ibm/model_m/yacobo/keyboard.json Co-authored-by: jack <[email protected]> * remove dead file * PR Comments * standardize comments * PR Comments --------- Co-authored-by: Stephen Edwards <[email protected]> Co-authored-by: jack <[email protected]>
Adds new keyboard under handwired/dactyl_manuform_pi_pico It is a dactyl_manuform(5x6) running on Pi Pico micro controller
Co-authored-by: jack <[email protected]> Co-authored-by: Duncan Sutherland <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Can Baytok <[email protected]>
* Marcopad debut * Applying core review suggestions * Optional layout with backlit * Line feeds and replacing dev board configs * Function to toggle backlight * Move to RGB Matrix * Fixing capitalization * Review comments --------- Co-authored-by: Marco Pelegrini <[email protected]>
* Addition of EC Constellation * Fix layout macro name
* add kbd0/curve0/60_ansi keyboard * Apply suggestions from code review Co-authored-by: jack <[email protected]> * Apply suggestions from code review Co-authored-by: Duncan Sutherland <[email protected]> --------- Co-authored-by: unknown <code-monke> Co-authored-by: jack <[email protected]> Co-authored-by: Duncan Sutherland <[email protected]>
* Add Binepad BNK8 keyboard * Moved keymap.c to keymap.json * Fix product page URL * RGB_ -> RM_ keycodes after this round of breaking changes Co-authored-by: Ryan <[email protected]> --------- Co-authored-by: Ryan <[email protected]>
* Add Cerberus to QMK * Update readme to add hotswap callouts * Update readme formatting * Use format json to update keyboard.json formatting * Split Cerberus HS and Solderable into separate folders * Update JSON formatting * make solderable keymaps a bit more useful * Backlight fix on solderable * Update keyboards/cannonkeys/cerberus/hotswap/keyboard.json Co-authored-by: jack <[email protected]> * Remove cerberus VIA keymaps * Apply suggestions from code review Change some whitespace Co-authored-by: Drashna Jaelre <[email protected]> * Add RGB control keycodes to cerberus keymap * Add backlight controls to default keymap on solderable version * Update keyboards/cannonkeys/cerberus/readme.md --------- Co-authored-by: jack <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]>
* Adding Macroflow Macropad * Macroflow_Macropad * Macroflow_Macropad * Adding My Macropad * Adding Macroflow Macropad * Adding Macroflow Macropad * Adding Macroflow Macropad * Adding Macroflow Macropad * Adding Macroflow Macropad * Added License Headers * Updated code for merge * Added License Header * Added Encoder Map * Updated Files * Fixed Matrix * Update keyboards/macroflow_original/keyboard.json Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/macroflow_original/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/macroflow_original/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/macroflow_original/keymaps/default/rules.mk Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/macroflow_original/macroflow_original.c Co-authored-by: Drashna Jaelre <[email protected]> --------- Co-authored-by: Drashna Jaelre <[email protected]>
* Organise default community layouts summary * Remove erroneous layout
* Add Tomak79S Add Tomak79S * Update keyboards/era/sirind/tomak79s/keymaps/default/keymap.c Co-authored-by: jack <[email protected]> --------- Co-authored-by: jack <[email protected]>
* adding keymaps for krado industries * Modified default keymap.c files to be the same as via. * Changing vendor ID for Krado Industries * Suggested changes made Making changes suggested by zvecr. Removed dynamic_layer indicator, updated copyright year, deleted unused layers in keymaps. Co-authored-by: Joel Challis <[email protected]> * rgbpin for ws2812 changed in info.json * Added encoder mapping rule file for default keymaps; added Fn layer shortcuts to Promenade layouts * Added rules.mk with encoder mapping for encoder boards at keymaps level. * Deleted extra key in LAYOUT * Update keyboards/kradoindustries/kousa/rules.mk Move WS2812 Driver from rules.mk to info.json Co-authored-by: jack <[email protected]> * Update keyboards/kradoindustries/kousa/info.json Move WS2812 Driver from rules.mk to info.json Co-authored-by: jack <[email protected]> * Update keyboards/kradoindustries/kousa/keymaps/default/keymap.c Move WS2812 Driver from rules.mk to info.json Co-authored-by: jack <[email protected]> * Reverting settings.json * Encoder map code change [2]>[NUM_DIRECTIONS] * Adding Promenade RP24S Adding Promenade RP24S keyboard.json, default keymap, and readme * Adding layer access to Promenade RP24S Adding layer access to layers 1 and 2 --------- Co-authored-by: Joel Challis <[email protected]> Co-authored-by: jack <[email protected]>
* This is a configuration of QMK intended to be used with the [ctrl-M controller](https://github.com/nuess0r/ctrl-M). * Move USB_MAX_POWER_CONSUMPTION to data driven due to upstream change * Clean up according to PR checklist Check the keymaps/nuess0r how you can make better use of your Model M including Windows, multimedia keys etc. * Move CAPS_HOLD feature from default build to custom keymap * More data driven configuration Move layout definition from ctrl_m.h to info.json Move has_ghost to info.json -> this makes the config.h file obsolete * Implement changes suggested by review * Removing user keymap (nuess0r) to follow current guidelines The nuess0r keymap which is shipped with the ctrl-M controller is kept here: https://github.com/nuess0r/qmk_firmware/tree/nuess0r_keymap * Changed image hosting location to Github requested in review by drashna * Changed image hosting location to imgur * Settings removed from info.json that are disabled by default. * Change URL as suggested by @dunk2k Not pointing to the QMK firmware but to the replacement controller electronics project. * Migrate build target markers to keyboard.json * Adding tindie link and implement review suggestions * Removing via keymap to follow current guidelines Will be moved to the https://github.com/the-via/qmk_userspace_via repo. * Add LAYOUT_all to support ANSI and ISO keyboards with the same firmware Add a LAYOUT_all similar to other keyboards that defines all available keys. Change the default keymap to use the _all layout so both ANSI and ISO Model M variants work out of the box. * Remove unnecessary enum from default keymap Co-authored-by: Less/Rikki <[email protected]> --------- Co-authored-by: Less/Rikki <[email protected]>
* Create README.md * Add files via upload * Create keymap.c * Update README.md * Update keyboards/lostdotfish/rp2040_orbweaver/README.md Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/lostdotfish/rp2040_orbweaver/keyboard.json Co-authored-by: Drashna Jaelre <[email protected]> * Rename README.md to readme.md * Update readme.md * Update keyboards/lostdotfish/rp2040_orbweaver/keyboard.json Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/lostdotfish/rp2040_orbweaver/mcuconf.h Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboard.json * Update keyboards/lostdotfish/rp2040_orbweaver/config.h Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboard.json * Update mcuconf.h * Update rp2040_orbweaver.c * Delete keyboards/lostdotfish/rp2040_orbweaver/halconf.h * Update config.h * Update readme.md * Update readme.md * Update readme.md * Update keyboards/lostdotfish/rp2040_orbweaver/keyboard.json --------- Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: jack <[email protected]>
* Update keymap.c enhancement - power down indicator LEDs when host sleeps * Update keyboards/lostdotfish/rp2040_orbweaver/keymaps/default/keymap.c Co-authored-by: jack <[email protected]> * Update keyboards/lostdotfish/rp2040_orbweaver/keymaps/default/keymap.c Co-authored-by: jack <[email protected]> --------- Co-authored-by: jack <[email protected]>
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.
See Commits and Changes for more details.
Created by pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )