Commit Graph
25046 Commits
Author SHA1 Message Date
QMK Bot 5abedcbaf2 Merge remote-tracking branch 'origin/develop' into xap 2022-12-08 16:13:42 +00:00
Wolf Van Herreweghe c6e291c416 Revert RESET-> QK_BOOT in Read Me files where applicable (#19262) 2022-12-09 03:12:49 +11:00
QMK Bot 8e83b4dd63 Merge remote-tracking branch 'origin/develop' into xap 2022-12-08 16:12:00 +00:00
QMK Bot beaea2eb0d Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:11:25 +00:00
261e7668c6 Added mouse clicks to RBG layer (#19105)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: syntax-magic <dkim.8881@gmail.com>
2022-12-09 03:09:43 +11:00
QMK Bot 502a58dcc3 Merge remote-tracking branch 'origin/develop' into xap 2022-12-08 16:09:04 +00:00
dexter93 f2a8a13dba Core: Support inverted scan logic for optical switches (#19053) 2022-12-09 03:09:01 +11:00
QMK Bot 6668a0adb0 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:08:30 +00:00
d30bf44a60 Add AEKISO60 rev B (#19074)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-12-09 03:07:54 +11:00
QMK Bot 99a64cbe90 Merge remote-tracking branch 'origin/develop' into xap 2022-12-08 16:04:15 +00:00
ForsakenRei 53423f0369 KC_GESC -> QK_GESC for cn and ja Docs (#19024) 2022-12-09 03:03:33 +11:00
QMK Bot 527975a37b Merge remote-tracking branch 'origin/develop' into xap 2022-12-08 15:57:08 +00:00
lokher 0d7edbbcbe Fixed NKRO issue caused by HID_SET_PROTOCOL on Chibios platform (#17588) 2022-12-09 02:56:36 +11:00
QMK Bot a3932aab1f Merge remote-tracking branch 'origin/develop' into xap 2022-12-08 15:55:28 +00:00
QMK Bot 6866466b07 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 15:54:53 +00:00
tarneo ebcbbfc1e8 correct config for supersplit and add keymap (#18927) 2022-12-09 02:54:19 +11:00
QMK Bot 2a91040313 Merge remote-tracking branch 'origin/develop' into xap 2022-12-08 13:35:41 +00:00
QMK Bot 5d8ece1b3d Merge remote-tracking branch 'origin/master' into develop 2022-12-08 13:35:08 +00:00
Ryan acca2eb963 Fix build failures for aurora/lily58 and sweep (#19258) 2022-12-08 13:34:32 +00:00
QMK Bot f7d8f4c784 Merge remote-tracking branch 'origin/develop' into xap 2022-12-07 21:03:25 +00:00
QMK Bot d4ead8783c Merge remote-tracking branch 'origin/master' into develop 2022-12-07 21:02:49 +00:00
Jordan Duabe bb3d694875 [Keyboard] Add NCR-80 (#19130) 2022-12-07 13:02:05 -08:00
QMK Bot 4ab83bd473 Merge remote-tracking branch 'origin/develop' into xap 2022-12-07 18:00:46 +00:00
QMK Bot 2183eda7ac Merge remote-tracking branch 'origin/master' into develop 2022-12-07 18:00:05 +00:00
Ryan 405aa7b2ed Fix keyboard for some JSON keymaps (#19251) 2022-12-07 17:59:23 +00:00
QMK Bot 580ec0593c Merge remote-tracking branch 'origin/develop' into xap 2022-12-07 15:57:59 +00:00
QMK Bot 25b9e34fbe Merge remote-tracking branch 'origin/master' into develop 2022-12-07 15:57:26 +00:00
James Young 760e5c2ee1 ASK55: correct layout data (#19252) 2022-12-07 15:56:21 +00:00
QMK Bot d7ccc8e642 Merge remote-tracking branch 'origin/develop' into xap 2022-12-06 21:45:25 +00:00
QMK Bot 8cba1d3297 Merge remote-tracking branch 'origin/master' into develop 2022-12-06 21:44:52 +00:00
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 3fa1e8e273 Bump anothrNick/github-tag-action from 1.53.0 to 1.54.0 (#19246)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-07 08:44:19 +11:00
QMK Bot c69a9afbc4 Merge remote-tracking branch 'origin/develop' into xap 2022-12-06 15:59:05 +00:00
QMK Bot 71c1ca47db Merge remote-tracking branch 'origin/master' into develop 2022-12-06 15:58:25 +00:00
leah-splitkb 0e93b0d59b [Keyboard] Add splitkb.com's Aurora Lily58 (#19183) 2022-12-06 15:57:50 +00:00
QMK Bot 667af88efe Merge remote-tracking branch 'origin/develop' into xap 2022-12-06 08:33:08 +00:00
Xelus22andDrashna Jaelre 0b1d5497fc [Keyboard] Refactor xs60 with soldered and hotswap version (#19049)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-06 00:32:25 -08:00
QMK Bot a9b95a105b Merge remote-tracking branch 'origin/develop' into xap 2022-12-05 19:33:03 +00:00
QMK Bot 76c69f35c5 Merge remote-tracking branch 'origin/master' into develop 2022-12-05 19:32:26 +00:00
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 2709b6ed61 Bump anothrNick/github-tag-action from 1.52.0 to 1.53.0 (#19242)
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.52.0 to 1.53.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.52.0...1.53.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-05 19:31:20 +00:00
QMK Bot c1cd2ffd93 Merge remote-tracking branch 'origin/develop' into xap 2022-12-05 02:33:50 +00:00
QMK Bot 1fd2ef2bcb Merge remote-tracking branch 'origin/master' into develop 2022-12-05 02:33:15 +00:00
Joel Challis 92fadf0110 Ensure info.json layout macros are somewhat valid (#19236) 2022-12-05 02:32:40 +00:00
QMK Bot 8865a2e616 Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 21:04:53 +00:00
QMK Bot 3bf0a10990 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 21:04:18 +00:00
92354b2ca8 [Keyboard] Add Olly_Octagon PCB to QMK (#19128)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-04 21:03:41 +00:00
QMK Bot 4bd22c1f29 Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 20:59:23 +00:00
QMK Bot db4934f922 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 20:58:50 +00:00
Charly Delay af14b212b9 Re-structure splinky support to handle versioning in the same fashion as for the teensy (#19123) 2022-12-04 20:58:12 +00:00
QMK Bot 2e6e1bc0c0 Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 20:49:10 +00:00
QMK Bot 41b1f7283b Merge remote-tracking branch 'origin/master' into develop 2022-12-04 20:48:35 +00:00