Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 2 | -4/+4 | |
|\| | ||||||
| * | [Keyboard] Fix typo with RGB LED positioning in Iris (#17805) | Danny | 2022-07-26 | 2 | -4/+4 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 15 | -100/+74 | |
|\| | ||||||
| * | feat: encoder map, OLED & encoder kb-level config (#17767) | Less/Rikki | 2022-07-26 | 15 | -100/+74 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 11 | -0/+695 | |
|\| | ||||||
| * | [Keyboard] Add work louder micro (#17586) | Drashna Jaelre | 2022-07-26 | 11 | -0/+695 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Add work louder micro * Update keyboards/work_louder/micro/readme.md * Update readme * Update kb config files * Update to use encoder map Co-authored-by: Tom Barnes <barnestom@me.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 4 | -0/+136 | |
|\| | ||||||
| * | Dz65v2 Settings for SBennett13 (#17747) | Scott Bennett | 2022-07-26 | 4 | -0/+136 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Start of dz65v2 map for sbennett13 * No wpm, disable some rgb, ~copyright~ * No more raindrops * Remove more rgb modes and set default * Almost orgot this crappy thing * cannot define startup :( * Layered esc is kc_grv * Start of dz65v2 map for sbennett13 * No wpm, disable some rgb, ~copyright~ * No more raindrops * Remove more rgb modes and set default * Almost orgot this crappy thing * cannot define startup :( * Layered esc is kc_grv * Add license to config and keymap | |||||
* | | Chibios: Stop I2C peripheral on transaction error (#17798) | Stefan Kerkmann | 2022-07-26 | 1 | -15/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the ChibiOS HAL I2C driver pages: After a timeout the driver must be stopped and restarted because the bus is in an uncertain state. This commit does that stopping explicitly on any error that occurred, not only timeouts. As all the i2c functions restart the peripheral if necessary it is safe to do so. Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 1 | -0/+55 | |
|\| | ||||||
| * | Add alternative Logos (#17787) | Spaceman | 2022-07-26 | 1 | -0/+55 | |
| | | ||||||
* | | Constrain Cirque Pinnacle coordinates (#17803) | Daniel Kao | 2022-07-26 | 1 | -6/+6 | |
| | | | | | | | | | | | | Static x & y should be the same type as touchData.xValue & touchData.yValue: uint16_t. Their delta could be larger than int8_t and should be constrained to mouse_xy_report_t. | |||||
* | | Avoid OOB in dynamic_keymap_reset (#17695) | Joel Challis | 2022-07-26 | 1 | -5/+12 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 3 | -2/+69 | |
|\| | ||||||
| * | Make `qmk doctor` print out the last log entry for ↵ | Nick Brassel | 2022-07-26 | 3 | -2/+69 | |
| | | | | | | | | upstream/{master,develop}, including dates (#17713) | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 9 | -0/+155 | |
|\| | ||||||
| * | Added WT65-D (#17724) | Wilba | 2022-07-26 | 9 | -0/+155 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 21 | -0/+777 | |
|\| | ||||||
| * | [Keyboard] Acheron Athena support (#16818) | Álvaro A. Volpato | 2022-07-26 | 21 | -0/+777 | |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | [Docs] Updates to Pointing Device Docs (#17777) | Drashna Jaelre | 2022-07-26 | 2 | -15/+16 | |
| | | ||||||
* | | bastardkb: fix info.json changes that got reverted during the last merge ↵ | Charly Delay | 2022-07-26 | 4 | -21/+3 | |
| | | | | | | | | | | | | | | from `master` to `develop` (#17800) * bastardkb: fix info.json changes that got reverted during the last merge from `master` to `develop` * Remove board name from root folder `info.json` | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 8 | -0/+599 | |
|\| | ||||||
| * | [Keymap] Add ollyhayes keymap (#16632) | Olly Hayes | 2022-07-25 | 8 | -0/+599 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 9 | -0/+214 | |
|\| | ||||||
| * | [Keyboard] add DJam keyboard (#17430) | Leo Deng | 2022-07-25 | 9 | -0/+214 | |
| | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> | |||||
* | | Cirque circular scroll: Support POINTING_DEVICE_COMBINED (#17654) | Daniel Kao | 2022-07-25 | 2 | -13/+18 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 11 | -0/+476 | |
|\| | ||||||
| * | [Keyboard] Add Halokeys Elemental 75 (#17323) | shamit05 | 2022-07-25 | 11 | -0/+476 | |
| | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 9 | -0/+593 | |
|\| | ||||||
| * | [Keyboard] Add Kawayo Keyboard (#17454) | Cipulot | 2022-07-25 | 9 | -0/+593 | |
| | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 10 | -0/+380 | |
|\| | ||||||
| * | [Keyboard] Add Star75 support (#17421) | hornslyn | 2022-07-25 | 10 | -0/+380 | |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | [Keyboard] Add RP2040 config defaults for ferris/sweep and cradio (#17557) | Albert Y | 2022-07-25 | 4 | -25/+13 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 1 | -229/+42 | |
|\| | ||||||
| * | takashicompany miniZone: fix QMK Configurator implementation (#17801) | James Young | 2022-07-25 | 1 | -229/+42 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 1 | -1/+1 | |
|\| | ||||||
| * | [Keyboard] Add missing mute button to sofle keymap (#17796) | Daniel O'Brien | 2022-07-25 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 1 | -5/+3 | |
|\| | ||||||
| * | Update README.md for teensy lc onekey (#17797) | Diogo Sergio | 2022-07-25 | 1 | -5/+3 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 8 | -169/+57 | |
|\| | ||||||
| * | gboards/georgi: cleanup & fix (#17753) | Ryan | 2022-07-26 | 8 | -169/+57 | |
| | | ||||||
* | | [Keyboard] Fix compilation issues for Charybdis/Dilemma (#17791) | Drashna Jaelre | 2022-07-26 | 3 | -9/+16 | |
| | | | | | | | | | | * [Keyboard] Fix debug printing for Charybdis/Dilemma * Fix compliation issue for dilemma | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 150 | -546/+475 | |
|\| | ||||||
| * | Move keyboard USB IDs and strings to data driven: A (#17781) | Ryan | 2022-07-26 | 150 | -546/+475 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-25 | 248 | -905/+783 | |
|\| | ||||||
| * | Move keyboard USB IDs and strings to data driven: C (#17789) | Ryan | 2022-07-26 | 248 | -905/+783 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-25 | 5 | -132/+159 | |
|\| | ||||||
| * | Runes Skjöldr Touch-Up (#17792) | James Young | 2022-07-25 | 5 | -132/+159 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * skjoldr.h: use ___ for KC_NO * skjoldr.h: use K<row><column> notation Matrix was previously defined using identifiers in the format of K<column><row>. * skjoldr.h: add matrix diagram * info.json: apply friendly formatting - key legends as labels - correct key sizes and positioning * refactor keymaps Refactors the `default` and `via` keymaps. - use QMK-native keycode aliases - grid-align keycodes for readability * rename LAYOUT macro to LAYOUT_60_ansi_arrow * enable Community Layout support * info.json: correct maintainer value Field is meant to reference the maintainer's GitHub username. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-25 | 1 | -1/+1 | |
|\| | ||||||
| * | [Keyboard] Fix Charue Sunsetter_r2 compilation issues (#17793) | Drashna Jaelre | 2022-07-25 | 1 | -1/+1 | |
| | |