Commit Graph

627 Commits

Author SHA1 Message Date
QMK Bot 4e86fc43ff Merge remote-tracking branch 'origin/develop' into xap 2022-11-09 15:51:31 +00:00
Joel Challis dc9162438d Reject json with duplicate keys? (#18108) 2022-11-09 15:50:43 +00:00
QMK Bot b6506ccab9 Merge remote-tracking branch 'origin/develop' into xap 2022-11-09 14:04:20 +00:00
Ryan d789b4b7d9 Improve LED config parsing error messages (#19007) 2022-11-09 14:02:44 +00:00
QMK Bot 6652faaf08 Merge remote-tracking branch 'origin/develop' into xap 2022-11-08 15:47:43 +00:00
Nick Brassel 9daf77b593 Add raw output option for QGF/QFF files. (#18998) 2022-11-08 15:47:07 +00: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
zvecr 0af00fb45c Stub some keycode rendering 2022-11-07 23:30:09 +00:00
Nick Brassel d6841242e6 Merge remote-tracking branch 'upstream/develop' into xap 2022-11-06 08:34:19 +11:00
Nick Brassel 4d33f356a6 Macro keycode name refactoring (#18958) 2022-11-05 23:22:11 +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 5835eda1f0 Merge remote-tracking branch 'origin/develop' into xap 2022-10-20 13:36:23 +00:00
Joel Challis 0b41c13509 [CLI] Ensure consistent clean behaviour (#18781) 2022-10-20 14:35:27 +01: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 86c6b0c333 Merge remote-tracking branch 'origin/develop' into xap 2022-10-19 10:30:15 +00:00
Joel Challis fc0330a54a Correctly build keymap.json containing additional config (#18766) 2022-10-19 11:29:44 +01:00
Nick Brassel bc56585932 Actually take into account keyboard/keymap xap specs 2022-10-17 10:16:30 +11:00
zvecr edc14b29be Dump lighting maps out of inline gen 2022-10-16 23:55:44 +01:00
zvecr 9fcab705a9 Align client/docs gen with recent changes 2022-10-16 20:24:37 +01:00
Nick Brassel 5083c618cf qmk pytest 2022-10-16 13:25:48 +11:00
Nick Brassel c2e95c8522 Squashed commit of the following:
commit d614bc5f62f3c2efc5c5cc0f38168a67681e6fb5
Author: Nick Brassel <nick@tzarc.org>
Date:   Sun Oct 16 13:17:03 2022 +1100

    Remove old header generator.

commit 08337b814cfcef57a1f6b41acf06b806ad4bb116
Author: Nick Brassel <nick@tzarc.org>
Date:   Sat Oct 15 11:47:20 2022 +1100

    Restart jinja2 generation for firmware-side output.
2022-10-16 13:19:15 +11:00
zvecr 384bb7ddc7 Correctly handle 'latest' 2022-10-13 02:21:15 +01:00
zvecr d1e3036ce2 Generate python effect constants 2022-10-13 01:43:47 +01:00
QMK Bot 858808af9b Merge remote-tracking branch 'origin/develop' into xap 2022-10-12 21:42:02 +00:00
QMK Bot e93dc66733 Merge remote-tracking branch 'origin/master' into develop 2022-10-12 21:41:29 +00:00
Joel Challis 4dec07741b Remove unused LED_INDICATORS constant (#18686) 2022-10-12 22:40:53 +01:00
zvecr dfc3ead42d Ignore xap_client lint issues 2022-10-12 19:41:50 +01:00
zvecr 9e1b8a710c Refactor XAP keycode logic 2022-10-12 19:41:50 +01:00
zvecr 77a86b018a Resolve ifdef todo 2022-10-02 00:53:05 +01:00
zvecr 309a08ff8f Poential fix for pre gcc 8.1 2022-10-02 00:23:31 +01:00
zvecr 179049dfc9 Fix some matrix effects 2022-09-30 00:16:11 +01:00
zvecr 019d3f4877 Finish stub for effect mapping 2022-09-29 23:44:19 +01:00
zvecr f81328068e stash more lighting 2022-09-29 23:44:19 +01:00
zvecr 1dbb4c0f96 stash 2022-09-29 23:44:19 +01:00
zvecr 76a45a4e24 Stub out nested routes 2022-09-29 23:44:19 +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 5cd0dafc7f Merge remote-tracking branch 'origin/develop' into xap 2022-09-21 01:41:50 +00:00
Ryan 591701cdf9 Fix incorrect g_led_config generation (#18431) 2022-09-21 02:41:18 +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