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 compilation error for GH60 satan HHKB 7u layout #18250

Merged
merged 2 commits into from
Sep 5, 2022

Conversation

aming
Copy link
Contributor

@aming aming commented Sep 2, 2022

Fix compilation error for GH60 satan HHKB 7u layout

Description

The HHKB 7u layout for GH60 satan failed the compilation. It maybe caused by merging multiple GH60 layouts into the same directory.

  • Add the missing LAYOUT_60_hhkb layout
  • Remove #define ______ KC_TRNS in keymap.c and use the definition from upstream.

Tested by on GH60 satan keyboard and compilation result as follow:

❯ qmk compile -kb gh60/satan -km hhkb_7u
Ψ Compiling keymap with gmake --jobs=1 gh60/satan:hhkb_7u


QMK Firmware 0.6.49
⚠ gh60/satan: RGBLIGHT_ANIMATIONS in config.h is deprecated and will be removed at a later date
Making gh60/satan with keymap hhkb_7u

⚠ gh60/satan: RGBLIGHT_ANIMATIONS in config.h is deprecated and will be removed at a later date
avr-gcc (Homebrew AVR GCC 8.5.0) 8.5.0
Copyright (C) 2018 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Size before:
   text	   data	    bss	    dec	    hex	filename
      0	  26056	      0	  26056	   65c8	gh60_satan_hhkb_7u.hex

Compiling: quantum/keymap_introspection.c                                                           [OK]
Compiling: quantum/command.c                                                                        [OK]
Linking: .build/gh60_satan_hhkb_7u.elf                                                              [OK]
Creating load file for flashing: .build/gh60_satan_hhkb_7u.hex                                      [OK]
Copying gh60_satan_hhkb_7u.hex to qmk_firmware folder                                               [OK]
Checking file size of gh60_satan_hhkb_7u.hex                                                        [OK]
 * The firmware size is fine - 26056/28672 (90%, 2616 bytes free)

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

@aming aming marked this pull request as ready for review September 2, 2022 21:54
@spidey3 spidey3 requested a review from a team September 3, 2022 17:21
keyboards/gh60/satan/info.json Outdated Show resolved Hide resolved
Co-authored-by: Joel Challis <git@zvecr.com>
@aming aming requested a review from zvecr September 4, 2022 17:26
@zvecr zvecr merged commit a36c95d into qmk:master Sep 5, 2022
@aming aming deleted the gh60_satan_hhkb_fix branch September 6, 2022 02:22
csrazvan added a commit to csrazvan/qmk_firmware that referenced this pull request Sep 8, 2022
* upstream/master: (451 commits)
  Add Iris Rev. 6b (qmk#18307)
  GeonWorks Frog Mini Hotswap Layout Rework (qmk#18305)
  Update Iris VIA configuration (qmk#18306)
  [Keyboard] Wearhaus66 correct matrix (qmk#18284)
  enable RGB matrix effects for drop ctrl (qmk#18291)
  [Keymap] removed else in numlock led if statement (qmk#18304)
  added a new kprepublic/bm40hsrgb keymap called dan (qmk#18301)
  Delete my keymaps (qmk#18302)
  keymaps/stapelberg: keypad layer for multimedia keys, wake on escape (qmk#18295)
  Fungo rev1: fix QMK Configurator key sequence (qmk#18293)
  Discourage use of ENCODER_MAP at keyboard level (qmk#18286)
  Mars 6.5 Layout Additions (qmk#18282)
  Remove use of legacy keycode (qmk#18281)
  EU ISOlation: fix QMK Configurator key sequence (qmk#18272)
  Fix compilation error for GH60 satan HHKB 7u layout (qmk#18250)
  dyz60_hs Layout Additions (qmk#18261)
  Fix a couple of boards still using `usb.device_ver` (qmk#18258)
  Clean up data driven mappings syntax (qmk#18257)
  [Docs] Update 'Process Record' according to the code (qmk#18209)
  [Keyboard] RS60 Rev2 change to eeprom emulation (qmk#18201)
  ...
ramonimbao pushed a commit to ramonimbao/qmk_firmware that referenced this pull request Nov 28, 2022
* Fix compilation error for GH60 satan HHKB 7u layout

* Update keyboards/gh60/satan/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
* Fix compilation error for GH60 satan HHKB 7u layout

* Update keyboards/gh60/satan/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
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.

3 participants