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.

Sign up for GitHub

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

Jump to bottom

Add unison v04 keyboard #11982

Merged
merged 138 commits into from
Mar 25, 2021
Merged

Add unison v04 keyboard #11982

Changes from 1 commit
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
5eac035
Update: JonesのMIDIキーマップをベースに初期作成。AudioとMIDIの同時使用はファームウェアサイズ的に厳しい。
Dec 31, 2020
c7bd188
Update: Unison用のIDへ変更
Jan 4, 2021
70b17d3
Update: Audioはデフォとせず、OLEDをデフォとした。
Jan 4, 2021
6dd87c6
Update: v03基板から実際に動くものとなったため、v01からv03に変更。基本的な設定を完了。
Jan 19, 2021
dc41e1d
Update: 基本的なキーマップを作成
Jan 24, 2021
8a7b137
Update: キーマップ、ロータリーエンコーダの感度を調整。
Jan 24, 2021
0050f53
TEST: BOOTMAGIC = lite　でどうなるのかテスト
Jan 24, 2021
2c1d7d4
Update: Jones ---> Unison
Jan 24, 2021
b6321b3
TEST: BOOTMAGIC = lite で、TABキーでBootloaerに入る設定
Jan 24, 2021
d41e679
Update: インデント
Jan 25, 2021
fffccfc
Update: QMKの一般的な表記に合わせ、 k(col)(row) から k(row)(col) へ変更。
Jan 25, 2021
f7d92a4
Update: 自前のカスタムマトリクスを使用せず、COL2ROW方式で総当たりマトリクスを動作させるテストを開始。
Jan 25, 2021
0c0d05a
TEST: BOOTMAGICテスト用コード追加
Jan 25, 2021
b402e72
Update: 主に中央部分のキーマップ変更
Jan 25, 2021
87b4763
Merge commit '3f6de1ef546f5c8e355ce111f3602ca70bb60fc0' into develop_…
Jan 26, 2021
4b33333
TEST: COL2ROWで、COLのピンの順番を変えてキーを読むテスト
Jan 26, 2021
c78cf9e
Update: QMKの仕様上、MacではKC_PSCRがFキーとして判定されるため、スクリーンショット用マクロを用意した。
Jan 26, 2021
29d6ab8
TEST: COL2ROWで、ROWとCOLのピン定義をずらした状態で、BOOTMAGIC = lite の（0,0)キーに引っかからない。
Jan 26, 2021
4b19e87
Update: ロータリーエンコーダにマウスホイールを割り当て
Feb 1, 2021
7af803b
Update: 自明のコメントを削除
Feb 1, 2021
d8a7efa
Update: NKRO指定時は、NKRO動作を強制。
Feb 1, 2021
eb53b16
Update: MIDIなしのとき、AUDIOのフル機能がファームウェアサイズ内に収まることをチェック。
Feb 1, 2021
4582ba5
Update: Bootmagicテスト完了のため、無効化。
Feb 1, 2021
fa97e75
TEST: LED動作チェック。
Feb 1, 2021
69def4b
Merge branch 'master' into develop_Unison
Feb 1, 2021
a0c7084
Update: キーマップを、LOWER, RAISEを中心に大幅変更。
Feb 1, 2021
9c2cfad
Update: 未使用のNumレイヤとTapDanceを削除。
Feb 1, 2021
ce3269d
Update: MIDI関連の設定を多数追加。
Feb 1, 2021
12779be
Merge branch 'master' of https://github.com/qmk/qmk_firmware into dev…
Feb 1, 2021
cc39bb6
New: Add Sequencer keymap
Feb 7, 2021
a6f9629
enumの開始を明記
Feb 7, 2021
6a9a25f
TAP_DANCEを無効化
Feb 7, 2021
835d3e6
シーケンサーで、トラック単位の有効・無効の切り替えを追加。※動作せず
Feb 7, 2021
ee12644
デバッグ用設定をテスト
Feb 7, 2021
fa8892d
Merge commit '99bffc2a21ebed07fd767ad2a9a7e1aadd491ef3' into develop_…
Feb 8, 2021
4c5a44b
Change custom keycode name for classification.
Feb 8, 2021
83530a8
Add LED update on sequencer step.
Feb 8, 2021
d2309b3
change LED adjusting value.
Feb 8, 2021
6b2744e
TEST: SQ_T related things.
Feb 8, 2021
7c5feac
DEBUG
Feb 8, 2021
ca6e142
Increase track 6 ---> 8. Add track indicator.
Feb 9, 2021
9200fad
Add sequencer step viewer.
Feb 9, 2021
f2a2875
Move Bootmagic lite position to keyboard's config.
Feb 9, 2021
d484037
Revert matrix as phisically connected.
Feb 9, 2021
c4f8812
Change default RGB lighting animation.
Feb 9, 2021
bc894c5
Remove MIDI options from keyboard's config.
Feb 9, 2021
0454afc
change version
Feb 9, 2021
b2a6c0f
Remove unused.
Feb 9, 2021
f9435e9
Delete unused. Round-Robin matrix woks with COL2ROW.
Feb 9, 2021
af8c958
Delete unused. Round-Robin matrix woks with COL2ROW.
Feb 9, 2021
d93fbcf
Formatting.
Feb 9, 2021
afd7770
Formatting.
Feb 9, 2021
359774b
Remove unused.
Feb 9, 2021
7474270
No enum.
Feb 9, 2021
9d7c988
LED setting for Sequencer layer.
Feb 9, 2021
a836d1f
Add TODO flag
Feb 12, 2021
3359190
Remove unused.
Feb 12, 2021
408b339
change LCTL
Feb 12, 2021
2ee533e
Update Rotary Encoder setting.
Feb 12, 2021
d87774c
revert to default
Feb 12, 2021
073e935
Add TODO flag.
Feb 12, 2021
79929f8
Update to latest information.
Feb 12, 2021
2415a49
Update to latest information.
Feb 12, 2021
314278c
Add v04
Feb 12, 2021
c72295d
Move keymaps directory to just under keyboard directory.
Feb 12, 2021
6799846
Add music layout.
Feb 12, 2021
4cb5864
Update to Unison layout.
Feb 12, 2021
272f299
Add default keymap.
Feb 12, 2021
09d9184
Update readme description.
Feb 12, 2021
5c37285
Merge commit '627ceebef3ed19eceba3642a830ffbf44f4a9e04' into develop_…
Feb 12, 2021
c7e287c
Commenting.
Feb 12, 2021
d45b84c
Exclude non-PR files.
Feb 12, 2021
73c63b6
Change keymap name more general.
Feb 12, 2021
b87d49c
Remove unused
Feb 12, 2021
d056990
Commenting.
Feb 12, 2021
2fe56be
Remove unused.
Feb 12, 2021
5994d19
Commenting.
Feb 12, 2021
abb7941
Change Macro name for consistency.
Feb 12, 2021
1d1dd42
Add tempo definition.
Feb 12, 2021
1a853e7
Change transparent to noop for better musical play.
Feb 12, 2021
2c867a6
Add Rotary Encoder push functions for Sequencer.
Feb 12, 2021
a5220bf
FIX printscreen to work _WIN layer.
Feb 12, 2021
0d8c83d
Fix style name.
Feb 13, 2021
1b4e228
Change keymap style from PC to Music.
Feb 13, 2021
3b9cd5f
Adjust LED number and index to v04 PCB.
Feb 13, 2021
d3ad302
Commenting.
Feb 13, 2021
062e9cc
Add #ifdef block to LED config related.
Feb 13, 2021
27d2705
Change Sequencer display function from Rotary Encoder right-3 to righ…
Feb 13, 2021
f0a8b7c
Change default animations.
Feb 13, 2021
70cb3c7
Set LED effect range. Add LED reset on layer change.
Feb 13, 2021
224ed3d
Remove unused.
Feb 13, 2021
87cc905
Commenting.
Feb 14, 2021
684a21f
Commenting.
Feb 14, 2021
56822fe
Use function to change Sequencer track indicator.
Feb 14, 2021
615e10e
Use function to change Sequencer track indicator.
Feb 14, 2021
5840854
Remove unused
Feb 14, 2021
bdc7a0c
Add PC-style keymap.
Feb 14, 2021
9f3b996
Adjust keymap.
Feb 14, 2021
94cfca5
Add micro volume control for Mac.
Feb 14, 2021
74e91b2
Adjust keymap.
Feb 16, 2021
4304846
Merge commit '9ee12820197f38f6618b78f92481f3ffd2d8b7e5' into develop_…
Feb 16, 2021
9fbdb8d
Adjust cursor block.
Feb 16, 2021
94305e7
Adjust grave and tild in layer.
Feb 16, 2021
7f3a860
Change magic-key position to Left-Bottom where both Music-style and T…
Feb 18, 2021
fbef572
Change LED settings for front-side 9 LEDs.
Feb 19, 2021
2200770
Change keymap name.
Feb 19, 2021
4dc272f
Update supported functions.
Feb 19, 2021
e717bd3
Adjust indicator dimmer.
Feb 20, 2021
5b6929a
Remove unused.
Feb 20, 2021
5374104
Add underglow support.
Feb 20, 2021
dd2fbf6
Add rotary encoder keymap at Adjust layer for test hardware function.
Feb 20, 2021
c4138e2
Disable rotary encoders.
Feb 20, 2021
db83edb
Change description.
Feb 20, 2021
6391d2a
Add support for underglow.
Feb 20, 2021
9ead448
Commenting.
Feb 21, 2021
8b857bd
Formatting.
Feb 21, 2021
69634b1
Turn on default layer indicator.
Feb 21, 2021
8017df4
remove duplication
Feb 21, 2021
2a9a612
Change VID for via.
Feb 21, 2021
fc2ae6e
Initial commit for VIA.
Feb 21, 2021
642124e
Add layout option.
Feb 21, 2021
4397bbf
restore AUDIO enabled.
Feb 21, 2021
fce2e8d
Removed a JSON file for VIA app, not for QMK.
Feb 22, 2021
75288e4
Remove non-related files for PR.
Feb 22, 2021
f6ea00c
Add keymap for music layout.
Feb 22, 2021
67112c8
Add photo links.
Feb 22, 2021
5b68058
Commenting.
Feb 22, 2021
2306a1d
Apply PR checklist.
Feb 22, 2021
be9863c
Change unused function to "no".
Feb 22, 2021
e011636
Add keymap image and change keymap as image shows.
Feb 22, 2021
9c94f7d
Change bootloader entering key to widely known "Left-Top".
Feb 23, 2021
31e12a5
Turn off ENCODER by default.
Feb 23, 2021
f2ed507
Add VIA keymap.
Feb 23, 2021
651b8b6
Change VID unique.
Feb 24, 2021
f384536
Add config option to prepare future release, #11820.
Feb 25, 2021
caf6d04
Remove old defines for Audio.
Feb 28, 2021
fe3a843
Merge commit 'deaabff752dd75e75fc865091a5925bf7a5f3b19' into Add_unis…
Feb 28, 2021
acbb191
Merge commit 'e4d3ff2374142fe6431b68874f6604a471732fae' into Add_unis…
Feb 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge commit '99bffc2a21ebed07fd767ad2a9a7e1aadd491ef3' into develop_… 
…Unison
  • Loading branch information
Takeshi Nishio committed Feb 8, 2021
commit fa8892dc36815a9557ab0561bd6ca5866e539b7c

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.