Have ColormapOverlay behave more like Colormap #1427
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Evy Bongers <[email protected]>
Signed-off-by: Evy Bongers <[email protected]>
Signed-off-by: Evy Bongers <[email protected]>
Signed-off-by: Evy Bongers <[email protected]>
EvyBongers
commented
May 26, 2024
plugins/Kaleidoscope-Colormap-Overlay/src/kaleidoscope/plugin/Colormap-Overlay.h
Outdated
Show resolved
Hide resolved
plugins/Kaleidoscope-Colormap-Overlay/src/kaleidoscope/plugin/Colormap-Overlay.h
Outdated
Show resolved
Hide resolved
Comment on lines
87
to
111
| #define COLORMAP_OVERLAYS_MAP(layers...) \ | ||
| namespace kaleidoscope { \ | ||
| namespace plugin { \ | ||
| const uint8_t overlays_[][kaleidoscope_internal::device.matrix_rows * kaleidoscope_internal::device.matrix_columns] = { \ | ||
| layers \ | ||
| }; \ | ||
| ColormapOverlay.configureOverlays(overlays_); \ | ||
| } /* plugin */ \ | ||
| } /* kaleidoscope */ | ||
|
|
||
| #define __IDENTITY__(X) X | ||
|
|
||
| #ifdef PER_KEY_DATA_STACKED | ||
| #define COLORMAP_OVERLAY_STACKED(...) \ | ||
| { \ | ||
| MAP_LIST(__IDENTITY__, PER_KEY_DATA_STACKED(0, __VA_ARGS__)) \ | ||
| } | ||
| #endif | ||
|
|
||
| #ifdef PER_KEY_DATA | ||
| #define COLORMAP_OVERLAY(...) \ | ||
| { \ | ||
| MAP_LIST(__IDENTITY__, PER_KEY_DATA(0, __VA_ARGS__)) \ | ||
| } | ||
| #endif |
There was a problem hiding this comment.
This is mostly copy/paste from DefaultColormap. I'm wondering if the namespaces need to be specified like they are 🤔
There was a problem hiding this comment.
I haven't felt motivated to pursue this and messing with it could open a can of worms, so I just marked the PR ready to be merged. If I end up pursuing this, I'll do so in a separate PR.
Signed-off-by: Evy Bongers <[email protected]>
Signed-off-by: Evy Bongers <[email protected]>
EvyBongers
commented
Jun 15, 2024
plugins/Kaleidoscope-Colormap-Overlay/src/kaleidoscope/plugin/Colormap-Overlay.h
Outdated
Show resolved
Hide resolved
Signed-off-by: Evy Bongers <[email protected]>
Signed-off-by: Evy Bongers <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adding support for specifying color overlays in a similar was as Colormap
Yet to do:
Fixes #1424