Merge with qmk upstream #10
Open
Conversation
This file contains hidden or 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
Fix indicator code Co-authored-by: yiancar <[email protected]>
* Add check Tap Dance count check to keymap introspection * Add checks for combos and key overrides to introspection
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
* Separate RGBLight/RGB Matrix keycode handling * Remove `_DISABLE_KEYCODES` handling * Update RGB Matrix keycode docs * Update underglow keycodes for previously migrated boards * Update keycodes for boards with custom handling * Fix typos * Fix bad merge
quantum: util: add bit and bitmask helpers These helpers are handy and can prevent off-by-one errors when working with registers and general low level bit manipulation tasks. The macros themself are inspired by the bits.h macros from the linux kernel source code. Signed-off-by: Stefan Kerkmann <[email protected]> Co-authored-by: Pascal Getreuer <[email protected]>
Co-authored-by: Duncan Sutherland <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
github-actions
bot
added
documentation
* Add Model-B keyboard * PR changes for Model-B * Update to OLED on Model-B * added license to pass lint check * update virtual eeprom for Model-B * eeconfig_read_kb() update on Model-B * cleanup changes for Model B * implementing Model B suggestions
add pressplayid lic viol Co-authored-by: Xelus22 <>
* 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]> * Remove deprecated s6xty5 * handle init e8ghtyneo firmware * Update qk boot firmware * Update firmware e8ghtyNeo * Update matrix * update manufacture * Update copyright --------- Co-authored-by: Trần Thanh Sơn <[email protected]> Co-authored-by: Duncan Sutherland <[email protected]>
- Got the source code from the _Clap_Studio_ Discord server - Migrated the source code to `keyboard.json` format - Added more layouts for most common cases - Fixed errors in `keymaps/default/keymap.c` - Updated the picture with a real picture of the PCB, to avoid confusion
* Add Keychron C3 Pro variants * Update to upstream standards * Apply suggestions from code review Co-authored-by: jack <[email protected]> Co-authored-by: Ryan <[email protected]> * Reformatted `keyboard.json` for `red`/`rgb` and `c3_pro.c` * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> * Update keyboards/keychron/c3_pro/ansi/red/config.h Co-authored-by: Daniel <[email protected]> * Apply suggestions from code review Co-authored-by: Drashna Jaelre <[email protected]> * Add C Pro V2 variants * remove boards by accident --------- Co-authored-by: jack <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]>
fix: sys-devel/clang was renamed to llvm-core/clang see: gentoo/gentoo@1f9f199
) Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.7.2 to 4.7.3. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.7.2...v4.7.3) --- 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>
apollovy
force-pushed
the
nuphy-keyboards
branch
from
4226670 to
0b756da
Compare
|
@nuphy-src Is there a reason the keyboards aren't just upstreamed? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Hello. I have merged th QMK master, resolved all conflicts and fixed the code. Everything compiles and at least Air60v2 works.