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

Revert "handwired/split89 Layout Macro Refactor (#15210)" #15284

Merged
merged 1 commit into from
Nov 24, 2021

Conversation

noroadsleft
Copy link
Member

Description

This reverts commit 26ae432.

Requested by @jurassic73.

Apparently something about #15210 breaks the mapping for QMK Configurator, even though I checked binary reproducibility before I opened that PR. Will likely revisit this at a later date.

Types of Changes

  • Bugfix
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)

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.
  • I have read the CONTRIBUTING document.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

This reverts commit 26ae432.

Requested by jurassic73.
@fauxpark
Copy link
Member

No need to revert.

#define LAYOUT( \
    K04,      K05, K06, K07, K08, K09,        K60, K61, K62, K63, K64, K65, K66,   K67, K68, K69, \
    K24, K14, K15, K16, K17, K18, K19,        K70, K71, K72, K73, K74, K75, K76,   K77, K78, K79, \
    K34, K25, K26, K27, K28, K29,        K90, K80, K81, K82, K83, K84, K85, K86,   K87, K88, K89, \
    K44, K35, K36, K37, K38, K39,        KA0, K91, K92, K93, K94, K95,      K96, \
    K54,      K45, K46, K47, K48, K49,        KB0, KA1, KA2, KA3, KA4,      KA6,        KA8, \
    K55, K56, K57, K58,           K59,        KB1,           KB3, KB4, KB5, KB6,   KB7, KB8, KB9 \
) { \
    { XXX, XXX, XXX, XXX, K04, K05, K06, K07, K08, K09 }, \
    { XXX, XXX, XXX, XXX, K14, K15, K16, K17, K18, K19 }, \
    { XXX, XXX, XXX, XXX, K24, K25, K26, K27, K28, K29 }, \
    { XXX, XXX, XXX, XXX, K34, K35, K36, K37, K38, K39 }, \
    { XXX, XXX, XXX, XXX, K44, K45, K46, K47, K48, K49 }, \
    { XXX, XXX, XXX, XXX, K54, K55, K56, K57, K58, K59 }, \
    { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69 }, \
    { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79 }, \
    { K80, K81, K82, K83, K84, K85, K86, K87, K88, K89 }, \
    { K90, K91, K92, K93, K94, K95, K96, XXX, XXX, XXX }, \
    { KA0, KA1, KA2, KA3, KA4, XXX, KA6, XXX, KA8, XXX }, \
    { KB0, KB1, XXX, KB3, KB4, KB5, KB6, KB7, KB8, KB9 } \
}

@noroadsleft noroadsleft merged commit 59e1513 into qmk:master Nov 24, 2021
@noroadsleft noroadsleft deleted the revert/15210 branch November 24, 2021 05:36
@jurassic73
Copy link
Contributor

This is still incorrect in the QMK Configurator website tool when I compile firmware and install on my keyboard.

Can this please be rolled back two pull requests to my last pull request which was confirmed working?

@noroadsleft
Copy link
Member Author

This is still incorrect in the QMK Configurator website tool when I compile firmware and install on my keyboard.

Can this please be rolled back two pull requests to my last pull request which was confirmed working?

It'll have to wait until sometime during the weekend as QMK's master branch is currently frozen, pending the release of version 0.15 on Saturday.

tacahiroy pushed a commit to tacahiroy/qmk_firmware that referenced this pull request Nov 26, 2021
@jurassic73
Copy link
Contributor

This is working again for the QMK Configurator web interface to create a functional default firmware file. Thank you!

cadusk pushed a commit to cadusk/qmk_firmware that referenced this pull request Dec 2, 2021
* qmk/develop: (80 commits)
  Remove use of __flash due to LTO issues (qmk#15268)
  Revert "handwired/split89 Layout Macro Refactor (qmk#15210)" (qmk#15284)
  New Keyboard: TGR Jane CE (qmk#14713)
  Portal 66 Layout Macro Refactor (qmk#15255)
  Pluckey: Fix QMK Configurator Implementation (qmk#15254)
  [Tests] Increase QMK test coverage take 2 (qmk#15269)
  Ignore exit codes for formatters (qmk#15276)
  [Keyboard] Disable features on SplitKB boards to fit under size (qmk#15262)
  Ignore exit codes for formatters (qmk#15275)
  Ignore deleted files when formatting codebase (qmk#15274)
  qmk format-python - filter for Python files (qmk#15271)
  Revert "[Tests] Increase QMK test coverage (qmk#13789)"
  [Tests] Increase QMK test coverage (qmk#13789)
  [Docs] Squeezing space out of AVR (qmk#15243)
  Add uint to char functions (qmk#15244)
  [Keyboard] Disable console on Keebio foldkb and iris rev3 (qmk#15260)
  layer_combo → sd_combo (qmk#15266)
  [Keymap] Disable console on Sofle default keymap (qmk#15261)
  [Keyboard] Enable LTO on viktus/sp_mini via keymap (qmk#15263)
  Macros in JSON keymaps (qmk#14374)
  ...
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.

4 participants