Skip to content

Commit f76cc32

Browse files
tzarctzarc
committed
Merge branch 'develop'
2 parents 7620c64 + 465ab5a commit f76cc32

File tree

14,740 files changed

+607316
-636377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

14,740 files changed

+607316
-636377
lines changed

‎.github/workflows/unit_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ jobs:
3232
- name: Install dependencies
3333
run: pip3 install -r requirements-dev.txt
3434
- name: Run tests
35-
run: make test:all
35+
run: qmk test-c

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ quantum/version.h
3737

3838
# DD config at wrong location
3939
/keyboards/**/keymaps/*/info.json
40+
/keyboards/**/keymaps/*/keyboard.json
4041

4142
# Old-style QMK Makefiles
4243
/keyboards/**/Makefile

‎builddefs/build_keyboard.mk

+32-24
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ MAIN_KEYMAP_PATH_3 := $(KEYBOARD_PATH_3)/keymaps/$(KEYMAP)
119119
MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP)
120120
MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
121121

122-
# Pull in rules from info.json
122+
# Pull in rules from DD keyboard config
123123
INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_rules.mk)
124124
include $(INFO_RULES_MK)
125125

@@ -221,7 +221,7 @@ include $(BUILDDEFS_PATH)/converters.mk
221221
MCU_ORIG := $(MCU)
222222
include $(wildcard $(PLATFORM_PATH)/*/mcu_selection.mk)
223223

224-
# PLATFORM_KEY should be detected in info.json via key 'processor' (or rules.mk 'MCU')
224+
# PLATFORM_KEY should be detected in DD keyboard config via key 'processor' (or rules.mk 'MCU')
225225
ifeq ($(PLATFORM_KEY),)
226226
$(call CATASTROPHIC_ERROR,Platform not defined)
227227
endif
@@ -335,38 +335,54 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_config.h)","")
335335
POST_CONFIG_H += $(KEYBOARD_PATH_5)/post_config.h
336336
endif
337337

338-
# Pull in stuff from info.json
339-
INFO_JSON_FILES :=
338+
# Create dependencies on DD keyboard config - structure validated elsewhere
339+
DD_CONFIG_FILES :=
340340
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/info.json)","")
341-
INFO_JSON_FILES += $(KEYBOARD_PATH_1)/info.json
341+
DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/info.json
342342
endif
343343
ifneq ("$(wildcard $(KEYBOARD_PATH_2)/info.json)","")
344-
INFO_JSON_FILES += $(KEYBOARD_PATH_2)/info.json
344+
DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/info.json
345345
endif
346346
ifneq ("$(wildcard $(KEYBOARD_PATH_3)/info.json)","")
347-
INFO_JSON_FILES += $(KEYBOARD_PATH_3)/info.json
347+
DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/info.json
348348
endif
349349
ifneq ("$(wildcard $(KEYBOARD_PATH_4)/info.json)","")
350-
INFO_JSON_FILES += $(KEYBOARD_PATH_4)/info.json
350+
DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/info.json
351351
endif
352352
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
353-
INFO_JSON_FILES += $(KEYBOARD_PATH_5)/info.json
353+
DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/info.json
354+
endif
355+
356+
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/keyboard.json)","")
357+
DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/keyboard.json
358+
endif
359+
ifneq ("$(wildcard $(KEYBOARD_PATH_2)/keyboard.json)","")
360+
DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/keyboard.json
361+
endif
362+
ifneq ("$(wildcard $(KEYBOARD_PATH_3)/keyboard.json)","")
363+
DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/keyboard.json
364+
endif
365+
ifneq ("$(wildcard $(KEYBOARD_PATH_4)/keyboard.json)","")
366+
DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/keyboard.json
367+
endif
368+
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/keyboard.json)","")
369+
DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/keyboard.json
354370
endif
355371

356372
CONFIG_H += $(INTERMEDIATE_OUTPUT)/src/info_config.h
357373
KEYBOARD_SRC += $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c
358374

359-
$(INTERMEDIATE_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
375+
$(INTERMEDIATE_OUTPUT)/src/info_config.h: $(DD_CONFIG_FILES)
360376
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
361377
$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_config.h)
362378
@$(BUILD_CMD)
363379

364-
$(INTERMEDIATE_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES)
380+
$(INTERMEDIATE_OUTPUT)/src/default_keyboard.c: $(DD_CONFIG_FILES)
365381
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
366382
$(eval CMD=$(QMK_BIN) generate-keyboard-c --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c)
367383
@$(BUILD_CMD)
368384

369-
$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
385+
$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h: $(DD_CONFIG_FILES)
370386
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
371387
$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.h)
372388
@$(BUILD_CMD)
@@ -505,22 +521,14 @@ ifeq ($(strip $(KEEP_INTERMEDIATES)), yes)
505521
OPT_DEFS += -save-temps=obj
506522
endif
507523

508-
# TODO: remove this bodge?
509-
PROJECT_DEFS := $(OPT_DEFS)
510-
PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
511-
PROJECT_CONFIG := $(CONFIG_H)
512-
513-
CONFIG_H += $(POST_CONFIG_H)
514-
ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
515-
516524
OUTPUTS := $(INTERMEDIATE_OUTPUT)
517525
$(INTERMEDIATE_OUTPUT)_SRC := $(SRC) $(PLATFORM_SRC)
518-
$(INTERMEDIATE_OUTPUT)_DEFS := $(OPT_DEFS) \
526+
$(INTERMEDIATE_OUTPUT)_DEFS := \
519527
-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h\" \
520528
-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
521-
$(PROJECT_DEFS)
522-
$(INTERMEDIATE_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(PROJECT_INC)
523-
$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(PROJECT_CONFIG)
529+
$(OPT_DEFS)
530+
$(INTERMEDIATE_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
531+
$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(POST_CONFIG_H)
524532

525533
# Default target.
526534
all: build check-size

‎builddefs/common_features.mk

+15-3
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ LED_MATRIX_DRIVER := snled27351
340340
endif
341341

342342
LED_MATRIX_ENABLE ?= no
343-
VALID_LED_MATRIX_TYPES := is31fl3218 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 custom
343+
VALID_LED_MATRIX_TYPES := is31fl3218 is31fl3236 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 custom
344344

345345
ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
346346
ifeq ($(filter $(LED_MATRIX_DRIVER),$(VALID_LED_MATRIX_TYPES)),)
@@ -353,7 +353,7 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
353353
COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations
354354
COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners
355355
POST_CONFIG_H += $(QUANTUM_DIR)/led_matrix/post_config.h
356-
SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
356+
SRC += $(QUANTUM_DIR)/process_keycode/process_led_matrix.c
357357
SRC += $(QUANTUM_DIR)/led_matrix/led_matrix.c
358358
SRC += $(QUANTUM_DIR)/led_matrix/led_matrix_drivers.c
359359
LIB8TION_ENABLE := yes
@@ -365,6 +365,12 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
365365
SRC += is31fl3218-mono.c
366366
endif
367367

368+
ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3236)
369+
I2C_DRIVER_REQUIRED = yes
370+
COMMON_VPATH += $(DRIVER_PATH)/led/issi
371+
SRC += is31fl3236-mono.c
372+
endif
373+
368374
ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3729)
369375
I2C_DRIVER_REQUIRED = yes
370376
COMMON_VPATH += $(DRIVER_PATH)/led/issi
@@ -443,7 +449,7 @@ endif
443449

444450
RGB_MATRIX_ENABLE ?= no
445451

446-
VALID_RGB_MATRIX_TYPES := aw20216s is31fl3218 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 ws2812 custom
452+
VALID_RGB_MATRIX_TYPES := aw20216s is31fl3218 is31fl3236 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 ws2812 custom
447453
ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
448454
ifeq ($(filter $(RGB_MATRIX_DRIVER),$(VALID_RGB_MATRIX_TYPES)),)
449455
$(call CATASTROPHIC_ERROR,Invalid RGB_MATRIX_DRIVER,RGB_MATRIX_DRIVER="$(RGB_MATRIX_DRIVER)" is not a valid matrix type)
@@ -474,6 +480,12 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
474480
SRC += is31fl3218.c
475481
endif
476482

483+
ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3236)
484+
I2C_DRIVER_REQUIRED = yes
485+
COMMON_VPATH += $(DRIVER_PATH)/led/issi
486+
SRC += is31fl3236.c
487+
endif
488+
477489
ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3729)
478490
I2C_DRIVER_REQUIRED = yes
479491
COMMON_VPATH += $(DRIVER_PATH)/led/issi

0 commit comments

Comments
 (0)