Merge remote-tracking branch 'origin/develop' into xap

Rework info.json reference (#21324 )
* Rework info.json reference * Apply suggestions from code review Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Update backlight.pins description * Add rgblight.driver and lowercase other driver names * Remove `split.main` and `split.matrix_grid` for now as they are not working yet --------- Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2024-12-13 13:20:46 +00:00 · 2023-08-26 20:04:02 +00:00 · 2023-08-26 21:03:29 +01:00 · 2023-08-26 18:44:56 +00:00 · 2023-08-26 18:44:20 +00:00 · 2023-08-26 19:43:40 +01:00
3 changed files with 653 additions and 330 deletions
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@ -176,6 +176,7 @@
        "bootloader": {
            "type": "string",
            "enum": [
+                "apm32-dfu",
                "atmel-dfu",
                "bootloadhid",
                "caterina",
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@ -27,7 +27,7 @@ You can define up to 32 macros in a `keymap.json` file, as used by [Configurator
        ],
        [
            {"action":"tap", "keycodes": ["F1"]},
-            {"action":"delay", "duration": "1000"},
+            {"action":"delay", "duration": 1000},
            {"action":"tap", "keycodes": ["PGDN"]}
        ]
    ],
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
Author	SHA1	Message	Date
QMK Bot	e47578c69e	Merge remote-tracking branch 'origin/develop' into xap	2023-08-26 20:04:02 +00:00
Ryan	736451558e	Rework info.json reference (#21324 ) * Rework info.json reference * Apply suggestions from code review Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Update backlight.pins description * Add rgblight.driver and lowercase other driver names * Remove `split.main` and `split.matrix_grid` for now as they are not working yet --------- Co-authored-by: Sergey Vlasov <sigprof@gmail.com>	2023-08-26 21:03:29 +01:00
QMK Bot	27c024f604	Merge remote-tracking branch 'origin/develop' into xap	2023-08-26 18:44:56 +00:00
QMK Bot	50151be430	Merge remote-tracking branch 'origin/master' into develop	2023-08-26 18:44:20 +00:00
Andy Smith	f07490bc09	Corrected duration example, should be number not string (#21839 )	2023-08-26 19:43:40 +01:00
QMK Bot	e9feb19c83	Merge remote-tracking branch 'origin/develop' into xap	2023-08-26 18:32:35 +00:00
HiryKun	5cd47f5094	Add "apm32-dfu" in keyboard.jsonschema (#21842 )	2023-08-26 19:31:59 +01:00