Commit Graph

25609 Commits

Author SHA1 Message Date
QMK Bot
9115ddfedb Merge remote-tracking branch 'origin/develop' into xap 2023-01-07 17:06:28 +00:00
Joel Challis
974a1eaf2a
Ignore defaults.hjson values if already set (#19511)
* Ignore defaults.hjson values if already set

* Add warning when nothing is merged
2023-01-07 17:05:53 +00:00
QMK Bot
0c444ab568 Merge remote-tracking branch 'origin/develop' into xap 2023-01-07 17:03:56 +00:00
QMK Bot
403c7eeb5c Merge remote-tracking branch 'origin/master' into develop 2023-01-07 17:03:18 +00:00
Joel Challis
c5e3275299
Fix handwired/onekey/kb2040 WS2812 pin (#19517) 2023-01-07 17:02:40 +00:00
QMK Bot
0c9389b693 Merge remote-tracking branch 'origin/develop' into xap 2023-01-06 21:47:19 +00:00
QMK Bot
31b8dd34a3 Merge remote-tracking branch 'origin/master' into develop 2023-01-06 21:46:41 +00:00
dependabot[bot]
97910fac06
Bump anothrNick/github-tag-action from 1.58.0 to 1.61.0 (#19519)
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.58.0 to 1.61.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.58.0...1.61.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>
2023-01-06 21:45:23 +00:00
QMK Bot
5d222434be Merge remote-tracking branch 'origin/develop' into xap 2023-01-06 17:13:46 +00:00
QMK Bot
72dc1f88b9 Merge remote-tracking branch 'origin/master' into develop 2023-01-06 17:13:12 +00:00
Daniel Schaefer
b56ffc8920
docs: Fix IS31FL3743A driver name (#19518)
Incorrectly documented.
See: `builddefs/common_features.mk`
2023-01-06 17:12:30 +00:00
QMK Bot
c929942bff Merge remote-tracking branch 'origin/develop' into xap 2023-01-06 04:17:27 +00:00
Joel Challis
5c730d971e
Migrate submodule dirty check to CLI (#19488) 2023-01-06 04:16:52 +00:00
QMK Bot
5ca4855afe Merge remote-tracking branch 'origin/develop' into xap 2023-01-05 23:42:05 +00:00
QMK Bot
b2384f1809 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 23:41:28 +00:00
Sergey Vlasov
4a7d65b9d7
Fix MATRIX_COLS and MATRIX_ROWS generation for custom matrix (#19508)
The code which generated the MATRIX_COLS and MATRIX_ROWS defines from
the JSON information was checking the presence of the `matrix_pins` key,
which may not exist if a custom matrix is used.  Check the presence of
`matrix_size` instead.
2023-01-05 23:40:53 +00:00
QMK Bot
b4383b2bee Merge remote-tracking branch 'origin/develop' into xap 2023-01-05 19:34:07 +00:00
QMK Bot
fee362e09a Merge remote-tracking branch 'origin/master' into develop 2023-01-05 19:33:34 +00:00
dependabot[bot]
64508caa76
Bump anothrNick/github-tag-action from 1.57.0 to 1.58.0 (#19509)
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.57.0 to 1.58.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.57.0...1.58.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>
2023-01-05 19:32:57 +00:00
QMK Bot
304b608a34 Merge remote-tracking branch 'origin/develop' into xap 2023-01-05 15:14:18 +00:00
QMK Bot
8f36e08be0 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 15:13:44 +00:00
Paul Massendari
84a642266c
A comma was missing (#19507) 2023-01-05 15:12:46 +00:00
Nick Brassel
21db0e4f84
Install python reqs during regen 2023-01-05 11:39:23 +11:00
Nick Brassel
8829d0431c
Reset macros as well. 2023-01-05 11:08:45 +11:00
QMK Bot
312a261a4b Merge remote-tracking branch 'origin/develop' into xap 2023-01-04 19:42:35 +00:00
QMK Bot
68aa64172d Merge remote-tracking branch 'origin/master' into develop 2023-01-04 19:41:58 +00:00
dependabot[bot]
e2ef3c8cc9
Bump anothrNick/github-tag-action from 1.56.0 to 1.57.0 (#19502)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-05 06:41:20 +11:00
QMK Bot
1fb3f7d208 Merge remote-tracking branch 'origin/develop' into xap 2023-01-04 06:19:53 +00:00
QMK Bot
8b141020b2 Merge remote-tracking branch 'origin/master' into develop 2023-01-04 06:18:53 +00:00
SapuSeven
6a02eb2874
Add SapuSeven MacroPad12 (#19466)
* Add SapuSeven MacroPad12

* Update image url

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Remove unnecessary layers

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-01-04 06:18:16 +00:00
QMK Bot
16c0f233f9 Merge remote-tracking branch 'origin/develop' into xap 2023-01-04 05:22:11 +00:00
QMK Bot
b6b9b25525 Merge remote-tracking branch 'origin/master' into develop 2023-01-04 05:21:35 +00:00
Carlo
be024a1d43
feat(kprepublic/bm60hsrgb_poker): update carlosala keymap (#19426) 2023-01-04 05:21:32 +00:00
Paul James
04dcf81d1e
[Keyboard] Stop LED1 from flashing on layer change (#19427) 2023-01-04 05:21:03 +00:00
QMK Bot
432cad81da Merge remote-tracking branch 'origin/develop' into xap 2023-01-04 05:08:30 +00:00
QMK Bot
03a728f71c Merge remote-tracking branch 'origin/master' into develop 2023-01-04 05:07:50 +00:00
Nick Brassel
8e869da1da
Allow for specifying the number of symbols to output. (#19497) 2023-01-04 16:07:13 +11:00
zvecr
8c3e1feca7 regen_push - install dev deps 2023-01-04 04:59:12 +00:00
QMK Bot
566376be27 Merge remote-tracking branch 'origin/develop' into xap 2023-01-04 04:18:45 +00:00
zvecr
115c241f21 Merge remote-tracking branch 'origin/master' into develop 2023-01-04 04:17:58 +00:00
Nick Brassel
691668340c
Add qmk mass-compile, which intends to supercede qmk multibuild whilst providing support for filtering as per data-driven definitions. (#18971) 2023-01-04 04:10:18 +00:00
QMK Bot
e4fc4646f4 Merge remote-tracking branch 'origin/develop' into xap 2023-01-04 03:26:28 +00:00
Joel Challis
f9ee0571a7
Remove unused Makefile paths (#19487) 2023-01-04 14:25:48 +11:00
QMK Bot
04811ff0e6 Merge remote-tracking branch 'origin/develop' into xap 2023-01-03 19:37:32 +00:00
QMK Bot
6d41ba75d3 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 19:36:56 +00:00
dependabot[bot]
46ed46e384
Bump anothrNick/github-tag-action from 1.55.0 to 1.56.0 (#19494)
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.55.0 to 1.56.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.55.0...1.56.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>
2023-01-03 19:36:22 +00:00
QMK Bot
0a4264fea4 Merge remote-tracking branch 'origin/develop' into xap 2023-01-03 03:16:15 +00:00
Joel Challis
c345278101
Replace list_keyboards.sh with CLI calls (#19485) 2023-01-03 14:15:29 +11:00
QMK Bot
bbd783250d Merge remote-tracking branch 'origin/develop' into xap 2023-01-02 22:52:39 +00:00
QMK Bot
44800f119d Merge remote-tracking branch 'origin/master' into develop 2023-01-02 22:52:06 +00:00