Commit Graph

190 Commits

Author SHA1 Message Date
Pablo Martínez
d55b07696b
Add commit info to version.h (#19542)
* Initial commit

* Fix import order

* Fix deleted code instead of debug print line

* Format

* Update lib/python/qmk/cli/generate/version_h.py

Co-authored-by: Ryan <fauxpark@gmail.com>

* Renaming

* Update lib/python/qmk/cli/generate/version_h.py

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

* Update lib/python/qmk/git.py

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

---------

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-02 18:23:27 +00:00
QMK Bot
5c9b49c9ff Merge remote-tracking branch 'origin/develop' into xap 2023-01-30 07:56:55 +00:00
fauxpark
ef6505ad75 Merge remote-tracking branch 'upstream/master' into develop 2023-01-30 18:55:36 +11:00
Ryan
2c878b1b16
Clean up qmk generate-autocorrect-data (#19710) 2023-01-30 03:37:02 +00:00
QMK Bot
0970845492 Merge remote-tracking branch 'origin/develop' into xap 2023-01-20 03:39:02 +00:00
Joel Challis
fe6502f12e
Publish keymap.json to API (#19167) 2023-01-20 03:38:19 +00:00
QMK Bot
621e6205e8 Merge remote-tracking branch 'origin/develop' into xap 2023-01-11 01:39:10 +00:00
Joel Challis
20474ae232
Fix CLI community detection (#19562) 2023-01-11 12:38:35 +11: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
92668735cc Merge remote-tracking branch 'origin/develop' into xap 2022-12-23 11:13:20 +00:00
QMK Bot
8f506b5bc2 Merge remote-tracking branch 'origin/master' into develop 2022-12-23 11:12:33 +00:00
Joel Challis
ab1898e660
Minor alignment of rgb_breathe_table generator (#19403) 2022-12-23 11:11:56 +00:00
QMK Bot
1ca4aeaeb3 Merge remote-tracking branch 'origin/develop' into xap 2022-12-21 23:35:55 +00:00
Joel Challis
e5721bbd37
Remaining DD keymap_extras migration (#19110)
* Parse headers to data

* Regen headers from data
2022-12-21 23:35:23 +00:00
QMK Bot
ce56f20ee2 Merge remote-tracking branch 'origin/develop' into xap 2022-12-14 15:32:17 +00:00
Stefan Kerkmann
962e4c0e18
[Test] Reset timer for every unit test and provide timestamps for log messages (#17028) 2022-12-15 02:31:08 +11:00
Nick Brassel
ee93b00e6c
Merge remote-tracking branch 'upstream/develop' into xap 2022-12-10 13:29:35 +11:00
Joel Challis
9bc7e9afbd
Initial uk+us DD keymap_extras migration (#19031) 2022-12-09 00:54:52 +00:00
QMK Bot
7bc9ff8fe1 Merge remote-tracking branch 'origin/develop' into xap 2022-11-23 18:01:40 +00:00
Joel Challis
dfa53900dc
Publish constants metadata to API (#19143)
* Publish metadata

* Ensure content is sorted
2022-11-23 18:01:07 +00:00
zvecr
2ba7232131 Remove duplicate comment 2022-11-18 00:18:11 +00:00
QMK Bot
830d8a76da Merge remote-tracking branch 'origin/develop' into xap 2022-11-15 06:44:39 +00:00
Drashna Jaelre
1a3f2130d5
Revert "Add pointing device support to data driven config (#18215)" (#19063) 2022-11-15 17:44:09 +11:00
QMK Bot
ec7c36145b Merge remote-tracking branch 'origin/develop' into xap 2022-11-13 16:06:25 +00:00
Drashna Jaelre
d3073ef494
Add pointing device support to data driven config (#18215)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-11-14 03:05:46 +11:00
QMK Bot
8588fe79fe Merge remote-tracking branch 'origin/develop' into xap 2022-11-08 03:04:14 +00:00
Joel Challis
7666c966d5
Publish hjson files as json (#18996) 2022-11-08 03:03:02 +00:00
QMK Bot
b4a3a76042 Merge remote-tracking branch 'origin/develop' into xap 2022-11-08 01:05:41 +00:00
Ryan
479d8de622
Format DD mappings and schemas (#18924) 2022-11-08 01:05:08 +00:00
Nick Brassel
d6841242e6
Merge remote-tracking branch 'upstream/develop' into xap 2022-11-06 08:34:19 +11:00
Joel Challis
a69ab05dd6
Initial DD keycode migration (#18643)
* Initial DD keycode migration

* Sort magic keycodes
2022-11-05 10:30:09 +00:00
QMK Bot
9a6d54d673 Merge remote-tracking branch 'origin/develop' into xap 2022-10-21 01:21:32 +00:00
Joel Challis
345f19a5d7
Add converter support to keymap.json (#18776) 2022-10-20 18:21:17 -07:00
QMK Bot
c0ae9b316b Merge remote-tracking branch 'origin/develop' into xap 2022-10-19 16:43:58 +00:00
Joel Challis
aa8e0a3e7a
Build correctly when out of tree (#18775) 2022-10-19 17:43:25 +01:00
QMK Bot
cd4315897e Merge remote-tracking branch 'origin/develop' into xap 2022-09-26 00:04:57 +00:00
Ryan
675d91b813
Generate DD RGBLight/LED/RGB Matrix animation defines (#18459) 2022-09-26 01:04:21 +01:00
QMK Bot
015a2613cc Merge remote-tracking branch 'origin/develop' into xap 2022-09-21 17:32:30 +00:00
Ryan
2f48d300f4
Normalise info_config.h define generation (#18439)
* Normalise info_config.h define generation

* format

* Fix tests

* Update lib/python/qmk/cli/generate/config_h.py

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-09-21 18:31:57 +01:00
QMK Bot
abe63ae50f Merge remote-tracking branch 'origin/develop' into xap 2022-09-19 00:36:31 +00:00
Joel Challis
20f142a772
Tidy up LAYOUT macro generation (#18262) 2022-09-19 01:35:46 +01:00
QMK Bot
0f234fc77e Merge remote-tracking branch 'origin/develop' into xap 2022-09-17 07:51:36 +00:00
Drashna Jaelre
fb29c0ae53
[Core] Add getreuer's Autocorrect feature to core (#15699)
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
2022-09-17 17:50:54 +10:00
QMK Bot
6a5bca1914 Merge remote-tracking branch 'origin/develop' into xap 2022-09-16 02:06:26 +00:00
Ryan
bc0756f294
Disconnect usb.device_ver (#18259) 2022-09-16 12:05:25 +10:00
QMK Bot
be815457b5 Merge remote-tracking branch 'origin/develop' into xap 2022-08-28 18:35:49 +00:00
Ryan
3adaf6a46a
Handle escaping of manufacturer/product strings (#18194) 2022-08-28 19:35:17 +01:00
QMK Bot
0ffb4028a2 Merge remote-tracking branch 'origin/develop' into xap 2022-08-26 02:20:06 +00:00
Ryan
24720400a8
Update LUFA submodule (#18168) 2022-08-26 12:19:34 +10:00
Joel Challis
897403c4a7
Publish data as part of API generation (#17020) 2022-08-06 16:14:29 +10:00
zvecr
28855f658a Hash dynamic keymap at runtime 2022-07-15 03:33:34 +01:00
QMK Bot
c88370f937 Merge remote-tracking branch 'origin/develop' into xap 2022-07-11 09:52:37 +00:00
Joel Challis
35d78aa8a4
More DD encoder fixes (#17615) 2022-07-11 10:51:39 +01:00
QMK Bot
56b1aad37b Merge remote-tracking branch 'origin/develop' into xap 2022-07-08 21:49:27 +00:00
Joel Challis
81d317aa87
Fix rgbkb/sol/rev2 build issues (#17601) 2022-07-08 22:48:48 +01:00
zvecr
2592402627 Use keymap folder hash to reset dynamic keymap eeprom 2022-06-27 21:44:26 +01:00
QMK Bot
2273c5b4e0 Merge remote-tracking branch 'origin/develop' into xap 2022-06-26 22:59:33 +00: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
QMK Bot
cda2901457 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 03:15:37 +00:00
Joel Challis
1a400d8644
Allow encoder config from info.json (#17295) 2022-06-20 20:15:06 -07:00
QMK Bot
f9f7add22c Merge remote-tracking branch 'origin/develop' into xap 2022-06-18 05:31:27 +00:00
Joel Challis
17ec1650fd
Additional schema fixes (#17414) 2022-06-18 15:30:46 +10:00
Nick Brassel
484ec12397 Merge remote-tracking branch 'upstream/develop' into xap 2022-05-16 09:51:49 +10:00
Joel Challis
608fa5154c
Data driven g_led_config (#16728) 2022-05-16 07:39:29 +10:00
zvecr
7e819d7945 specs as json? 2022-05-06 23:33:51 +01:00
zvecr
58642ff40c Publish resolved XAP specs? 2022-05-06 23:11:16 +01:00
zvecr
3c20f00238 Merge remote-tracking branch 'origin/develop' into xap 2022-04-16 23:49:41 +01:00
Joel Challis
92a61aa0cd
Implement XAP 'secure' core requirements (#16843)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-04-16 11:13:05 -07:00
QMK Bot
5a099e1ad7 Merge remote-tracking branch 'origin/develop' into xap 2022-03-30 20:55:54 +00:00
QMK Bot
d75ae52fe6 Merge remote-tracking branch 'origin/master' into develop 2022-03-30 20:55:16 +00:00
Ryan
64974a7f8f
yapf: disable arithmetic predecence indication (#16749) 2022-03-30 21:54:13 +01:00
zvecr
a65ea1a711 Fix codegen for non led boards 2022-03-30 00:43:41 +01:00
zvecr
13ee88dd21 Data driven g_led config 2022-03-30 00:43:41 +01:00
Joel Challis
4f8cc32cf5
Extend 'qmk info' to handle keymap level overrides (#16702) 2022-03-21 11:57:41 +01:00
QMK Bot
3a08deb7fe Merge remote-tracking branch 'origin/master' into develop 2022-03-18 16:02:57 +00:00
Joel Challis
ed773ab73c
Relocate CLI git interactions (#16682) 2022-03-18 16:02:24 +00:00
zvecr
bffb209eee Merge remote-tracking branch 'origin/master' into develop 2022-03-18 01:15:23 +00:00
Joel Challis
e5823b5650
[CLI] Add common util for dumping generated content (#16674) 2022-03-18 01:09:29 +00:00
Ryan
75544d9127
Move Doxygen docs to subdirectory (#16561) 2022-03-07 11:22:22 +00:00
Ryan
ace0603f4f
Change data driven "str" type to represent a quoted string literal (#16516)
* Change data driven "str" type to represent a quoted string literal

* Update docs
2022-03-04 13:25:24 +00:00
QMK Bot
3c7c9bdd86 Merge remote-tracking branch 'origin/master' into develop 2022-02-27 12:40:01 +00:00
Joel Challis
779c7debcf
Fix issues with data driven split keyboards (#16457) 2022-02-27 13:39:24 +01:00
Joel Challis
e4a6afa369
Rework generate-api CLI command to use .build directory (#16441) 2022-02-27 12:28:51 +01:00
Joel Challis
cf31355f08
Changelog 2022q1 (#16380)
* Initial changelog pass

* update generate-develop-pr-list content

* Fix bad word-ness

* Fix generate-develop-pr-list ignores

* Update docs/ChangeLog/20220226.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2022-02-23 17:33:08 +00:00
fauxpark
a44abeb99a Merge remote-tracking branch 'upstream/master' into develop 2022-02-22 03:04:41 +11:00
Ryan
f30f963a0b
Internal docs generation updates (#16411) 2022-02-21 15:47:44 +00:00
Nick Brassel
8fd8b2dc92
Skip categorisation of PR if it's only for code formatting. (#16215) 2022-02-05 07:36:57 +11:00
Nick Brassel
db43e45077
Ensure version.h is recreated each build. (#16188) 2022-02-04 07:36:02 +11:00
Ryan
c72ed7c024
CLI: Parse USB device version BCD (#14580)
* CLI: Parse USB device version BCD

* Apply suggestions
2022-01-17 08:44:34 +11:00
QMK Bot
dde5cd1c54 Merge remote-tracking branch 'origin/master' into develop 2021-12-29 21:36:08 +00:00
Joel Challis
1a8a842cfb
Fix compilation-database command under MSYS (#15652)
* Fix compilation-database command under MSYS

* Add comment
2021-12-30 08:35:35 +11:00
Nick Brassel
7b018f097d
Use the PR title rather than parsing the commit message. (#15537) 2021-12-22 05:44:47 +11:00
Nick Brassel
88fe5c16a5
Changelog 2021q4 (#15325)
* Changelog.

* Remove the asymmetric encoder PR from listing due to revert.

* More docs

* More docs

* More docs

* Links to changelog, updated schedule, slotted in 2 weeks of testing at the end so that there's no ambiguity with PR merge dates.

* Clarify keyboard moves.

* Fix dates

* Sidebar

* Fixup dates.

* Fixup dates.

* Wording.
2021-11-28 10:41:48 +11:00
Nick Brassel
b9148eb1bd
[cli] Export list of develop PRs to be merged into master (#13944)
* Add developer-only command for exporting the list of PRs associated with a merge to `develop`.

* qmk pytest

* Imports.

* Remove dependencies from requirements file, manually handle.

* Reduce complexity, qmk generate-api taking too long so relying on CI
2021-11-18 17:05:08 +00:00
James Young
84ea77ead6
Remove BOOTMAGIC_ENABLE = lite option (#15002)
* remove BOOTMAGIC_ENABLE=lite setting

* change keyboard BOOTMAGIC_ENABLE rules

Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keyboard BOOTMAGIC_ENABLE inline comments

Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite".

* change keymap BOOTMAGIC_ENABLE rules

Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keymap BOOTMAGIC_ENABLE inline comments

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* change layout/user BOOTMAGIC_ENABLE rules/comments

Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/

* remove docs references to Full Bootmagic

* convert data-driven Bootmagic Lite instances

* remove Bootmagic Lite bodge from data-driven generation

* Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a

* update docs/ja/config_options.md per mtei

* update docs/faq_misc.md per mtei

Remove remaining Full Bootmagic reference.
2021-11-05 08:18:09 +11:00
Ryan
9401836727
Map PRODUCT define to keyboard_name (#14372)
* Map `PRODUCT` define to `keyboard_name`

* Fix tests

* Fix last test
2021-11-05 08:08:52 +11:00
QMK Bot
4af4ef3428 Merge remote-tracking branch 'origin/master' into develop 2021-10-04 16:26:57 +00:00