Commit Graph

21380 Commits

Author SHA1 Message Date
lalalademaxiya1
765c219388 Update q1 for keychron 2022-07-07 12:33:22 +08:00
lalalademaxiya1
524515f76f
Merge branch 'Keychron:playground' into playground 2022-06-30 10:25:14 +08:00
lalalademaxiya1
9ab79d6418 Merge branch 'playground_new' into playground
Update playground with the latest features from branch develop in qmk
2022-06-30 10:09:59 +08:00
lalalademaxiya1
59d0c00ecb Merge remote-tracking branch 'upstream/develop' into playground_new
Add new features
2022-06-30 09:55:17 +08:00
lalalademaxiya1
e0a567e9d4 Update q5 2022-06-30 09:32:01 +08:00
jpe230
4f124574f1
(develop)AP2: Enable support for WL EEPROM Driver (#17506) 2022-06-30 11:07:43 +10:00
QMK Bot
fb05b491e7 Merge remote-tracking branch 'origin/master' into develop 2022-06-29 23:34:39 +00:00
Joel Challis
7326a0051b
Allow module check to error out when piped to /dev/null (#17505) 2022-06-30 00:33:59 +01:00
Nick Brassel
34e244cecf
Wear-leveling EEPROM drivers: embedded_flash, spi_flash, legacy (#17376) 2022-06-30 07:42:23 +10:00
ihatechoosingusernames
1204cbb7ea
Update feature_split_keyboard.md to add extra detail about left and right matrices. (#17492) 2022-06-29 18:39:37 +10:00
Dasky
dcdc7290e5
RGB Matrix Heatmap - Skip positions with NO_LED (#17488) 2022-06-29 01:25:03 -07:00
QMK Bot
f7eb7926e8 Merge remote-tracking branch 'origin/master' into develop 2022-06-29 08:17:56 +00:00
Drashna Jaelre
74bec84740
[Bug] Fix 3 speed mousekey mode (#17500) 2022-06-29 01:16:31 -07:00
QMK Bot
0151f4c307 Merge remote-tracking branch 'origin/master' into develop 2022-06-29 06:45:13 +00:00
dependabot[bot]
88086a80b0
Bump JamesIves/github-pages-deploy-action from 3.7.1 to 4.3.4 (#17497)
Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 3.7.1 to 4.3.4.
- [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases)
- [Commits](https://github.com/JamesIves/github-pages-deploy-action/compare/3.7.1...v4.3.4)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-29 16:45:09 +10:00
dependabot[bot]
58f4e19503
Bump actions/checkout from 2 to 3 (#17496)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-29 16:44:54 +10:00
dependabot[bot]
b37a59a967
Bump peter-evans/create-pull-request from 3 to 4 (#17495)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-29 16:44:19 +10:00
lalalademaxiya1
6b35d3ac4b
Merge pull request #43 from lalalademaxiya1/playground
Playground
2022-06-29 11:53:41 +08:00
lalalademaxiya1
4d6d545990 Merge branch 'playground' of https://github.com/lalalademaxiya1/qmk_firmware into playground 2022-06-29 11:39:28 +08:00
lalalademaxiya1
2688e7d16e Update common_features.mk 2022-06-29 11:37:25 +08:00
lalalademaxiya1
ad8298a965
Merge pull request #42 from lalalademaxiya1/playground
Playground
2022-06-29 09:26:27 +08:00
lalalademaxiya1
71687629a0 Override function restart_usb_driver 2022-06-29 09:17:21 +08:00
QMK Bot
1f61fb33b4 Merge remote-tracking branch 'origin/master' into develop 2022-06-28 22:47:17 +00:00
Nick Brassel
2b094d4112
Enable dependabot for actions. 2022-06-29 08:46:47 +10:00
QMK Bot
2daad28ab1 Merge remote-tracking branch 'origin/master' into develop 2022-06-28 22:29:19 +00:00
Drashna Jaelre
43f8d365ba
[Bug] Fix issue with mousekey movement getting stuck (#17493)
* [Bug] Fix issue with mousekey movement getting stuck

* Lint
2022-06-28 15:28:44 -07:00
QMK Bot
54383674db Merge remote-tracking branch 'origin/master' into develop 2022-06-28 22:14:09 +00:00
Nick Brassel
1e402060a6
Bump revision for auto-tagging.
Seems there was an error, but it wasn't failing the actions run.

https://github.com/anothrNick/github-tag-action/releases/tag/1.39.0
2022-06-29 08:13:38 +10:00
lalalademaxiya1
897759491f Update ckled2001.c 2022-06-28 23:55:37 +08:00
lalalademaxiya1
aae4f196d4 Resolve conflicting files 2022-06-28 23:51:51 +08:00
lalalademaxiya1
4753be86b9 Update q3 2022-06-28 21:51:07 +08:00
lalalademaxiya1
ea518140dc
Merge pull request #41 from lalalademaxiya1/playground
Update eeprom_stm32_l4.c
2022-06-27 11:12:03 +08:00
lalalademaxiya1
58aba271f3 Update eeprom_stm32_l4.c 2022-06-27 11:11:10 +08:00
lalalademaxiya1
03aa277537
Merge pull request #40 from lalalademaxiya1/playground
Playground
2022-06-27 11:09:30 +08:00
lalalademaxiya1
08095b3f3d Resolve conflicts for merge playground_new into playground 2022-06-27 10:33:05 +08:00
lalalademaxiya1
96d8e32d8d Update subproject commit 2022-06-27 09:24:24 +08:00
lalalademaxiya1
de608e6324 Update q0 and add q10, q65 2022-06-27 09:08:04 +08:00
QMK Bot
33b62b6867 Merge remote-tracking branch 'origin/master' into develop 2022-06-26 22:59:06 +00:00
Joel Challis
fa3dd373b4
Fix error message in generated code (#17484) 2022-06-27 08:58:31 +10:00
Nick Brassel
01ecf332ff
Generic wear-leveling algorithm (#16996)
* Initial import of wear-leveling algorithm.

* Alignment.

* Docs tweaks.

* Lock/unlock.

* Update quantum/wear_leveling/wear_leveling_internal.h

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>

* More tests, fix issue with consolidation when unlocked.

* More tests.

* Review comments.

* Add plumbing for FNV1a.

* Another test checking that checksum mismatch clears the cache.

* Check that the write log still gets played back.

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-06-27 07:18:21 +10:00
Thomas Kriechbaumer
0d013a21e1
[Split] Verify Split Pointing Device config (#17481) 2022-06-26 09:15:25 -07:00
Thomas Kriechbaumer
01bc974365
improvements for Cirque Pinnacle trackpads (#17091) 2022-06-25 22:22:28 +02:00
QMK Bot
60cbb25148 Merge remote-tracking branch 'origin/master' into develop 2022-06-25 19:46:15 +00:00
rooski15
410686dc03
[Keyboard] Add blockboy/ac980mini keyboard (#16839)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-25 12:45:45 -07:00
QMK Bot
99614bd89a Merge remote-tracking branch 'origin/master' into develop 2022-06-25 19:41:30 +00:00
precondition
e13bb58c40
Only omit paths containing "/keymaps/" (#17468)
This allows keyboard names to contain the word "keymaps"
2022-06-25 20:40:49 +01:00
QMK Bot
e30cd0fa16 Merge remote-tracking branch 'origin/master' into develop 2022-06-25 19:35:17 +00:00
Drashna Jaelre
7fd3d76faa
[Split] Ensure SOFT_SERIAL_PIN is defined if USE_I2C isn't defined (#17466) 2022-06-25 12:34:40 -07:00
QMK Bot
c43e89bb4a Merge remote-tracking branch 'origin/master' into develop 2022-06-25 19:15:48 +00:00
jack
cbbdcec290
[Keyboard] Fixup skergo - missing keycode in keymaps (#17458) 2022-06-25 12:15:00 -07:00