Merge current qmk #47
Conversation
* Fix Caps Lock indication * User LED state function override added Co-authored-by: Drashna Jaelre <[email protected]> * Change backlight enabled check and remove backlight headers Co-authored-by: Drashna Jaelre <[email protected]> --------- Co-authored-by: Drashna Jaelre <[email protected]>
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: Ryan <[email protected]>
Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](ai/nanoid@3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* adding in ic45 handwired * fix wrong title * Apply suggestions from code review Thank you @waffle87 Co-authored-by: jack <[email protected]> * Update keyboards/handwired/ic45_v2/keyboard.json adding whitespace Co-authored-by: Drashna Jaelre <[email protected]> --------- Co-authored-by: jack <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Duncan Sutherland <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
* 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]>
…mework16-keyboards
|
i am currently not sure how well framework is willing to actively integrate all PRs.. mine is also open for several months without even a response or feedback about it... |
|
Upstreaming would help with that! As far as I can tell, there's no good reason this needs to be a long running fork. But I get the feeling @JohnAZoidberg is the only QMK-toucher at Framework, and has enough other things going on that this is way down the priority list for him. (I, too, have wound up as the sole maintainer of a bunch of random things that rarely need to be touched at every company I've worked at. I get it, no shade intended toward him personally here.) Personally, I'm now just running my own branch containing upstream master + fw16 commits rebased from here + code for my own DIY keyboard that I don't plan to upstream because I'm the only user of it. But I would love to not have to deal with keeping other people's code up to date when I rebase it. |
|
Playing with a macropad today and... this branch doesn't even build for the macropad. Hrm. It doesn't look like I'm going to close this because it is clearly the wrong thing and I don't know what the right thing is, but... y'all. Please do better. Shipping a QMK fork that's two years out of date while advertising "it runs QMK!" is the worst kind of technically correct. |
|
yeah i think so too that @JohnAZoidberg is the only one maintaining the QMK fork here but is there any disadvantage/problem to push an own PR to the official QMK with the change of Framework to push it upstream? would help a lot of people and i could even fix some problems i fixed in my own fork of frameworks QMK... |
|
I mean, it's open source with compatible licensing, nothing's stopping you. The thought had occurred to me too, but honestly, I also have enough other personal projects going on at the moment that I can't be bothered doing something that clearly should be someone else's job. (That's not to attempt to discourage you from doing it, or that I won't eventually get annoyed enough to do it myself, I just don't plan to do it myself right now.) |
|
Tried quickly to see if merge goes through... will take me some while. |
This merges upstream qmk into this branch, and makes minor changes (commit scgtrp@1964e76) to make it build again.
If #13 never happens (I'd still like it to!), keeping this fork up to date seems like the next best thing.
I have no objection to you cherry-picking or just stealing that patch and committing it yourself, if you have strong opinions on git history and would prefer to do this a different way than One Giant Merge.
edit: I appear to have added 85 people to receive notifications about this, presumably all the people whose commits are in here. Sorry if that's bothersome! I did not know github would do that.