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

GMMK2: Fix 'ISO' within product name #18322

Merged
merged 1 commit into from
Sep 10, 2022
Merged

Conversation

zvecr
Copy link
Member

@zvecr zvecr commented Sep 9, 2022

Description

p65/iso / p96/iso currently produce:

$ lsusb
Bus 001 Device 115: ID 320f:504a Glorious GMMK V2 65 (( ISO_TypeDef *) ((((uint32_t)0x40000000UL) + 0x10000) + 0x6000))

Same garbage displays on windows.

This is due to the macro,

$ rg ISO_TypeDef
lib/chibios-contrib/os/common/ext/CMSIS/WB32/WB32F3G71xx/wb32f3g71xx.h
407:} ISO_TypeDef;
1074:#define ISO                       ((        ISO_TypeDef *)          ISO_BASE)

and PRODUCT code gen spitting out non quoted strings.

NOTES

  • super short term bodge while a better fix can target develop
  • alternative could be to just lower case the iso part?

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

@zvecr zvecr added the bug label Sep 9, 2022
@github-actions github-actions bot added the core label Sep 9, 2022
@zvecr zvecr requested review from a team and fauxpark September 9, 2022 22:28
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.

Should be immediately removed in develop.

@zvecr zvecr merged commit 16c2b52 into qmk:master Sep 10, 2022
tacahiroy pushed a commit to tacahiroy/qmk_firmware that referenced this pull request Oct 2, 2022
SjB added a commit to SjB/qmk_firmware that referenced this pull request Oct 12, 2022
* upstream/master: (319 commits)
  Fix handwired/swiftrax/bumblebee layout macro (qmk#18377)
  [Keyboard] Add pi40 (qmk#18207)
  [Keyboard] Removal of deprecated defines in IDOBAO keyboards (qmk#18358)
  Fix problem that Chidori is not recognized by host computer. (qmk#17882)
  [Keyboard] Add a new keyboard 'plum47' (qmk#18359)
  [Docs] RESET -> QK_BOOT (qmk#18365)
  Remove `RESET` keycodes from fjlabs keyboards (qmk#18364)
  [Keyboard] Add Vector PCB (qmk#17380)
  [Keyboard] Add Calice (qmk#17929)
  GeonWorks Frog Mini Soldered Layout Rework (qmk#18308)
  [Keyboard] Add skmt/15k keyboard (qmk#18321)
  [Keyboard] Replace Nayeon ATmega32u4 config with RP2040 (qmk#18265)
  Bump anothrNick/github-tag-action from 1.42.0 to 1.45.0 (qmk#18355)
  fix: Remove TERM_ON/TERM_OFF from my keymap (qmk#18354)
  Bump anothrNick/github-tag-action from 1.39.0 to 1.42.0 (qmk#18344)
  Fix keyboard_name for Unicomp Classic/Ultra Classic keyboards (qmk#18327)
  Add EM.8 keyboard  (qmk#18328)
  fixed missing x coordinate on spacebar (qmk#18330)
  GMMK2: Fix 'ISO' within product name (qmk#18322)
  Added gmmk v2 p65 keyboard. (qmk#18185)
  ...
ramonimbao pushed a commit to ramonimbao/qmk_firmware that referenced this pull request Nov 28, 2022
nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
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