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

Update logo and commonize it #4151

Merged
merged 3 commits into from
Oct 19, 2018
Merged

Update logo and commonize it #4151

merged 3 commits into from
Oct 19, 2018

Conversation

foostan
Copy link
Contributor

@foostan foostan commented Oct 17, 2018

I created the corne logo.

corne-logo

So I updated the logo of OLED screen.

before

before

after

after

SWAP_HANDS_ENABLE = no # Enable one-hand typing
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
SWAP_HANDS_ENABLE = no # Enable one-hand typing
LOCAL_GLCDFONT = no # use each keymaps "glcdfont.c" insted of "keymaps/default/glcdfont.c"
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't do anything.

It's not being processed, basically.

You'd need something like this in the rules.mk here:

ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
    OPT_DEFS += -DLOCAL_GLCDFONT
endif

@drashna
Copy link
Member

drashna commented Oct 17, 2018

Actually, wouldn't it be better to move the glcdfont.c to the "lib" folder, and just add it to the "SRC" value of the rules.mk in the keymap folders?

@foostan
Copy link
Contributor Author

foostan commented Oct 17, 2018

It's sounds good.
But

  • move the glcdfont.c to the lib
  • add it to the SRC values of the rules.mk in the keymap folders

Compile error

Compiling: keyboards/crkbd/ssd1306.c                                                                [OK]
Compiling: keyboards/crkbd/lib/glcdfont.c                                                          keyboards/crkbd/lib/glcdfont.c:18:28: error: 'font' defined but not used [-Werror=unused-const-variable=]
 static const unsigned char font[] PROGMEM = {
                            ^~~~

Sorry I'm unfamiliar with C lang. Can you give me advice?

@drashna
Copy link
Member

drashna commented Oct 17, 2018

Oh, that's ... odd.

It's that it's being defined "but not used". Which is odd, as I compiled it on my system, and it works just fine.

But worst case, wrap it in #ifdef SSD1306OLED and #endif maybe.

@drashna
Copy link
Member

drashna commented Oct 19, 2018

Just to make sure, this is good to go now?

@foostan
Copy link
Contributor Author

foostan commented Oct 19, 2018

yes please 😄

@drashna drashna merged commit 78b4837 into qmk:master Oct 19, 2018
@drashna
Copy link
Member

drashna commented Oct 19, 2018

Done!
Thanks!

zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Oct 27, 2018
* Update logo and commonize it

* Move the glcdfont.c to the lib and add it to the SRC values of the rules.mk in the keymap folders

* Add static
rseymour pushed a commit to rseymour/qmk_firmware that referenced this pull request Mar 13, 2019
* Update logo and commonize it

* Move the glcdfont.c to the lib and add it to the SRC values of the rules.mk in the keymap folders

* Add static
yamad pushed a commit to yamad/qmk_firmware that referenced this pull request Apr 10, 2019
* Update logo and commonize it

* Move the glcdfont.c to the lib and add it to the SRC values of the rules.mk in the keymap folders

* Add static
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants