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

Fix rgbkb/sol/rev2/config.h after changes introduced in #13349 #13531

Closed
wants to merge 1 commit into from

Conversation

haldiraros
Copy link

Description

Fixed rgbkb/sol/rev2/config.h config.h. It was not building after changes from #13349 where defines were streamlined to eliminate a compile warning.

  • reintroduced FULLHAND_LEDS define (required in rev2.c to calculate LED position offset)
  • change default RGBLED_NUM when neither FULLHAND nor SF is enabled (was 0 instead of 124)

Personally think that the previous version that was using expressions in the defines was a bit nicer. Less mental math to make mistakes in. Unfortunately I don't think there is a way to do that without having the linter complain about an 'invalid literal for int() with base 10'.

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

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

Fixed Sol2 rev2 config.h. It was not building after changes from qmk#13349
where defines were streamlined to eliminate a compile warning.

* reintroduced FULLHAND_LEDS define (required in rev2.c to calculate LED
position offset)
* change default RGBLED_NUM when neither FULLHAND nor SF is enabled (was
0 instead 124)
@@ -30,19 +30,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

// Underglow / DIY Tent Glow are parallel to the top row leds, no separate define
#ifdef FULLHAND_ENABLE
#define FULLHAND_LEDS 24
Copy link
Contributor

Choose a reason for hiding this comment

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

remove that line

#ifdef LED_MIRRORED
#define RGBLED_NUM 74
#else
#define RGBLED_NUM 148
#endif
#elif SF_ENABLE
#define FULLHAND_LEDS 38
Copy link
Contributor

Choose a reason for hiding this comment

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

remove that line

#ifdef LED_MIRRORED
#define RGBLED_NUM 81
#else
#define RGBLED_NUM 162
#endif
#else
#define RGBLED_NUM 0
#define FULLHAND_LEDS 0
#define RGBLED_NUM 124
Copy link
Contributor

Choose a reason for hiding this comment

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

change these lines to:

  #ifdef LED_MIRRORED
    #define RGBLED_NUM 62
  #else
    #define RGBLED_NUM 124
  #endif

@haldiraros
Copy link
Author

Closing this PR as #13533 fixed this

@haldiraros haldiraros closed this Jul 13, 2021
@haldiraros haldiraros deleted the sol2_config_fix branch July 13, 2021 17:02
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.

2 participants