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 error_log complaint about Helix boards #9528

Merged
merged 2 commits into from
Jun 25, 2020

Conversation

fauxpark
Copy link
Member

Description

"Error: helix/pico: LAYOUT: Number of elements in info.json does not match! info.json:64 != LAYOUT:50"
"Error: helix/pico/back: LAYOUT: Number of elements in info.json does not match! info.json:64 != LAYOUT:50"
"Error: helix/pico/sc: LAYOUT: Number of elements in info.json does not match! info.json:64 != LAYOUT:50"
"Error: helix/pico/sc/back: LAYOUT: Number of elements in info.json does not match! info.json:64 != LAYOUT:50"
"Error: helix/pico/sc/under: LAYOUT: Number of elements in info.json does not match! info.json:64 != LAYOUT:50"
"Error: helix/pico/under: LAYOUT: Number of elements in info.json does not match! info.json:64 != LAYOUT:50"
"Error: helix/rev1: LAYOUT: Number of elements in info.json does not match! info.json:64 != LAYOUT:60"

Also had to shuffle around the layout macros for the rev2 as after the top level info.json was removed, the rev2 info.json and the first layout macro disagreed - the solution was to put the 64-key macro first (and not indent it) because the default HELIX_ROWS is 5. This should let it still work in Configurator.

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

@fauxpark fauxpark requested a review from a team June 24, 2020 00:16
@fauxpark
Copy link
Member Author

Hm, no, now rev1 is failing and I'm not sure why. its info.json and rev1.h are correct...

@fauxpark
Copy link
Member Author

Seems to be looking in rev2.h first... because it tries DEFAULT_FOLDER.

Finding layouts in file: keyboards/helix/helix.h
Finding layouts in file: keyboards/helix/rev2/rev2.h
WARNING helix/rev1: Falling back to searching for KEYMAP/LAYOUT macros.
Finding layouts in file: keyboards/helix/rev1/config.h
Finding layouts in file: keyboards/helix/rev1/rev1.h
Finding layouts in file: keyboards/helix/rev1/serial_config.h
Finding layouts in file: keyboards/helix/rev1/split_util.h

@fauxpark fauxpark mentioned this pull request Jun 24, 2020
13 tasks
@fauxpark
Copy link
Member Author

This should be good to merge as is, I think. The error_log will just show a slightly different set of messages until we settle on a solution for #9530.

Copy link
Member

@Erovia Erovia left a comment

Choose a reason for hiding this comment

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

What could go wrong...right?

@Erovia Erovia merged commit c2dd19d into qmk:master Jun 25, 2020
@fauxpark fauxpark deleted the fix-helix-error-log branch June 26, 2020 01:05
@fauxpark fauxpark mentioned this pull request Jun 27, 2020
13 tasks
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants