aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Missing commadd/oledJack Sangdahl4 days1-1/+1
|
* Mistake in docsJack Sangdahl7 days1-2/+2
|
* Documentation & small fixesJack Sangdahl7 days3-2/+82
|
* Initial OLED configuration optionsJack Sangdahl8 days3-0/+91
|
* Merge remote-tracking branch 'origin/master' into developHEADdevelopQMK Bot9 days15-0/+1206
|\
| * Add Keychron C3 Pro (Red & RGB) (#24874)adophoxia9 days15-0/+1206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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]>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot9 days2-8/+55
|\|
| * [OS Detection] Improve MacOS detection (#24708)Drashna Jaelre9 days2-8/+55
| |
* | Resolve keyboard_aliases when processing keyboard make targets (#24834)Joel Challis9 days3-12/+41
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot9 days2-265/+288
|\|
| * Bump vite from 5.2.14 to 5.4.12 in /builddefs/docsgen (#24852)dependabot[bot]9 days2-265/+288
| |
* | Migrate some DEFAULT_FOLDER to keyboard_aliases.hjson (#24845)Joel Challis9 days34-33/+84
| |
* | Invoke `process_record_via` after `_user`/`_kb` have a chance to handle it. ↵Nick Brassel9 days1-3/+3
| | | | | | | | (#24879)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot9 days1-0/+7
|\|
| * Reject keyboard.json next to info.json (#24882)Joel Challis9 days1-0/+7
| |
* | [Bug][Core] Fix for Chordal Hold: stuck mods when mod-taps are pressed in a ↵Pascal Getreuer9 days3-2/+88
| | | | | | | | stuttered sequence. (#24878)
* | Add more layout for skiller_sgk50_s4 (#24784)Joy Lee9 days2-62/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add more layout for skiller_sgk50_s4 * Update skiller_sgk50_s4 default keymap * update keymap.c Co-authored-by: Ryan <[email protected]> * Update keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboard.json * Update keyboard.json * Update keyboard.json * Update keyboard.json --------- Co-authored-by: wb <[email protected]> Co-authored-by: Ryan <[email protected]>
* | Add CXT Studio 12E3 keyboard (#24749)muge9 days4-0/+167
| | | | | | | | | | Co-authored-by: jack <[email protected]> Co-authored-by: Joel Challis <[email protected]>
* | handwired/xealous - Remove DEFAULT_FOLDER (#24877)Joel Challis10 days5-84/+16
| |
* | [Core] Add Chordal Hold, an "opposite hands rule" tap-hold option similar to ↵Pascal Getreuer11 days25-26/+3607
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Achordion, Bilateral Combinations. (#24560) * Chordal Hold: restrict what chords settle as hold * Chordal Hold: docs and further improvements * Fix formatting. * Doc rewording and minor edit. * Support Chordal Hold of multiple tap-hold keys. * Fix formatting. * Simplification and additional test. * Fix formatting. * Tighten tests. * Add test two_mod_taps_same_hand_hold_til_timeout. * Revise handing of pairs of tap-hold keys. * Generate a default chordal_hold_layout. * Document chordal_hold_handedness(). * Add license notice to new and branched files in PR. * Add `tapping.chordal_hold` property for info.json. * Update docs/reference_info_json.md * Revise "hand" jsonschema. * Chordal Hold: Improved layout handedness heuristic. This commit improves the heuristic used in generate-keyboard-c for inferring key handedness from keyboard.json geometry data. Heuristic summary: 1. If the layout is symmetric (e.g. most split keyboards), guess the handedness based on the sign of (x - layout_x_midpoint). 2. Otherwise, if the layout has a key of >=6u width, it is probably the spacebar. Form a dividing line through the spacebar, nearly vertical but with a slight angle to follow typical row stagger. 3. Otherwise, assume handedness based on the widest horizontal separation. I have tested this strategy on a couple dozen keyboards and found it to work reliably. * Use Optional instead of `| None`. * Refactor to avoid lambdas. * Remove trailing comma in chordal_hold_layout. * Minor docs edits. * Revise to allow combining multiple same-hand mods. This commit revises Chordal Hold as described in discussion in https://github.com/qmk/qmk_firmware/pull/24560#discussion_r1894655238 1. In "RCTL_T(KC_A)↓, RSFT_T(KC_C)↓, RCTL_T(KC_A)↑" before the tapping term, RCTL_T(KC_A) is settled as tapped. 2. In "RCTL_T(KC_A)↓, RSFT_T(KC_C)↓, RSFT_T(KC_C)↑", both RCTL_T(KC_A) and RSFT_T(KC_C) are settled as tapped. 3. In "RCTL_T(KC_A)↓, RSFT_T(KC_C)↓, KC_U↓" (all keys on the same side), both RCTL_T(KC_A) and RSFT_T(KC_C) are settled as tapped. 4. In "RCTL_T(KC_A)↓, RSFT_T(KC_C)↓, LSFT_T(KC_T)↓", with the third key on the other side, we allow Permissive Hold or Hold On Other Keypress to decide how/when to settle the keys. 5. In "RCTL_T(KC_A)↓, RSFT_T(KC_C)↓" held until the tapping term, the keys are settled as held. 1–3 provide same-hand roll protection. 4–5 are for combining multiple same-hand modifiers. I've updated the unit tests and have been running it on my keyboard, for a few hours so far, and all seems good. I really like this scheme. It allows combining same-side mods, yet it also has roll protection on streaks. For me, this feels like Achordion, but clearly better streak handling and improved responsiveness. * Fix formatting. * Add a couple tests with LT keys. * Remove stale use of CHORDAL_HOLD_LAYOUT. * Fix misspelling lastest -> latest * Handling tweak for LTs and tests. * Fix formatting. * More tests with LT keys. * Fix formatting.
* | Unify spi_master headers (#24857)Ryan12 days12-175/+183
| | | | | | | | | | | | | | * Move default config to .c file * Explicitly define PAL modes for boards with custom init * Unify spi_master headers
* | Merge remote-tracking branch 'origin/master' into developQMK Bot12 days3-0/+725
|\|
| * Add keyboard clap_studio/flame60 (#24870)masterMick Hohmann12 days3-0/+725
| | | | | | | | | | | | | | - 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
* | Unify i2c_master headers (#24846)Ryan12 days5-136/+225
| | | | | | | | | | | | | | * Unify i2c_master headers * More documentation improvements * Reorganise PAL mode defaults
* | Unify UART headers (#24855)Ryan12 days6-252/+225
| | | | | | | | | | | | | | | | | | | | | | * Remove deprecated defines * Move default config to .c files * Unify UART headers * Clean up docs * Reorganise PAL mode defaults
* | Merge remote-tracking branch 'origin/master' into developQMK Bot13 days8-0/+1132
|\|
| * [Keyboard] Add Support E8ghtyNeo (#24859)Thanh Son Tran13 days8-0/+1132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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]>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot13 days1-0/+1
|\|
| * [License Violation] add pressplayid (#24869)Xelus2213 days1-0/+1
| | | | | | | | | | add pressplayid lic viol Co-authored-by: Xelus22 <>
* | Relocate base WS2812 code (#24850)Ryan13 days4-1/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot13 days1-0/+1
|\|
| * Fix missing wait.h include in Dip Switch Map (#24863)Drashna Jaelre13 days1-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot14 days7-0/+657
|\|
| * Add Model-B keyboard (#24681)Brian Hill14 days7-0/+657
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-01-211-0/+1
|\|
| * Updated Licence Violations for Chosfox L75 (#24833)Rory Chatterton2025-01-211-0/+1
| | | | | | Co-authored-by: Joel Challis <[email protected]>
* | `ferris/0_1`: update I2C API usage (#24839)Ryan2025-01-203-30/+21
| |
* | [Docs] Correct I2C API reference (#24840)Ryan2025-01-201-15/+19
| |
* | rgbkb/pan - Remove invalid build target (#24844)Joel Challis2025-01-202-0/+2
| |
* | Migrate some DEFAULT_FOLDER to keyboard_aliases.hjson (#24835)Joel Challis2025-01-20183-235/+547
| |
* | Fix up CI with `DEFAULT_FOLDER`. (#24842)Nick Brassel2025-01-201-2/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-01-201-2/+2
|\|
| * License violations updates. (#24831)Nick Brassel2025-01-211-2/+2
| |
* | Consolidate send_string implementations. (#24817)Nick Brassel2025-01-214-102/+64
| |
* | LED drivers: remove deprecated defines (#24837)Ryan2025-01-2015-2538/+1
| |
* | Remove DEFAULT_FOLDER where keyboard aliases already exists (#24838)Joel Challis2025-01-2026-27/+0
| |
* | Formally deprecate DEFAULT_FOLDER (#24836)Joel Challis2025-01-201-0/+1
| |
* | Update via2json layout macro searching (#24640)Joel Challis2025-01-201-20/+12
| |
* | `i2c_master`: remove deprecated functions (#24832)Ryan2025-01-192-14/+0
| |
* | Consolidate timer_elapsed implementations (#24830)Joel Challis2025-01-197-44/+11
| |