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

[Keyboard][Fixes] Capsunlocked CU80 #12166

Closed
wants to merge 14 commits into from
Closed

[Keyboard][Fixes] Capsunlocked CU80 #12166

wants to merge 14 commits into from

Conversation

maz0r
Copy link

@maz0r maz0r commented Mar 8, 2021

Description

Addresses several issues raised by @sigprof in #12019 after merge.
These have been raised as an Issue, as I was unsure when I would have time to work on everything.

Added RGB_MATRIX_MAXIMUM_BRIGHTNESS to limit RGB maximum to 100 of 255.
Updated layout in v2_iso_rgb.c to reflect keyboard modifiers, as I has misunderstood its purpose..
Updated layout in v2_ansi_rgb.c to reflect keyboard modifiers ^^.
Updated keymap.c for all _rgb variants layouts to include RGB_SPD.

--

Does not address the brightness override caused by using rgb_matrix_set_color().

  • I agree that with only two keys it's a non issue (and if you have caps lock on use you need to know so you can disable it ;) )
  • I can't think of an obvious way to address this without changes to the method in quantum\rgb_matrix.c?

Does not address comments on merging layouts for the _rgb variants using #ifdef functions.

  • I'll pick this up with @rys who maintains the board , I am happy to investigate / test on a new fork, although It will be a few days before I have time, and I can see testing being "fun" :D

Types of Changes

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

Issues Fixed or Closed by This PR

Fixes #12165

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).

maz0r and others added 13 commits February 25, 2021 21:51
@maz0r
added RGB matrix support for per key effects
876027a 
*Not sure if this is the right way to go about this*

Intention is to add RGB matrix support as an option for users who wish to use per key effects, as the v2_ansi and v2_iso is setup for underglow effects.

Created new folders for capsunlocked/cu80/v2_ansi_rgb and capsunlocked/cu80/v2_iso_rgb to add support for RGB matrix lighting utilising the WS2812 driver.
@maz0r
Applied changes as requested on github code review
6741a1d 
Removed redundant code for matrix scan and record.
Used suggested method for Caps and Scroll lock key state
@maz0r
resolve possible sleep issue
027388a 
testers reported issues on waking from sleep where the board would become unresponsive, adding this appears to resolve the problem
@maz0r
Revert "resolve possible sleep issue"
d8912fd 
This reverts commit 027388a.
@maz0r
sleep issue fix
1a82a6e 
retested the build locally locally with msys2 on both 0.11.69 and 0.12.8
make -j 1 capsunlocked/cu80/v2_ansi_rgb:all
make -j 1 capsunlocked/cu80/v2_iso_rgb:all

all variations build, so not sure whats happening with the travis builds ?!!
@maz0r
rules cleanup
3470248 
Removed UNICODE_ENABLE  per suggestion
@maz0r @fauxpark
Update keyboards/capsunlocked/cu80/v2_iso_rgb/rules.mk
2338c3f 
apologies, missed the non functional changes you requested, my bad

Co-authored-by: Ryan <fauxpark@gmail.com>
@maz0r @fauxpark
Update keyboards/capsunlocked/cu80/v2_ansi_rgb/rules.mk
df71ca2 
apologies, missed the non functional changes you requested, my bad

Co-authored-by: Ryan <fauxpark@gmail.com>
@maz0r
keyboard issues - cu80
339fbe7 
Added RGB_MATRIX_MAXIMUM_BRIGHTNESS to limit RGB maximum to 100 of 255.
Updated layout in v2_iso_rgb.c to reflect keyboard modifiers, as I has misunderstood its purpose..
Updated layout in v2_ansi_rgb.c to reflect keyboard modifiers, as I has misunderstood its purpose..
Updated keymap.c for all _rgb variants layouts to include RGB_SPD.
@maz0r
local change for building - ignore
84c51bf 
forgot to revert this change before checkin (dirty hack so my VIA build keybinds are correct)
@maz0r
Revert "local change for building - ignore"
57fe13c 
This reverts commit 84c51bf.
@maz0r
Revert "keyboard issues - cu80"
ca816c7 
This reverts commit 339fbe7.
@maz0r
addressing issues from last PR
7c3d76f 
Added RGB_MATRIX_MAXIMUM_BRIGHTNESS to limit RGB maximum to 100 of 255.
Updated layout in v2_iso_rgb.c to reflect keyboard modifiers, as I has misunderstood its purpose..
Updated layout in v2_ansi_rgb.c to reflect keyboard modifiers, as I has misunderstood its purpose..
Updated keymap.c for all _rgb variants layouts to include RGB_SPD.
@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Mar 8, 2021
maz0r added a commit to maz0r/qmk_firmware that referenced this pull request Mar 11, 2021
@maz0r
CU80 REFACTOR
5e074f3 
- Removed cu80/v2_ansi_rgb & cu80/v2_iso_rgb  sub folders.

*All the below changes occured for both v2_ansi and v2_iso with relevant changes (num leds/ layout etc)*

- Refactor info.json to new format containing most rules.mk and config.h variables
	- Removed variables which now exist in info.json per `qmk info`

- Homoglated keymaps into /default and /via using widows layout (sorry rys :p)

- Updated Readme.mk to includ maz0r as co-maintainer
- ToDo: update build instructions

- Added #ifdef CU80_RGB  in config.h
	- Define's     RGB_MATRIX_KEYPRESSES  &  RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
	- Undefine's      RGBLIGHT_ANIMATIONS, RGBLIGHT_HUE_STEP, RGBLIGHT_SAT_STEP, RGBLIGHT_VAL_STEP, RGBLIGHT_LIMIT_VAL

- Refactor <board>.c added #ifdef block to toggle RGB functionality.

- Added /rgb folder
	- Added config.h
		- toggles CU80_RGB define
		- replaces product ID for VIA
		- replaces product Name for VIA
	- Added rules.mk
		- Sets RGBLIGHT_ENABLE = no       to avoid build errors from having both lighting features enabled.
		- Sets RGB_MATRIX_ENABLE = yes    to build with rgb matrix
		- Defines the RGB_MATRIX_DRIVER = WS2812

>> This results in [WARNINGS] when /rgb firmware is build as the overrides are applied :(

`
QMK Firmware 0.12.15
Making capsunlocked/cu80/v2_ansi with keymap default                                                   [OK]

Making capsunlocked/cu80/v2_ansi with keymap via                                                       [OK]

Making capsunlocked/cu80/v2_ansi/rgb with keymap default                                               [WARNINGS]
	WARNING capsunlocked/cu80/v2_ansi/rgb: PRODUCT_ID in config.h is overwriting usb.pid in info.json
	WARNING capsunlocked/cu80/v2_ansi/rgb: Feature rgblight is specified in both info.json and rules.mk, the rules.mk value wins.

Making capsunlocked/cu80/v2_ansi/rgb with keymap via                                                   [WARNINGS]
	WARNING capsunlocked/cu80/v2_ansi/rgb: PRODUCT_ID in config.h is overwriting usb.pid in info.json
	WARNING capsunlocked/cu80/v2_ansi/rgb: Feature rgblight is specified in both info.json and rules.mk, the rules.mk value wins.

Making capsunlocked/cu80/v2_iso with keymap default                                                    [OK]

Making capsunlocked/cu80/v2_iso with keymap via                                                        [OK]

Making capsunlocked/cu80/v2_iso/rgb with keymap default                                                [WARNINGS]
	WARNING capsunlocked/cu80/v2_iso/rgb: PRODUCT_ID in config.h is overwriting usb.pid in info.json
	WARNING capsunlocked/cu80/v2_iso/rgb: Feature rgblight is specified in both info.json and rules.mk, the rules.mk value wins.

Making capsunlocked/cu80/v2_iso/rgb with keymap via                                                    [WARNINGS]
	WARNING capsunlocked/cu80/v2_iso/rgb: PRODUCT_ID in config.h is overwriting usb.pid in info.json
	WARNING capsunlocked/cu80/v2_iso/rgb: Feature rgblight is specified in both info.json and rules.mk, the rules.mk value wins.
`

- Includes Fixes for Issue qmk#12165 / PR qmk#12166 rgb matrix max brightness.
@maz0r maz0r mentioned this pull request Mar 11, 2021
Merged
16 tasks
@maz0r
Copy link
Author

maz0r commented Mar 11, 2021

Closing this in favor of refactor on PR #12193

@maz0r maz0r closed this Mar 11, 2021
maz0r added a commit to maz0r/qmk_firmware that referenced this pull request Mar 11, 2021
@maz0r
added missing changes from qmk#12166
00296c3 
failed to pull these over as I rebased on master.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

CU80 RGB MATRIX - Brightness Limits
1 participant
@maz0r