From 89a1374ef48869505d9185559f588a49b8b0b23b Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 21 Sep 2022 09:45:07 +1000 Subject: [PATCH] Add DD mapping for LED/RGB Matrix center (#18432) --- data/mappings/info_config.json | 2 ++ data/schemas/keyboard.jsonschema | 12 ++++++++++++ keyboards/adm42/rev4/config.h | 1 - keyboards/yandrstudio/nz67v2/config.h | 1 - keyboards/yandrstudio/tg67/config.h | 1 - 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json index e1dbb27a6cd..b27081e0378 100644 --- a/data/mappings/info_config.json +++ b/data/mappings/info_config.json @@ -38,6 +38,7 @@ "LED_COMPOSE_PIN": {"info_key": "indicators.compose"}, "LED_KANA_PIN": {"info_key": "indicators.kana"}, "LED_PIN_ON_STATE": {"info_key": "indicators.on_state", "value_type": "int"}, + "LED_MATRIX_CENTER": {"info_key": "led_matrix.center_point", "value_type": "array.int"}, "LED_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "led_matrix.max_brightness", "value_type": "int"}, "LED_MATRIX_SPLIT": {"info_key": "led_matrix.split_count", "value_type": "array.int"}, "LED_MATRIX_HUE_STEP": {"info_key": "led_matrix.hue_steps", "value_type": "int"}, @@ -83,6 +84,7 @@ "RGBLIGHT_VAL_STEP": {"info_key": "rgblight.brightness_steps", "value_type": "int"}, "RGBLIGHT_SLEEP": {"info_key": "rgblight.sleep", "value_type": "bool"}, "RGBLIGHT_SPLIT": {"info_key": "rgblight.split", "value_type": "bool"}, + "RGB_MATRIX_CENTER": {"info_key": "rgb_matrix.center_point", "value_type": "array.int"}, "RGB_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "rgb_matrix.max_brightness", "value_type": "int"}, "RGB_MATRIX_SPLIT": {"info_key": "rgb_matrix.split_count", "value_type": "array.int"}, "RGB_MATRIX_HUE_STEP": {"info_key": "rgb_matrix.hue_steps", "value_type": "int"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 60381a21a06..ff5163e7371 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -265,6 +265,12 @@ "type": "object", "properties": { "driver": {"type": "string"}, + "center_point": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "items": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + }, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, @@ -303,6 +309,12 @@ "type": "object", "properties": { "driver": {"type": "string"}, + "center_point": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "items": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + }, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h index ca42185f4e2..b567c6450e8 100644 --- a/keyboards/adm42/rev4/config.h +++ b/keyboards/adm42/rev4/config.h @@ -23,7 +23,6 @@ #define DRIVER_LED_TOTAL 42 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170 -#define RGB_MATRIX_CENTER { 112, 32 } #define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_LED_PROCESS_LIMIT 21 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index 5d0aa382de6..77f050aa1fc 100644 --- a/keyboards/yandrstudio/nz67v2/config.h +++ b/keyboards/yandrstudio/nz67v2/config.h @@ -51,7 +51,6 @@ # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 # define RGBLIGHT_VAL_STEP 5 # define RGB_DISABLE_WHEN_USB_SUSPENDED -# define RGB_MATRIX_CENTER { 112, 32 } # define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h index 729375f987e..767e54687db 100644 --- a/keyboards/yandrstudio/tg67/config.h +++ b/keyboards/yandrstudio/tg67/config.h @@ -40,7 +40,6 @@ # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 250 # define RGBLIGHT_VAL_STEP 5 # define RGB_DISABLE_WHEN_USB_SUSPENDED -# define RGB_MATRIX_CENTER { 112, 32 } # define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGBLIGHT_ANIMATIONS