gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-04-22 15:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some matrix effects

Browse Source
This commit is contained in:
zvecr 2022-09-30 00:16:11 +01:00
parent 95185b5fcc
commit 179049dfc9
3 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/constants/led_matrix_0.0.1.json
View File

@ -1,6 +1,8 @@
{ {
"groups": { "groups": {
"reactive": {} "reactive": {
"define": "LED_MATRIX_KEYREACTIVE_ENABLED"
}
}, },
"effects": { "effects": {
"0x00": { "0x00": {

12
data/constants/rgb_matrix_0.0.1.json
View File

@ -1,7 +1,11 @@
{ {
"groups": { "groups": {
"framebuffer": {}, "framebuffer": {
"reactive": {} "define": "RGB_MATRIX_FRAMEBUFFER_EFFECTS"
},
"reactive": {
"define": "RGB_MATRIX_KEYREACTIVE_ENABLED"
}
}, },
"effects": { "effects": {
"0x00": { "0x00": {
@ -109,11 +113,11 @@
"group": "reactive" "group": "reactive"
}, },
"0x21": { "0x21": {
"key": "RGB_MATRIX_SOLID_REACTIVE", "key": "SOLID_REACTIVE",
"group": "reactive" "group": "reactive"
}, },
"0x22": { "0x22": {
"key": "RGB_MATRIX_SOLID_REACTIVE_WIDE", "key": "SOLID_REACTIVE_WIDE",
"group": "reactive" "group": "reactive"
}, },
"0x23": { "0x23": {

29
lib/python/qmk/xap/gen_firmware/inline_generator.py
View File

@ -316,6 +316,7 @@ def _append_broadcast_messages(lines, container):
def _append_lighting_map(lines, feature, spec): def _append_lighting_map(lines, feature, spec):
"""TODO: """TODO:
""" """
groups = spec.get('groups', {})
ifdef_prefix = PREFIX_MAP[feature]['ifdef'] ifdef_prefix = PREFIX_MAP[feature]['ifdef']
def_prefix = PREFIX_MAP[feature]['def'] def_prefix = PREFIX_MAP[feature]['def']
@ -324,10 +325,19 @@ def _append_lighting_map(lines, feature, spec):
define = obj["define"] define = obj["define"]
offset = f' + {obj["offset"]}' if obj["offset"] else '' offset = f' + {obj["offset"]}' if obj["offset"] else ''
lines.append(f''' line = f'''
#ifdef {ifdef_prefix}_{define} #ifdef {ifdef_prefix}_{define}
{{ {id}, {def_prefix}_{define}{offset}}}, {{ {id}, {def_prefix}_{define}{offset}}},
#endif''') #endif'''
group = groups.get(obj.get("group", None), {}).get('define', None)
if group:
line = f'''
#ifdef {group}
{line}
#endif'''
lines.append(line)
lines.append('};') lines.append('};')
@ -355,16 +365,27 @@ uint8_t xap2{feature}(uint8_t val) {{
def _append_lighting_bitmask(lines, feature, spec): def _append_lighting_bitmask(lines, feature, spec):
"""TODO: """TODO:
""" """
groups = spec.get('groups', {})
ifdef_prefix = PREFIX_MAP[feature]['ifdef'] ifdef_prefix = PREFIX_MAP[feature]['ifdef']
lines.append(f"static const uint64_t ENABLED_{feature.upper()}_EFFECTS = 0") lines.append(f"static const uint64_t ENABLED_{feature.upper()}_EFFECTS = 0")
for id, obj in spec.get('effects', {}).items(): for id, obj in spec.get('effects', {}).items():
define = obj["define"] define = obj["define"]
lines.append(f''' line = f'''
#ifdef {ifdef_prefix}_{define} #ifdef {ifdef_prefix}_{define}
| (1ULL << {id}) | (1ULL << {id})
#endif''') #endif'''
group = groups.get(obj.get("group", None), {}).get('define', None)
if group:
line = f'''
#ifdef {group}
{line}
#endif'''
lines.append(line)
lines.append(';') lines.append(';')