Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change split_common to use RGBLIGHT_SPLIT #5509

Merged
merged 24 commits into from
Apr 19, 2019
Merged

Change split_common to use RGBLIGHT_SPLIT #5509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
aebddfc
add temporary pdhelix(Patched Helix) code
mtei Mar 25, 2019
c01656a
add I2C_slave_buffer_t to quantum/split_common/transport.c
mtei Mar 24, 2019
d35069f
temporary cherry-pick from #5020
mtei Mar 25, 2019
f6e8aeb
add post_config.h support to build_keyboard.mk
mtei Mar 27, 2019
1aa14c5
add quantum/rgblight_post_config.h, quantum/split_common/post_config.h
mtei Mar 27, 2019
57e124c
Change split_common's transport.c I2C to use the synchronization feat…
mtei Mar 27, 2019
07c33fc
Change split_common's transport.c serial to use the synchronization f…
mtei Mar 29, 2019
80118a6
test RGBLIGHT_SPLIT on keyboards/handwired/pdhelix
mtei Mar 29, 2019
dbbdfa3
Test End Revert "test RGBLIGHT_SPLIT on keyboards/handwired/pdhelix"
mtei Mar 29, 2019
4d7310f
Test End, Revert "temporary cherry-pick from #5020"
mtei Mar 29, 2019
c8d1c83
Test End, Revert "add temporary pdhelix(Patched Helix) code"
mtei Mar 29, 2019
647c0a9
temporarily cherry-pick from #5020 to see if it passes the travis-ci …
mtei Mar 25, 2019
6b77e60
Passed the travis-ci test. Revert "temporarily cherry-pick from #5020…
mtei Mar 29, 2019
35d6855
update docs/config_options.md
mtei Mar 29, 2019
c68ee60
update split_common/transport.c, improves maintainability of serial t…
mtei Mar 30, 2019
a3f7089
Merge branch 'master' into split_common-use-RGBLIGHT_SPLIT
mtei Apr 4, 2019
be48ca1
temporary cherry-pick from #5020
mtei Apr 4, 2019
89ad6eb
fix build fail keebio/iris/rev3:default
mtei Apr 6, 2019
21b43bc
fix build fail lets_split_eh/eh:default
mtei Apr 6, 2019
419f045
Revert "temporary cherry-pick from #5020"
mtei Apr 16, 2019
978d26a
temporary cherry-pick from #5020 (0.6.336)
mtei Apr 16, 2019
4c56c82
Revert "temporary cherry-pick from #5020 (0.6.336)"
mtei Apr 16, 2019
e5f59ad
Merge branch 'master' into split_common-use-RGBLIGHT_SPLIT
mtei Apr 16, 2019
fa28d10
temporary cherry-pick from #5020 (0.6.336)
mtei Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions build_keyboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,23 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_1)/config.h)","")
CONFIG_H += $(KEYBOARD_PATH_1)/config.h
endif

POST_CONFIG_H :=
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this required to work properly?

Eg, can the post_config stuff be moved so this isn't needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is necessary.
It is necessary to prevent unnecessary dependencies between header files between modules in lower layers.

For example, quantum/split_common/transport.c needs to define SERIAL_USE_MULTI_TRANSACTION of serial when using RGBLIGHT_SPLIT.
It is not good to solve this with serial.h and rgblight.h.

ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_config.h)","")
POST_CONFIG_H += $(KEYBOARD_PATH_1)/post_config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_2)/post_config.h)","")
POST_CONFIG_H += $(KEYBOARD_PATH_2)/post_config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_3)/post_config.h)","")
POST_CONFIG_H += $(KEYBOARD_PATH_3)/post_config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_4)/post_config.h)","")
POST_CONFIG_H += $(KEYBOARD_PATH_4)/post_config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_config.h)","")
POST_CONFIG_H += $(KEYBOARD_PATH_5)/post_config.h
endif

# Save the defines and includes here, so we don't include any keymap specific ones
PROJECT_DEFS := $(OPT_DEFS)
PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
Expand Down Expand Up @@ -355,6 +372,7 @@ ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
include $(VISUALIZER_PATH)/visualizer.mk
endif

CONFIG_H += $(POST_CONFIG_H)
ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)

OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
Expand Down
2 changes: 2 additions & 0 deletions common_features.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ ifeq ($(strip $(UNICODE_COMMON)), yes)
endif

ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
POST_CONFIG_H += $(QUANTUM_DIR)/rgblight_post_config.h
OPT_DEFS += -DRGBLIGHT_ENABLE
SRC += $(QUANTUM_DIR)/rgblight.c
CIE1931_CURVE = yes
Expand Down Expand Up @@ -318,6 +319,7 @@ ifneq ($(strip $(DEBOUNCE_TYPE)), custom)
endif

ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
POST_CONFIG_H += $(QUANTUM_DIR)/split_common/post_config.h
OPT_DEFS += -DSPLIT_KEYBOARD

# Include files used by all split keyboards
Expand Down
4 changes: 3 additions & 1 deletion docs/config_options.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,12 @@ If you define these options you will enable the associated feature, which may in
* run RGB animations
* `#define RGBLED_NUM 12`
* number of LEDs
* `#define RGBLIGHT_SPLIT`
* Needed if both halves of the board have RGB LEDs wired directly to the RGB output pin on the controllers instead of passing the output of the left half to the input of the right half
* `#define RGBLED_SPLIT { 6, 6 }`
* number of LEDs connected that are directly wired to `RGB_DI_PIN` on each half of a split keyboard
* First value indicates number of LEDs for left half, second value is for the right half
* Needed if both halves of the board have RGB LEDs wired directly to the RGB output pin on the controllers instead of passing the output of the left half to the input of the right half
* When RGBLED_SPLIT is defined, RGBLIGHT_SPLIT is implicitly defined.
* `#define RGBLIGHT_HUE_STEP 12`
* units to step when in/decreasing hue
* `#define RGBLIGHT_SAT_STEP 25`
Expand Down
1 change: 1 addition & 0 deletions docs/feature_rgblight.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Your RGB lighting can be configured by placing these `#define`s in your `config.
|`RGBLIGHT_VAL_STEP` |`17` |The number of steps to increment the brightness by |
|`RGBLIGHT_LIMIT_VAL` |`255` |The maximum brightness level |
|`RGBLIGHT_SLEEP` |*Not defined*|If defined, the RGB lighting will be switched off when the host goes to sleep|
|`RGBLIGHT_SPLIT` |*Not defined*|If defined, synchronization functionality for split keyboards is added|

## Animations

Expand Down
Loading