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

add folders and capsule65 #16613

Closed
wants to merge 18 commits into from
Closed

add folders and capsule65 #16613

wants to merge 18 commits into from

Conversation

EasonQian1
Copy link
Contributor

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

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Mar 11, 2022
fixed some bugs
@drashna drashna requested a review from a team March 13, 2022 07:17
EasonQian1 and others added 2 commits March 13, 2022 18:51
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
@EasonQian1
Copy link
Contributor Author

The change has been completed. Please review it. Thank you

Co-authored-by: Ryan <fauxpark@gmail.com>
@EasonQian1 EasonQian1 requested review from fauxpark and drashna March 14, 2022 06:33
@drashna drashna requested a review from a team March 15, 2022 10:00
@EasonQian1
Copy link
Contributor Author

Two checks have passed, and merge is requested.

@EasonQian1 EasonQian1 requested review from drashna and removed request for a team March 15, 2022 16:10
@EasonQian1 EasonQian1 requested a review from drashna March 16, 2022 00:45
@drashna drashna requested a review from a team March 16, 2022 00:49
@EasonQian1 EasonQian1 requested a review from zvecr March 16, 2022 16:50
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

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

$ make eason/capsule65:default
QMK Firmware 0.16.5
☒ eason/capsule65: Number of keys for LAYOUT does not match! info.json specifies 80 keys, C macro specifies 69
Making eason/capsule65 with keymap default

☒ eason/capsule65: Number of keys for LAYOUT does not match! info.json specifies 80 keys, C macro specifies 69
avr-gcc (GCC) 11.2.0
Copyright (C) 2021 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.

☒ eason/capsule65: Number of keys for LAYOUT does not match! info.json specifies 80 keys, C macro specifies 69
☒ eason/capsule65: Number of keys for LAYOUT does not match! info.json specifies 80 keys, C macro specifies 69
☒ eason/capsule65: Number of keys for LAYOUT does not match! info.json specifies 80 keys, C macro specifies 69
Compiling: keyboards/eason/capsule65/capsule65.c                                                   Compiling: keyboards/eason/capsule65/keymaps/default/keymap.c                                      Compiling: quantum/quantum.c                                                                       Compiling: quantum/send_string.c                                                                   Compiling: quantum/led.c                                                                           Compiling: quantum/action.c                                                                        Compiling: quantum/action_layer.c                                                                  Compiling: quantum/bitwise.c                                                                       keyboards/eason/capsule65/keymaps/default/keymap.c:28:3: error: macro "LAYOUT" passed 80 arguments, but takes just 69
   28 |   ),
      |   ^
In file included from keyboards/eason/capsule65/keymaps/default/keymap.c:17:
keyboards/eason/capsule65/capsule65.h:36: note: macro "LAYOUT" defined here
   36 | #define LAYOUT( \
      | 
keyboards/eason/capsule65/keymaps/default/keymap.c:21:9: error: 'LAYOUT' undeclared here (not in a function)
   21 |   [0] = LAYOUT(
      |         ^~~~~~
keyboards/eason/capsule65/keymaps/default/keymap.c:37:3: error: macro "LAYOUT" passed 80 arguments, but takes just 69
   37 |   ),
      |   ^
In file included from keyboards/eason/capsule65/keymaps/default/keymap.c:17:
keyboards/eason/capsule65/capsule65.h:36: note: macro "LAYOUT" defined here
   36 | #define LAYOUT( \
      | 
 [ERRORS]
 [OK]
 [OK]
 | 
 | 
 | 
make[1]: *** [builddefs/common_rules.mk:452: .build/obj_eason_capsule65_default/keyboards/eason/capsule65/keymaps/default/keymap.o] Error 1
make[1]: *** Waiting for unfinished jobs....
 [OK]
Compiling: quantum/action_tapping.c                                                                Compiling: quantum/action_util.c                                                                    [OK]
 [OK]
 [OK]
 [OK]
 [OK]
 [OK]
Make finished with errors
make: *** [Makefile:413: eason/capsule65:default] Error 1

Also line endings of keyboards/eason/capsule65/config.h and keyboards/eason/capsule65/info.json are bad.

@EasonQian1 EasonQian1 requested a review from zvecr March 17, 2022 04:05
@EasonQian1
Copy link
Contributor Author

$ make eason/capsule65:default
QMK Firmware 0.16.5
☒ eason/capsule65: Number of keys for LAYOUT does not match! info.json specifies 80 keys, C macro specifies 69
Making eason/capsule65 with keymap default

☒ eason/capsule65: Number of keys for LAYOUT does not match! info.json specifies 80 keys, C macro specifies 69
avr-gcc (GCC) 11.2.0
Copyright (C) 2021 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.

☒ eason/capsule65: Number of keys for LAYOUT does not match! info.json specifies 80 keys, C macro specifies 69
☒ eason/capsule65: Number of keys for LAYOUT does not match! info.json specifies 80 keys, C macro specifies 69
☒ eason/capsule65: Number of keys for LAYOUT does not match! info.json specifies 80 keys, C macro specifies 69
Compiling: keyboards/eason/capsule65/capsule65.c                                                   Compiling: keyboards/eason/capsule65/keymaps/default/keymap.c                                      Compiling: quantum/quantum.c                                                                       Compiling: quantum/send_string.c                                                                   Compiling: quantum/led.c                                                                           Compiling: quantum/action.c                                                                        Compiling: quantum/action_layer.c                                                                  Compiling: quantum/bitwise.c                                                                       keyboards/eason/capsule65/keymaps/default/keymap.c:28:3: error: macro "LAYOUT" passed 80 arguments, but takes just 69
   28 |   ),
      |   ^
In file included from keyboards/eason/capsule65/keymaps/default/keymap.c:17:
keyboards/eason/capsule65/capsule65.h:36: note: macro "LAYOUT" defined here
   36 | #define LAYOUT( \
      | 
keyboards/eason/capsule65/keymaps/default/keymap.c:21:9: error: 'LAYOUT' undeclared here (not in a function)
   21 |   [0] = LAYOUT(
      |         ^~~~~~
keyboards/eason/capsule65/keymaps/default/keymap.c:37:3: error: macro "LAYOUT" passed 80 arguments, but takes just 69
   37 |   ),
      |   ^
In file included from keyboards/eason/capsule65/keymaps/default/keymap.c:17:
keyboards/eason/capsule65/capsule65.h:36: note: macro "LAYOUT" defined here
   36 | #define LAYOUT( \
      | 
 [ERRORS]
 [OK]
 [OK]
 | 
 | 
 | 
make[1]: *** [builddefs/common_rules.mk:452: .build/obj_eason_capsule65_default/keyboards/eason/capsule65/keymaps/default/keymap.o] Error 1
make[1]: *** Waiting for unfinished jobs....
 [OK]
Compiling: quantum/action_tapping.c                                                                Compiling: quantum/action_util.c                                                                    [OK]
 [OK]
 [OK]
 [OK]
 [OK]
 [OK]
Make finished with errors
make: *** [Makefile:413: eason/capsule65:default] Error 1

keyboards/eason/capsule65/config.h和的行尾keyboards/eason/capsule65/info.json也不好。

The change has been completed. Please review it. Thank you

@EasonQian1 EasonQian1 requested review from drashna and fauxpark March 18, 2022 10:49
@EasonQian1 EasonQian1 closed this Mar 19, 2022
@drashna drashna mentioned this pull request Mar 19, 2022
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants