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

[WIP] Helix keyboard OLED, RGBLIGHT enable/disable control integrate into rules.mk #6

Merged
merged 5 commits into from
Mar 25, 2018

Conversation

mtei
Copy link

@mtei mtei commented Mar 18, 2018

相談しながら詰めていきたいので、また、[WIP] 付けてます。

以下のように、OLED の有る無し、LED をバックライトで使うか UnderGlow で使うか、
(プログラムサイズ削減のため)LEDアニメーションを使うか使わないかを、rules.mk の
4行を編集するだけ指定できるようにする改造です。

一通りの組み合わせで、コンパイル結果のバイナリファイルのサイズが変化しないことは確認済みです。

rules.mk: add 4 Variables for compile control.

   # Helix keyboard customize
   # you can edit follows 4 Variables
   #  jp: 以下の4つの変数を必要に応じて編集します。
   OLED_ENABLE = no            # OLED_ENABLE
   LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
   LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
   LED_ANIMATIONS = yes        # LED animations

config.h: auto set RGBLED_NUM by HELIX_ROWS and rules.mk's define

この方法、いかがでしょうか?
自分のキーマップでだけこれを実現すれば、私個人はそれでも良いのですが、せっかくなので default でも同じ改造しておけば、初めての人も多少はわかりやすくなるかなと思います。

…ules.mk

rules.mk: add 4 Variables for compile control.

   # Helix keyboard customize
   # you can edit follows 4 Variables
   #  jp: 以下の4つの変数を必要に応じて編集します。
   OLED_ENABLE = no            # OLED_ENABLE
   LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
   LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
   LED_ANIMATIONS = yes        # LED animations

config.h: auto set RGBLED_NUM by HELIX_ROWS and rules.mk's define
@MakotoKurauchi
Copy link
Owner

良さそうです!
ここまで来るとHELIX_ROWSもやりたくなってきますが如何でしょうか?

@mtei
Copy link
Author

mtei commented Mar 19, 2018

Row もやりたかったんです、、、
やってみます。お待ちを

@mtei
Copy link
Author

mtei commented Mar 19, 2018

HELIX_ROWS も rules.mk に収容しました。
コンパイルしてサイズが変化することだけは確認してあります。動作するかは未確認です。
それと、最低限の readme.md も書きました。

@MakotoKurauchi
Copy link
Owner

ありがとうございます。

$ make HELIX_ROWS=4 helix:default

で動作を確認できました。

それと追加して頂いた readme.md ですが、qmkにコミットする分は基本英語でと考えています。
日本語を使うなら readme_jp.md 等とするように考えていますが如何でしょうか?

@mtei
Copy link
Author

mtei commented Mar 20, 2018

そうですね、rename しました。

@mtei
Copy link
Author

mtei commented Mar 21, 2018

planck や let's split のキーマップの readme.md をのぞいてみたら結構 簡素だったので、試しに readme.md も作ってみました。

@MakotoKurauchi MakotoKurauchi merged commit b15303c into MakotoKurauchi:master Mar 25, 2018
@MakotoKurauchi
Copy link
Owner

ありがとうございました!

@mtei mtei deleted the helix-oled-rgb-compile-sw branch March 25, 2018 09:21
MakotoKurauchi pushed a commit that referenced this pull request Feb 26, 2019
* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes #1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes #5) (#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Experimental LED support (untested)

* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes #1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes #5) (#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Added documentation

* Renamed feature to velocikey

* Reverted readme to original state

* Correct the readme title

* Updated feature name in the docs

* Update EECONFIG name

* Add compile-time toggles for velocikey

* Update feature documentation

* Revert "Merge branch 'led-support' into master"

This reverts commit e123ff5, reversing
changes made to df111a5.

* Move velocikey EECONFIG definition to depend on VELOCIKEY_ENABLE

* Rename decay_task function to decelerate

* Apply suggestions from code review

Co-Authored-By: chrislewisdev <chris@chrislewisdev.com>

* Re-order eeconfig definitions

* Apply coding conventions

* Apply #ifdef check in lufa.c

* Refactored interval time checks into one functionc

* Small rename

* Fix unused function error for layouts not using all rgb effects

* Only update EEPROM if Velocikey is enabled

* Incorporate code review feedback

* Small adjustment to top-end decay rate

* Add Velocikey documentation to table of contents

* Bring tetris:default keymap size down by disabling audio
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants