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

Fix annepro2/c18:iso_default #19147

Merged
merged 2 commits into from
Nov 25, 2022
Merged

Fix annepro2/c18:iso_default #19147

merged 2 commits into from
Nov 25, 2022

Conversation

zvecr
Copy link
Member

@zvecr zvecr commented Nov 25, 2022 •
edited
Loading

Description

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

fauxpark
fauxpark reviewed Nov 25, 2022
View reviewed changes
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.

Actually, this is already fixed in develop as part of the move to info.json.

@zvecr
Copy link
Member Author

zvecr commented Nov 25, 2022 •
edited
Loading

Nah its still broken

Compiling: tmk_core/protocol/chibios/usb_driver.c                                                  Compiling: tmk_core/protocol/chibios/usb_util.c                                                     [OK]
 [OK]
Compiling: lib/chibios/os/oslib/src/chmboxes.c                                                     Compiling: lib/chibios/os/oslib/src/chmemcore.c                                                    In file included from tmk_core/protocol/usb_descriptor.c:42:
tmk_core/protocol/usb_descriptor_common.h:21:29: error: 'LAnne' undeclared here (not in a function)
   21 | #define USBSTR(s) USBCONCAT(L, s)
      |                             ^
tmk_core/protocol/usb_descriptor_common.h:20:25: note: in definition of macro 'USBCONCAT'
   20 | #define USBCONCAT(a, b) a##b

@fauxpark
Copy link
Member

Oops, didn't realise this was a keymap.

@zvecr
Copy link
Member Author

zvecr commented Nov 25, 2022

Alternatively we could just sack off the header, as to me the change doesnt add a ton of value (and would be incorrect for the c15 target).

@fauxpark
Copy link
Member

Sounds good to me.

@fauxpark fauxpark merged commit 6ed605a into master Nov 25, 2022
@fauxpark fauxpark deleted the zvecr-patch-1 branch November 25, 2022 04:29
ramonimbao pushed a commit to ramonimbao/qmk_firmware that referenced this pull request Nov 28, 2022
@zvecr @ramonimbao
Fix annepro2/c18:iso_default (qmk#19147)
a9f473d
elpekenin pushed a commit to elpekenin/qmk_firmware that referenced this pull request Dec 7, 2022
@zvecr @elpekenin
Fix annepro2/c18:iso_default (qmk#19147)
ff86eea
crembz pushed a commit to crembz/qmk_firmware that referenced this pull request Dec 18, 2022
@zvecr @crembz
Fix annepro2/c18:iso_default (qmk#19147)
193b257
@mnesarco mnesarco mentioned this pull request Jan 25, 2023
Closed
2 tasks
ohlin added a commit to ohlin/qmk_firmware that referenced this pull request May 25, 2023
@ohlin
Merge branch 'ko-kyria' of https://github.com/ohlin/qmk_firmware into…
3f8518a 
… ko-kyria

* 'ko-kyria' of https://github.com/ohlin/qmk_firmware: (603 commits)
  Fix Czech sendstring LUT (qmk#19193)
  fix typo (qmk#19189)
  new keyboard rb1 (qmk#18164)
  Fix RWIN typo within keycode list (qmk#19155)
  [Docs] Update reference_info_json.md (qmk#18817)
  Add piantor (qmk#18920)
  2022 Nov 26 changelog. (qmk#19164)
  Fix API errors in handwired/tractyl_manuform/5x6_right/arduinomicro (qmk#19166)
  Revert lib/usbhost changes (qmk#19165)
  Fix encoder_init call order in keyboard_init (qmk#19140)
  Change `RGB_MATRIX_STARTUP_*` defines to `RGB_MATRIX_DEFAULT_*` (qmk#19079)
  Fixup installation procedure for different Fedora versions. (qmk#19159)
  Joystick feature improvements (qmk#19052)
  Change `LED_MATRIX_STARTUP_*` defines to `LED_MATRIX_DEFAULT_*` (qmk#19080)
  Fix build failures for `bastardkb/tbk` and `jels/boaty` (qmk#19152)
  Fix annepro2/c18:iso_default (qmk#19147)
  jsonify some info.json (qmk#19146)
  Fixup aurora/corne on develop (qmk#19144)
  Additional DD backlight config (qmk#19124)
  [Keymap] komidore64 planck rev6 (qmk#19036)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark approved these changes

Assignees
No one assigned
Labels
bug keymap
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@zvecr @fauxpark