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.

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

Include lib8tion.c into RGB matrix build list #12699

Merged
merged 1 commit into from
Jul 23, 2021

Conversation

filterpaper
Copy link
Contributor

@filterpaper filterpaper commented Apr 26, 2021

Description

Random functions in lib8tion's random8.h requires the variable rand16seed that is externally initialised in lib8tion.c. Included that as part of source files to be built with RGB_MATRIX_ENABLE.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

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

My preference is something like

diff --git a/common_features.mk b/common_features.mk
index 8c9d0a90c..917469ced 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -255,6 +255,7 @@ endif
     SRC += $(QUANTUM_DIR)/color.c
     SRC += $(QUANTUM_DIR)/rgb_matrix.c
     SRC += $(QUANTUM_DIR)/rgb_matrix_drivers.c
+    SRC += $(LIB_PATH)/lib8tion/lib8tion.c
     CIE1931_CURVE := yes
     RGB_KEYCODES_ENABLE := yes
 

As this,

  • avoids the known issues on gcc10 and fcommon
  • adds fewer modifications to the library

@zvecr zvecr requested a review from a team April 30, 2021 00:01
@filterpaper
Copy link
Contributor Author

filterpaper commented Apr 30, 2021

My preference is something like

Changed as requested.

@filterpaper filterpaper changed the title Move rand16seed init into lib8tion.h Include lib8tion.c into RGB matrix build list Apr 30, 2021
@drashna drashna requested a review from a team May 9, 2021 03:25
@drashna drashna requested a review from zvecr June 20, 2021 02:02
@filterpaper
Copy link
Contributor Author

Bumping this @drashna and @zvecr. It's a dependency of #12670.

Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

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

This PR should target develop and be applied for LED Matrix too.

@filterpaper filterpaper changed the base branch from master to develop July 22, 2021 08:55
@filterpaper
Copy link
Contributor Author

This PR should target develop and be applied for LED Matrix too.

Added for LED_MATRIX_ENABLE.

@drashna
Copy link
Member

drashna commented Jul 22, 2021

You have a couple of merge conflicts that need to be resolved.

@filterpaper filterpaper force-pushed the lib8tion_header branch 2 times, most recently from cc7f0d9 to 98d636b Compare July 22, 2021 23:31
@filterpaper
Copy link
Contributor Author

You have a couple of merge conflicts that need to be resolved.

Sorry I missed those. Conflicts are resolved.

@drashna drashna merged commit b057c93 into qmk:develop Jul 23, 2021
@filterpaper filterpaper deleted the lib8tion_header branch July 23, 2021 01:43
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
Co-authored-by: filterpaper <filterpaper@localhost>
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
Co-authored-by: filterpaper <filterpaper@localhost>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants