Qmk doctor os check to support newer msys2/w10 installations (#8031 )

* Fixed OS detection on newer MSYS installations * made OS sting lower case
[Keyboard] 1up60hse VIA Support (#7992 )
2020-01-28 22:21:00 +01:00 · 2020-01-28 13:04:50 -08:00 · 2020-01-29 07:38:27 +11:00 · 2020-01-28 09:08:39 -08:00 · 2020-01-28 23:45:42 +11:00 · 2020-01-27 17:47:36 -08:00
104 changed files with 2038 additions and 870 deletions
--- a/common_features.mk
+++ b/common_features.mk
@@ -471,8 +471,10 @@ ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
        QUANTUM_SRC += $(QUANTUM_DIR)/split_common/transport.c
        # Functions added via QUANTUM_LIB_SRC are only included in the final binary if they're called.
        # Unused functions are pruned away, which is why we can add multiple drivers here without bloat.
-        QUANTUM_LIB_SRC += i2c_master.c \
-                           i2c_slave.c
+        ifeq ($(PLATFORM),AVR)
+            QUANTUM_LIB_SRC += i2c_master.c \
+                               i2c_slave.c
+        endif

        SERIAL_DRIVER ?= bitbang
        ifeq ($(strip $(SERIAL_DRIVER)), bitbang)
--- a/docs/ja/_summary.md
+++ b/docs/ja/_summary.md
@@ -10,32 +10,34 @@
   * [学習リソース](ja/newbs_learn_more_resources.md)

 * [QMKの基本](ja/README.md)
-   * [QMKの導入](ja/getting_started_introduction.md)
+   * [QMK の導入](ja/getting_started_introduction.md)
   * [QMK CLI](ja/cli.md)
   * [QMK CLI 設定](ja/cli_configuration.md)
-   * [QMKへの貢献](ja/contributing.md)
-   * [Githubの使い方](ja/getting_started_github.md)
+   * [QMK への貢献](ja/contributing.md)
+   * [Github の使い方](ja/getting_started_github.md)
   * [ヘルプ](ja/getting_started_getting_help.md)

 * [破壊的な変更](ja/breaking_changes.md)
+   * [プルリクエストにフラグが付けられた](ja/breaking_changes_instructions.md)
   * [2019年8月30日](ja/ChangeLog/20190830.md)

 * [FAQ](ja/faq.md)
-   * [一般的なFAQ](ja/faq_general.md)
-   * [QMKのビルド/コンパイル](ja/faq_build.md)
-   * [QMKのデバッグ/トラブルシューティング](ja/faq_debug.md)
+   * [一般的な FAQ](ja/faq_general.md)
+   * [QMK のビルド/コンパイル](ja/faq_build.md)
+   * [QMK のデバッグ/トラブルシューティング](ja/faq_debug.md)
   * [キーマップ](ja/faq_keymap.md)
-   * [Zadigを使ったドライバのインストール](ja/driver_installation_zadig.md)
+   * [Zadig を使ったドライバのインストール](ja/driver_installation_zadig.md)

 * 詳細なガイド
   * [ビルドツールのインストール](ja/getting_started_build_tools.md)
-   * [Vagrantのガイド](ja/getting_started_vagrant.md)
+   * [Vagrant のガイド](ja/getting_started_vagrant.md)
   * [ビルド/コンパイルの説明](ja/getting_started_make_guide.md)
   * [ファームウェアのフラッシュ](ja/flashing.md)
   * [機能のカスタマイズ](ja/custom_quantum_functions.md)
   * [キーマップの概要](ja/keymap.md)

 * [ハードウェア](ja/hardware.md)
+   * [互換性のあるマイクロコントローラ](ja/compatible_microcontrollers.md)
   * [AVR プロセッサ](ja/hardware_avr.md)
   * [ドライバ](ja/hardware_drivers.md)

@@ -66,7 +68,7 @@
   * [ブートマジック](ja/feature_bootmagic.md)
   * [コンボ](ja/feature_combo.md)
   * [コマンド](ja/feature_command.md)
-   * [Debounce API](ja/feature_debounce_type.md)
+   * [デバウンス API](ja/feature_debounce_type.md)
   * [DIP スイッチ](ja/feature_dip_switch.md)
   * [動的マクロ](ja/feature_dynamic_macros.md)
   * [エンコーダ](ja/feature_encoders.md)
@@ -90,27 +92,31 @@
   * [Stenography](ja/feature_stenography.md)
   * [Swap Hands](ja/feature_swap_hands.md)
   * [タップ ダンス](ja/feature_tap_dance.md)
-   * [Terminal](ja/feature_terminal.md)
+   * [ターミナル](ja/feature_terminal.md)
   * [感熱式プリンタ](ja/feature_thermal_printer.md)
   * [ユニコード](ja/feature_unicode.md)
-   * [Userspace](ja/feature_userspace.md)
+   * [ユーザスペース](ja/feature_userspace.md)
   * [Velocikey](ja/feature_velocikey.md)

 * メーカーおよびモッダーのために
-   * [Hand Wiring Guide](ja/hand_wire.md)
-   * [ISP Flashing Guide](ja/isp_flashing_guide.md)
+   * [Hand Wiring ガイド](ja/hand_wire.md)
+   * [ISP 書き込みガイド](ja/isp_flashing_guide.md)
   * [ARM デバッグ ガイド](ja/arm_debugging.md)
+   * [ADC ドライバ](ja/adc_driver.md)
   * [I2C ドライバ](ja/i2c_driver.md)
+   * [WS2812 ドライバ](ja/ws2812_driver.md)
+   * [EEPROM ドライバ](ja/eeprom_driver.md)
   * [GPIO コントロール](ja/internals_gpio_control.md)
+   * [カスタムマトリックス](ja/custom_matrix.md)
   * [Proton C 規約](ja/proton_c_conversion.md)

 * より深く知るために
   * [キーボードがどのように動作するか](ja/how_keyboards_work.md)
-   * [QMKの理解](ja/understanding_qmk.md)
+   * [QMK の理解](ja/understanding_qmk.md)

 * 他の話題
-   * [EclipseでQMKを使用](ja/other_eclipse.md)
-   * [VSCodeでQMKを使用](ja/other_vscode.md)
+   * [Eclipse で QMK を使用](ja/other_eclipse.md)
+   * [VSCode で QMK を使用](ja/other_vscode.md)
   * [サポート](ja/support.md)
   * [翻訳を追加する方法](ja/translating.md)

--- a/docs/ja/arm_debugging.md
+++ b/docs/ja/arm_debugging.md
@@ -64,13 +64,13 @@ Eclipse に QMK をビルドしようとするデバイスを教える必要が

 ## ビルド

-全て正しくセットアップできていれば、ハンマーボタンを押すとファームウェアがビルドされ、.binファイルが出力されるはずです。
+全て正しくセットアップできていれば、ハンマーボタンを押すとファームウェアがビルドされ、.bin ファイルが出力されるはずです。

 ## デバッグ

 ### デバッガの接続

-ARM MCU は、クロック信号(SWCLK) とデータ信号(SWDIO) で構成される Single Wire Debug (SWD) プロトコルを使います。MCUを 完全に操作するには、この2本のワイヤとグラウンドを接続するだけで十分です。ここでは、キーボードは USB を介して電力が供給されると想定しています。手動でリセットボタンを使えるため、RESET 信号は必要ありません。より高度なセットアップのために printf と scanf をホストに非同期にパイプする SWO 信号を使用できますが、私たちのセットアップでは無視します。
+ARM MCU は、クロック信号(SWCLK) とデータ信号(SWDIO) で構成される Single Wire Debug (SWD) プロトコルを使います。MCU を 完全に操作するには、この2本のワイヤとグラウンドを接続するだけで十分です。ここでは、キーボードは USB を介して電力が供給されると想定しています。手動でリセットボタンを使えるため、RESET 信号は必要ありません。より高度なセットアップのために printf と scanf をホストに非同期にパイプする SWO 信号を使用できますが、私たちのセットアップでは無視します。

 注意: SWCLK と SWDIO ピンがキーボードのマトリックスで使われていないことを確認してください。もし使われている場合は、一時的に他のピンに切り替えることができます。

--- a/docs/ja/config_options.md
+++ b/docs/ja/config_options.md
@@ -1,8 +1,8 @@
 # QMK の設定

 <!---
-  original document: 0f43c2652:docs/config_options.md
-  git diff 0f43c2652 HEAD -- docs/config_options.md | cat
+  original document: 9ff61601e:docs/config_options.md
+  git diff 9ff61601e HEAD -- docs/config_options.md | cat
 -->

 QMK はほぼ無制限に設定可能です。可能なところはいかなるところでも、やりすぎな程、ユーザーがコードサイズを犠牲にしてでも彼らのキーボードをカスタマイズをすることを許しています。ただし、このレベルの柔軟性により設定が困難になります。
@@ -154,6 +154,8 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
   * タップされた直後に、デュアルロールキーを修飾子として使用できるようにします
   * [Hold after tap](ja/feature_advanced_keycodes.md#tapping-force-hold)を見てください
   * タップトグル機能を無効にします (`TT` あるいは One Shot Tap Toggle)
+* `#define TAPPING_FORCE_HOLD_PER_KEY`
+   * キーごとの `TAPPING_FORCE_HOLD` 設定処理を有効にします。
 * `#define LEADER_TIMEOUT 300`
   * リーダーキーがタイムアウトするまでの時間
      * タイムアウトする前にシーケンスを終了できない場合は、タイムアウトの設定を増やす必要があるかもしれません。あるいは、`LEADER_PER_KEY_TIMING` オプションを有効にすると良いでしょう。これは各キーがタップされた後でタイムアウトを再設定します。
@@ -187,7 +189,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
 * `#define RGBLIGHT_SPLIT`
   * 分割キーボードの左半分の RGB LED の出力を右半分の RGB LED の入力につなげるかわりに、それぞれの側で個別にコントローラの出力ピンが直接 RGB LED の入力に繋がっているときは、この定義が必要です。
 * `#define RGBLED_SPLIT { 6, 6 }`
-   * 分割キーボードの各半分の `RGB_DI_PIN` に直接配線されている接続されているLEDの数
+   * 分割キーボードの各半分の `RGB_DI_PIN` に直接配線されている接続されている LED の数
   * 最初の値は左半分の LED の数を示し、2番目の値は右半分です。
   * RGBLED_SPLIT が定義されている場合、RGBLIGHT_SPLIT は暗黙的に定義されます。
 * `#define RGBLIGHT_HUE_STEP 12`
@@ -216,7 +218,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。

 ### 左右の設定

-一つ覚えておかなければならないことは、USB ポートが接続されている側が常にマスター側であるということです。USB に接続されていない側はスレーブです。
+1つ覚えておかなければならないことは、USB ポートが接続されている側が常にマスター側であるということです。USB に接続されていない側はスレーブです。

 分割キーボードの左右を設定するには、幾つかの異なる方法があります (優先度の順にリストされています):

@@ -260,7 +262,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
 * `#define SELECT_SOFT_SERIAL_SPEED <speed>` (デフォルトの速度は1です)
   * serial 通信を使う時のプロトコルの速度を設定します。
   * 速度:
-      * 0: 約189kbps (実験目的のみ)
+      * 0: 約 189kbps (実験目的のみ)
      * 1: 約 137kbps (デフォルト)
      * 2: 約 75kbps
      * 3: 約 39kbps
--- a/docs/ja/newbs_building_firmware_configurator.md
+++ b/docs/ja/newbs_building_firmware_configurator.md
@@ -63,7 +63,7 @@ QMK Configurator は Chrome/Firefox で最適に動作します。

 2分割の右シフト: 両方とも右シフトで埋めます。

-左シフトとISOサポート用に1つずつ: 両方とも左シフトで埋めます。
+左シフトと ISO サポート用に1つずつ: 両方とも左シフトで埋めます。

 5分割だが4キーのみ: 以前やったことがある人を推測して確認するか尋ねてください。

@@ -73,7 +73,7 @@ QMK Configurator は Chrome/Firefox で最適に動作します。

 後日、`Import Keymap` ボタンを押すことで、この .json ファイルをロードできます。

-!> **注意:** このファイルは、kbfirmware.com またはその他のツールに使用される .jsonファイルと同じ形式ではありません。これらのツールにこれを使用したり、QMK Configurator でこれらのツールの .json を使用しようとすると、キーボードが **爆発** する可能性があります。
+!> **注意:** このファイルは、kbfirmware.com またはその他のツールに使用される .json ファイルと同じ形式ではありません。これらのツールにこれを使用したり、QMK Configurator でこれらのツールの .json を使用しようとすると、キーボードが **爆発** する可能性があります。

 ## ファームウェアファイルを生成する

--- a/docs/ja/newbs_flashing.md
+++ b/docs/ja/newbs_flashing.md
@@ -13,7 +13,7 @@
 キーボードに書き込む最も簡単な方法は [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) を使うことです。

 ただし、QMK Toolbox は、現在は Windows と macOS でしか使えません。
-Linuxを使用している場合(および、コマンドラインでファームウェアを書き込みたい場合)は、下の方で概説する[方法](ja/newbs_flashing.md#flash-your-keyboard-from-the-command-line)で行なう必要があります。
+Linux を使用している場合(および、コマンドラインでファームウェアを書き込みたい場合)は、下の方で概説する[方法](ja/newbs_flashing.md#flash-your-keyboard-from-the-command-line)で行なう必要があります。

 ### QMK Toolbox にファイルをロードする

@@ -65,7 +65,7 @@ planck_rev5_default.hex
 * 基板(PCB)に付けられている物理的な `RESET` ボタンを押す
 * PCB 上の `BOOT0` か `RESET` のラベルの付いたヘッダピンを探し、PCB 接続中にそれらを互いにショートする

-うまくいけば、QMK Toolboxに次のようなメッセージが表示されます。
+うまくいけば、QMK Toolbox に次のようなメッセージが表示されます。

 ```
 *** Clueboard - Clueboard 66% HotSwap disconnected -- 0xC1ED:0x2390
@@ -121,7 +121,7 @@ QMK Toolbox の `Flash` ボタンをクリックします。
 この場合、あなたは明示的にブートローダを指定する方法を使わなければなりません。

 ブートローダは主に 5 種類のものが使われています。
-Pro Micro とそのクローンは Caterina を、Teensy は HalfKay を、OLKBの AVR ボードは QMK-DFU を、その他の ATmega32U4 ボードは DFU を、そして多くの ARM ボードは ARM DFU を使います。
+Pro Micro とそのクローンは Caterina を、Teensy は HalfKay を、OLKB の AVR ボードは QMK-DFU を、その他の ATmega32U4 ボードは DFU を、そして多くの ARM ボードは ARM DFU を使います。

 より詳しいブートローダの情報は、[Flashing Instructions and Bootloader Information](ja/flashing.md) にあります。

@@ -178,10 +178,10 @@ Checking file size of planck_rev5_xyverz.hex

 ファームウェアを DFU デバイスに書き込むために使用できる DFU コマンドがいくつかあります。

-* `:dfu` - これが通常のオプションで、DFUデバイスが使用可能になるまで待機したのちファームウェアを書き込みます。5秒ごとに、DFUデバイスが存在するかチェックしています。
+* `:dfu` - これが通常のオプションで、DFU デバイスが使用可能になるまで待機したのちファームウェアを書き込みます。5秒ごとに、DFU デバイスが存在するかチェックしています。
 * `:dfu-ee` - 通常の hex ファイルの代わりに `eep` ファイルを書き込みます。これを使用するのはまれです。
-* `:dfu-split-left` - デフォルトオプション (`:dfu`) と同様に、通常のファームウェアが書き込まれます。ただし、分割キーボードの「左側の」 EEPROMファイルも書き込まれます。_これは、Elite C ベースの分割キーボードに最適です。_
-* `:dfu-split-right` - デフォルトオプション (`:dfu`) と同様に、通常のファームウェアが書き込まれます。ただし、分割キーボードの「右側の」EEPROMファイルも書き込まれます。_これは、Elite C ベースの分割キーボードに最適です。_
+* `:dfu-split-left` - デフォルトオプション (`:dfu`) と同様に、通常のファームウェアが書き込まれます。ただし、分割キーボードの「左側の」 EEPROM ファイルも書き込まれます。_これは、Elite C ベースの分割キーボードに最適です。_
+* `:dfu-split-right` - デフォルトオプション (`:dfu`) と同様に、通常のファームウェアが書き込まれます。ただし、分割キーボードの「右側の」EEPROM ファイルも書き込まれます。_これは、Elite C ベースの分割キーボードに最適です。_


 ### Caterina 
@@ -259,8 +259,8 @@ avrdude.exe done.  Thank you.

 * `:avrdude` - これが通常のオプションで、Caterina デバイスが(新しい COM ポートを検出して)使用可能になるまで待機し、ファームウェアを書き込みます。
 * `:avrdude-loop` - これは `:avrdude` と同じです。ただし書き込みが終了すると再び Caterina デバイスの書き込み待ちに戻ります。これは何台ものデバイスへの書き込みに便利です。_Control+C を押して、手動でこの繰り返しを終了させる必要があります。_
-* `:avrdude-split-left` - デフォルトオプション(`:avrdude`)と同様に通常のファームウェアが書き込まれます。ただし、分割キーボードの「左側の」EEPROMファイルもフラッシュされます。 _これは、Pro Micro ベースの分割キーボードに最適です。_
-* `:avrdude-split-right` - デフォルトオプション(`:avrdude`)と同様に通常のファームウェアが書き込まれます。ただし、分割キーボードの「右側の」EEPROMファイルもフラッシュされます。 _これは、Pro Micro ベースの分割キーボードに最適です。_
+* `:avrdude-split-left` - デフォルトオプション(`:avrdude`)と同様に通常のファームウェアが書き込まれます。ただし、分割キーボードの「左側の」EEPROM ファイルもフラッシュされます。 _これは、Pro Micro ベースの分割キーボードに最適です。_
+* `:avrdude-split-right` - デフォルトオプション(`:avrdude`)と同様に通常のファームウェアが書き込まれます。ただし、分割キーボードの「右側の」EEPROM ファイルもフラッシュされます。 _これは、Pro Micro ベースの分割キーボードに最適です。_

 ### HalfKay

--- a/docs/ja/newbs_getting_started.md
+++ b/docs/ja/newbs_getting_started.md
@@ -12,7 +12,7 @@ QMK は、そのソフトウェアの役割を果たし、ボタンの押下を
 カスタムキーマップを作るということは、キーボード上で動くプログラムを作るということなのです。

 QMK は、簡単なことは簡単に、そして、難しいことを可能なことにすることで、あなたの手にたくさんのパワーをもたらします。
-パワフルなキーマップを作るためにプログラムを作成する方法を知る必要はありません。いくつかのシンプルな文法に従うだけでOKです。
+パワフルなキーマップを作るためにプログラムを作成する方法を知る必要はありません。いくつかのシンプルな文法に従うだけで OK です。

 # はじめに

--- a/docs/ja/newbs_git_resynchronize_a_branch.md
+++ b/docs/ja/newbs_git_resynchronize_a_branch.md
@@ -7,7 +7,7 @@
 -->

 仮にあなたの `master` ブランチにあなたのコミットを行い、そしてあなたの QMK リポジトリの更新が必要になったとします。
-(フォーク元の) QMKの `master` ブランチをあなたの `master` ブランチに `git pull` することもできますが、GitHub は、あなたのブランチが `qmk:master` より何コミットか先行していると通知します、この状態で QMK にプルリクエストを行う場合、問題が発生する可能性があります。
+(フォーク元の) QMK の `master` ブランチをあなたの `master` ブランチに `git pull` することもできますが、GitHub は、あなたのブランチが `qmk:master` より何コミットか先行していると通知します、この状態で QMK にプルリクエストを行う場合、問題が発生する可能性があります。
 (訳注：この通知は、GitHub のあなたのリポジトリの code ペインのブランチ選択メニューの下のあたりで `This branch is 3 commit ahead of qmk:master` という様な文面で表示されています。)

 ?> このドキュメントは [あなたのフォークの master ブランチ: 更新は頻繁に、コミットはしないこと](ja/newbs_git_using_your_master_branch.md) で詳述されている概念に基づいています。その概念に慣れていない場合は、まずそれを読んでから、ここに戻ってください。  
--- a/docs/ja/newbs_git_using_your_master_branch.md
+++ b/docs/ja/newbs_git_using_your_master_branch.md
@@ -41,7 +41,7 @@ upstream        https://github.com/qmk/qmk_firmware.git (push)
 このコマンドは `upstream` というニックネームを持つ QMK リポジトリから、ブランチとタグ &mdash; "refs" と総称されます &mdash; を取得します。
 これで、あなたのフォーク `origin` のデータを QMK が保持するデータと比較できます。

-あなたのフォークの `master` を更新するには、次を実行します、各行の後にEnterキーを押してください:
+あなたのフォークの `master` を更新するには、次を実行します、各行の後に Enter キーを押してください:

 ```
 git checkout master
@@ -98,4 +98,4 @@ git commit -m "My commit message."

 最後のステップは、変更をフォークにプッシュすることです。
 これを行うには、`git push`と入力します。
-Gitは、 `dev_branch`の現在の状態をフォークに公開します。
+Git は、 `dev_branch`の現在の状態をフォークに公開します。
--- a/docs/ja/newbs_learn_more_resources.md
+++ b/docs/ja/newbs_learn_more_resources.md
@@ -6,7 +6,7 @@
  git diff ed0575fc8 HEAD -- docs/newbs_learn_more_resources.md | cat
 -->

-これらのリソースは、QMKコミュニティの新しいメンバーに、初心者向けドキュメントで提供されている情報に対する理解を深めることを目的としています。
+これらのリソースは、QMK コミュニティの新しいメンバーに、初心者向けドキュメントで提供されている情報に対する理解を深めることを目的としています。

 ## Git に関するリース:

--- a/docs/ja/newbs_testing_debugging.md
+++ b/docs/ja/newbs_testing_debugging.md
@@ -12,7 +12,7 @@

 通常、キーボードをテストするのは非常に簡単です。全てのキーをひとつずつ押して、期待されるキーが送信されていることを確認します。キーを押したことを見逃さないためのプログラムもあります。

-メモ：　これらのプログラムはQMKによって提供・承認されたものではありません。
+メモ：　これらのプログラムは QMK によって提供・承認されたものではありません。

 * [QMK Configurator](https://config.qmk.fm/#/test/) (Web Based)
 * [Switch Hitter](https://web.archive.org/web/20190413233743/https://elitekeyboards.com/switchhitter.php) (Windows Only)
@@ -40,7 +40,7 @@ void keyboard_post_init_user(void) {

 ### hid_listenを使ったデバッグ

-ターミナルベースの方法がお好みですか？PJRCが提供する[hid_listen](https://www.pjrc.com/teensy/hid_listen.html)もデバッグメッセージの表示に使用できます。ビルド済みの実行ファイルはWindows, Linux, MacOS用が用意されています。
+ターミナルベースの方法がお好みですか？PJRC が提供する[hid_listen](https://www.pjrc.com/teensy/hid_listen.html)もデバッグメッセージの表示に使用できます。ビルド済みの実行ファイルは Windows, Linux, MacOS 用が用意されています。

 <!-- FIXME: Describe the debugging messages here. -->

@@ -50,7 +50,7 @@ void keyboard_post_init_user(void) {

    #include <print.h>

-そのあとは、いくつかの異なったprint関数を使用することが出来ます。
+そのあとは、いくつかの異なった print 関数を使用することが出来ます。

 * `print("string")`: シンプルな文字列を出力します
 * `uprintf("%s string", var)`: フォーマットされた文字列を出力します
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"

 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
+#define VENDOR_ID       0x6F75 // OU
+#define PRODUCT_ID      0x6873
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    1upkeyboards
 #define PRODUCT         1up60hse
--- a/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c
@@ -0,0 +1,91 @@
+/* Copyright 2018 MechMerlin
+ * Copyright 2018 Logan Huskins
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Qwerty
+   * ,-----------------------------------------------------------------------------------------.
+   * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | Backspace |
+   * |-----------------------------------------------------------------------------------------+
+   * |  Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
+   * |-----------------------------------------------------------------------------------------+
+   * |  Caps   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
+   * |-----------------------------------------------------------------------------------------+
+   * |   Shift   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |      Shift      |
+   * |-----------------------------------------------------------------------------------------+
+   * | Ctrl  |  GUI  |  Alt  |              Space              |  Alt  |  GUI  |  L1   | Ctrl  |
+   * `-----------------------------------------------------------------------------------------'
+   */
+  [0] = LAYOUT_60_ansi(
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
+  ),
+
+  /* Function
+   * ,-----------------------------------------------------------------------------------------.
+   * |  `  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |    Del    |
+   * |-----------------------------------------------------------------------------------------+
+   * |        |     | Up  |     |     |     |     |     |     |     |PrtSc|ScrLk|Pause|        |
+   * |-----------------------------------------------------------------------------------------+
+   * |         |Left |Down |Right|     |     |     |     |     | Ins |Home |PgUp |             |
+   * |-----------------------------------------------------------------------------------------+
+   * |           |VolUp|VolDn|VolMu|     |     |     |     |     | End |PgDn |                 |
+   * |-----------------------------------------------------------------------------------------+
+   * |       |       |       |                                 |       |  L2   |       |       |
+   * `-----------------------------------------------------------------------------------------'
+   */
+  [1] = LAYOUT_60_ansi(
+    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
+    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS,
+    KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS
+  ),
+
+  /* RGB
+   * ,-----------------------------------------------------------------------------------------.
+   * |     |     |     |     |     |     |     |     |     |     |     |     |     |   Reset   |
+   * |-----------------------------------------------------------------------------------------+
+   * | BL Tog |BLInc|BLDec|BLStp|     |     |     |     |     |     |     |     |     |        |
+   * |-----------------------------------------------------------------------------------------+
+   * | RGB Tog |Mode |Hue I|Sat I|Val I|Spd I|Plain|Breat|Rnbow|Swirl|     |     |             |
+   * |-----------------------------------------------------------------------------------------+
+   * |           |RMode|Hue D|Sat D|Val D|Spd D|Snake|Knigh|Xmas |Gradi|     |                 |
+   * |-----------------------------------------------------------------------------------------+
+   * |       |       |       |                                 |       |       |       |       |
+   * `-----------------------------------------------------------------------------------------'
+   */
+  [2] = LAYOUT_60_ansi(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+    BL_TOGG, BL_INC, BL_DEC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [3] = LAYOUT_60_ansi(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+};
--- a/keyboards/1upkeyboards/1up60hse/keymaps/via/readme.md
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/via/readme.md
@@ -0,0 +1 @@
+# 1up60hse via keymap
--- a/keyboards/1upkeyboards/1up60hse/keymaps/via/rules.mk
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+MOUSEKEY_ENABLE = no
--- a/keyboards/at_at/660m/chconf.h
+++ b/keyboards/at_at/660m/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/at_at/660m/rules.mk
+++ b/keyboards/at_at/660m/rules.mk
@@ -17,3 +17,6 @@ CUSTOM_MATRIX = no # Custom matrix file
 # RGBLIGHT_ENABLE = yes
 NO_USB_STARTUP_CHECK = yes # Workaround for issue 6369

+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/candybar/chconf.h
+++ b/keyboards/candybar/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/candybar/rules.mk
+++ b/keyboards/candybar/rules.mk
@@ -18,3 +18,7 @@ NKRO_ENABLE = yes     # USB Nkey Rollover
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no
 SERIAL_LINK_ENABLE = no
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/an_c/chconf.h
+++ b/keyboards/cannonkeys/an_c/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/an_c/rules.mk
+++ b/keyboards/cannonkeys/an_c/rules.mk
@@ -22,3 +22,7 @@ CUSTOM_MATRIX = no # Custom matrix file
 RGBLIGHT_ENABLE = yes

 LAYOUTS = 60_ansi 60_tsangan_hhkb
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/chimera65/chconf.h
+++ b/keyboards/cannonkeys/chimera65/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/chimera65/rules.mk
+++ b/keyboards/cannonkeys/chimera65/rules.mk
@@ -20,3 +20,7 @@ NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 # BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason
 RGBLIGHT_ENABLE = no
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/instant60/chconf.h
+++ b/keyboards/cannonkeys/instant60/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/instant60/rules.mk
+++ b/keyboards/cannonkeys/instant60/rules.mk
@@ -22,3 +22,7 @@ CUSTOM_MATRIX = no # Custom matrix file
 RGBLIGHT_ENABLE = yes

 LAYOUTS = 60_ansi 60_tsangan_hhkb
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/iron165/chconf.h
+++ b/keyboards/cannonkeys/iron165/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/iron165/rules.mk
+++ b/keyboards/cannonkeys/iron165/rules.mk
@@ -20,3 +20,7 @@ NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 # BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason
 RGBLIGHT_ENABLE = no
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/ortho48/chconf.h
+++ b/keyboards/cannonkeys/ortho48/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/ortho48/rules.mk
+++ b/keyboards/cannonkeys/ortho48/rules.mk
@@ -26,3 +26,7 @@ BACKLIGHT_DRIVER = custom
 RGBLIGHT_ENABLE = yes

 LAYOUTS = ortho_4x12
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/ortho60/chconf.h
+++ b/keyboards/cannonkeys/ortho60/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/ortho60/rules.mk
+++ b/keyboards/cannonkeys/ortho60/rules.mk
@@ -26,3 +26,7 @@ BACKLIGHT_DRIVER = custom
 RGBLIGHT_ENABLE = yes

 LAYOUTS = ortho_5x12
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/ortho75/chconf.h
+++ b/keyboards/cannonkeys/ortho75/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/ortho75/rules.mk
+++ b/keyboards/cannonkeys/ortho75/rules.mk
@@ -27,3 +27,7 @@ RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes

 LAYOUTS = ortho_5x15
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/practice60/chconf.h
+++ b/keyboards/cannonkeys/practice60/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/practice60/rules.mk
+++ b/keyboards/cannonkeys/practice60/rules.mk
@@ -28,3 +28,7 @@ RGBLIGHT_ENABLE = yes
 LAYOUTS = 60_ansi

 DEFAULT_FOLDER = cannonkeys/practice60
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/practice65/chconf.h
+++ b/keyboards/cannonkeys/practice65/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/practice65/rules.mk
+++ b/keyboards/cannonkeys/practice65/rules.mk
@@ -24,3 +24,7 @@ NKRO_ENABLE = yes	    # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes
 BACKLIGHT_DRIVER = custom
 RGBLIGHT_ENABLE = yes
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/satisfaction75/chconf.h
+++ b/keyboards/cannonkeys/satisfaction75/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -22,3 +22,7 @@ QWIIC_ENABLE += MICRO_OLED
 #BACKLIGHT_ENABLE = yes

 DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/savage65/chconf.h
+++ b/keyboards/cannonkeys/savage65/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/savage65/rules.mk
+++ b/keyboards/cannonkeys/savage65/rules.mk
@@ -21,3 +21,6 @@ CUSTOM_MATRIX = no # Custom matrix file
 # BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason
 RGBLIGHT_ENABLE = yes

+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/cannonkeys/tmov2/chconf.h
+++ b/keyboards/cannonkeys/tmov2/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/cannonkeys/tmov2/rules.mk
+++ b/keyboards/cannonkeys/tmov2/rules.mk
@@ -21,3 +21,6 @@ CUSTOM_MATRIX = no # Custom matrix file
 # BACKLIGHT_ENABLE = yes # This is broken on 072 right now
 RGBLIGHT_ENABLE = yes

+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/converter/siemens_tastatur/chconf.h
+++ b/keyboards/converter/siemens_tastatur/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/converter/siemens_tastatur/rules.mk
+++ b/keyboards/converter/siemens_tastatur/rules.mk
@@ -22,3 +22,6 @@ BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE = no
 CUSTOM_MATRIX = yes

+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/coseyfannitutti/mysterium/rules.mk
+++ b/keyboards/coseyfannitutti/mysterium/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Processor frequency
-F_USB = 16000000
+F_CPU = 16000000

 # Bootloader selection
 #   Teensy       halfkay
--- a/keyboards/ergodox_ez/keymaps/danielo515/config.h
+++ b/keyboards/ergodox_ez/keymaps/danielo515/config.h
@@ -0,0 +1,37 @@
+/*
+  Set any config.h overrides for your specific keymap here.
+  See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
+*/
+#pragma once
+
+#define IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_TERM 200
+
+#define ONESHOT_TAP_TOGGLE 3
+
+#define RGBLIGHT_SLEEP
+
+#undef MOUSEKEY_TIME_TO_MAX
+#define MOUSEKEY_TIME_TO_MAX 50
+
+#undef MOUSEKEY_WHEEL_TIME_TO_MAX
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 60
+// Timeout settings for leader key
+#undef  LEADER_TIMEOUT
+#define LEADER_TIMEOUT 350
+#define LEADER_PER_KEY_TIMING
+
+#undef DEBOUNCE
+#define DEBOUNCE 45
+// Memory saving
+#ifdef CONSOLE_ENABLE
+#    define NO_DEBUG
+#    define NO_PRINT
+#endif
+
+#ifndef LINK_TIME_OPTIMIZATION_ENABLE
+#    define NO_ACTION_MACRO
+#    define NO_ACTION_FUNCTION
+#endif
+
+#undef RGBLIGHT_ANIMATIONS
--- a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
@@ -0,0 +1,318 @@
+#include QMK_KEYBOARD_H
+#include "version.h"
+#include "danielo515.h"
+
+/* STUPID JS code to split by ergodox rows. Call the format function with the unformatted array
+sliceBy = groups => items => groups.reduce(({start, acc},size) => ({
+    acc: (acc.push(items.slice(start,start+size)),acc ),
+    start: start + size
+}), {acc:[],start:0}).acc
+findMaxLen = items => items.reduce((max,curr) => max < curr.length ? curr.length : max,0)
+setLen = len => strings => strings.map(str => str.padEnd(len, " "));
+const format = string => {
+  const items = string.split(/,\s*(?![^()]*\))/)
+  const group = sliceBy([7,7,6,7,5,2,1,3])
+  const resize = setLen(findMaxLen(items));
+  const joinstr = ',\n'
+  const leftItems = group(items.slice(0,items.length/2))
+  const rightItems = group(items.slice(items.length/2))
+  const [left,right] = [leftItems.map(resize).join(joinstr),rightItems.map(resize).join(joinstr)]
+  return `\n${left},\n\n${right}\n`
+}
+*/
+
+#define OSM_SF_CMD  OSM(MOD_LGUI | MOD_LSFT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_ergodox(
+    KC_EQL              ,KC_1                ,KC_2                ,KC_3                ,KC_4                ,KC_5                ,OSM(MOD_HYPR)    ,
+    KC_TAB              ,KC_Q                ,KC_W                ,KC_E                ,KC_R                ,KC_T                ,TD(PASTE_DANCE) ,
+    KC_DELETE           ,KC_A                ,LT(3,KC_S)          ,LT(2,KC_D)          ,LT(4,KC_F)          ,KC_G                ,
+    KC_GRAVE            ,KC_Z                ,KC_X                ,KC_C                ,KC_V                ,KC_B                ,TD(COPY_CUT) ,
+    KC_BSLASH           ,OSM(MOD_LCTL)       ,OSM(MOD_LALT)       ,KC_LEFT             ,KC_RIGHT            ,
+    OSM_SF_CMD          ,KC_PLUS             ,
+    KC_INSERT           ,
+    OSM(MOD_LSFT)       ,LT(2,KC_BSPACE)     ,OSM(MOD_LGUI)              ,
+
+
+    TO(1)               ,KC_6                ,KC_7                ,KC_8                ,TD_F9               ,LT(3,KC_0)          ,KC_DQUO             ,
+    KC_UNDS             ,KC_Y                ,KC_U                ,KC_I                ,KC_O                ,KC_P                ,RSFT_T(KC_MINUS)            ,
+    HYPR_T(KC_H)        ,ALT_T(KC_J)         ,RCTL_T(KC_K)        ,LT(6,KC_L)          ,TD_CLN              ,GUI_T(KC_QUOTE)     ,
+    ALT_TAB             ,KC_N                ,MEH_T(KC_M)         ,KC_COMMA            ,KC_DOT              ,KC_SLASH            ,LT(4,KC_KP_ASTERISK),
+    LT(4,KC_ENTER)      ,KC_DOWN             ,KC_LBRACKET         ,KC_RBRACKET         ,OSL(2)              ,
+    KC_AUDIO_MUTE       ,KC_ESCAPE           ,
+    KC_END              ,
+    KC_COLN             ,KC_LEAD             ,LT(4,KC_SPACE)
+    ),
+
+  [1] = LAYOUT_ergodox(
+    KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,AC_E            ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    LT(5, KC_DELETE),AC_A            ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,FIND            ,KC_TRANSPARENT  ,
+    KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    KC_TRANSPARENT  ,
+    OSM(MOD_LSFT)   ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    TO(8)           ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    KC_ENTER        ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    KC_TRANSPARENT  ,KC_TRANSPARENT  ,
+    KC_TRANSPARENT  ,
+    KC_TRANSPARENT  ,KC_TRANSPARENT  ,KC_TRANSPARENT),
+
+  [2] = LAYOUT_ergodox(
+    KC_TRANSPARENT,KC_F1         ,KC_F2         ,KC_F3         ,KC_F4         ,KC_F5         ,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_EXLM       ,KC_AT         ,KC_LCBR       ,KC_RCBR       ,KC_PIPE       ,KC_CALCULATOR ,
+    KC_TRANSPARENT,KC_HASH       ,KC_DLR        ,KC_TRANSPARENT,KC_RPRN       ,KC_GRAVE      ,
+    KC_TRANSPARENT,KC_PERC       ,KC_CIRC       ,KC_LBRACKET   ,KC_RBRACKET   ,KC_TILD       ,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,
+                                  RGB_HUI       ,
+    KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUD       ,
+    KC_DELETE     ,KC_A          ,KC_B          ,KC_C          ,KC_D          ,KC_E          ,KC_BSPACE     ,
+    KC_ENTER      ,KC_F          ,KC_7          ,KC_8          ,KC_9          ,KC_PERC       ,KC_TRANSPARENT,
+                   KC_HASH       ,KC_4          ,KC_5          ,KC_6          ,KC_PLUS       ,KC_KP_ASTERISK,
+    KC_KP_ENTER   ,KC_COLON      ,KC_1          ,KC_2          ,KC_3          ,KC_SLASH      ,KC_BSLASH     ,
+                                  KC_0          ,KC_COMMA      ,KC_DOT        ,KC_EQUAL      ,KC_TRANSPARENT,
+    RGB_TOG       ,RGB_SLD       ,
+    RGB_VAI       ,
+    RGB_VAD       ,KC_BSPACE     ,KC_SPACE
+  ),
+
+  [3] = LAYOUT_ergodox(
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_LABK            ,KC_RABK            ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,KC_AT              ,KC_TRANSPARENT     ,KC_EQL             ,F_ARROW            ,KC_GRAVE           ,
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_LBRACKET        ,KC_RBRACKET        ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,
+    // Right hand
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    LALT(LSFT(KC_UP))  ,KC_HASH            ,KC_LCBR            ,KC_RCBR            ,KC_KP_ASTERISK     ,KC_PERC            ,KC_DLR             ,
+                        KC_AMPR            ,KC_LPRN            ,KC_RPRN            ,KC_CIRC            ,KC_KP_PLUS         ,KC_PIPE            ,
+    LALT(LSFT(KC_DOWN)),KC_EXLM            ,KC_TILD            ,KC_CIRC            ,ARROW              ,KC_BSLASH          ,KC_BSLASH          ,
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    RESET              ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_SPACE
+),
+
+  [4] = LAYOUT_ergodox(
+    KC_TRANSPARENT     ,KC_F1              ,KC_F2              ,KC_F3              ,KC_F4              ,KC_F5              ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,LCTL(KC_Q)         ,LCTL(KC_DOWN)      ,LGUI(KC_DOWN)      ,WIN_LEFT_HALF      ,WIN_RIGHT_HALF     ,LALT(LSFT(KC_UP))  ,
+    LCTL(LSFT(KC_P))   ,LCTL(KC_A)         ,SAVE               ,LCTL(KC_D)         ,KC_TRANSPARENT     ,RGUI(KC_R)         ,
+    LCTL(LSFT(KC_F))   ,UNDO               ,CUT                ,KC_PSCREEN         ,KC_TRANSPARENT     ,LGUI(KC_RIGHT)     ,LALT(LSFT(KC_DOWN)),
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+
+    LALT(KC_F4)        ,KC_F6              ,KC_F7              ,KC_F8              ,KC_F9              ,KC_F10             ,KC_F11             ,
+    LALT(KC_UP)        ,LSFT(KC_HOME)      ,LSFT(KC_LEFT)      ,KC_UP              ,LSFT(KC_RIGHT)     ,LSFT(KC_END)       ,KC_F13             ,
+                        KC_HOME            ,KC_LEFT            ,KC_DOWN            ,KC_RIGHT           ,KC_END             ,KC_F12             ,
+    LALT(KC_DOWN)      ,LSFT(KC_INSERT)    ,LCTL(LSFT(KC_J))   ,LSFT(KC_UP)        ,KC_PGUP            ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT                                             ,LSFT(KC_DOWN)      ,KC_PGDOWN          ,WIN_TO_LEFT        ,WIN_TO_RIGHT     ,
+    KC_TRANSPARENT     ,KC_SYSTEM_SLEEP    ,
+    KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,KC_BSPACE          ,KC_TRANSPARENT
+  ),
+
+  [5] = LAYOUT_ergodox(
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,LCTL(KC_TAB)        ,LCTL(LSFT(KC_TAB))  ,LGUI(KC_D)          ,LCTL(KC_F)          ,KC_TRANSPARENT      ,
+    LGUI(KC_L)          ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,LSFT(KC_F9)         ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,LCTL(LGUI(KC_LEFT)) ,LCTL(LGUI(KC_RIGHT)),KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,LCTL(KC_T)          ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT
+),
+
+  [6] = LAYOUT_ergodox(
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_MS_ACCEL2        ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_MS_WH_DOWN       ,KC_MS_UP            ,KC_MS_WH_UP         ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_MS_LEFT          ,KC_MS_DOWN          ,KC_MS_RIGHT         ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_MS_BTN3          ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,
+    KC_MS_BTN1          ,KC_MS_BTN2          ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_PGUP             ,LCTL(LGUI(KC_RIGHT)),KC_MS_WH_UP         ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    LGUI(RCTL(KC_LEFT)) ,KC_MS_WH_DOWN       ,LCTL(KC_C)          ,KC_TRANSPARENT      ,KC_MEDIA_STOP       ,KC_MEDIA_PLAY_PAUSE ,
+    KC_PGDOWN           ,LCTL(LSFT(KC_N))    ,LCTL(LSFT(KC_J))    ,KC_MEDIA_PREV_TRACK ,KC_MEDIA_NEXT_TRACK ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_AUDIO_VOL_UP     ,KC_AUDIO_VOL_DOWN   ,KC_AUDIO_MUTE       ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,
+    KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT
+  ),
+
+  [7] = LAYOUT_ergodox(
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_UP         ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_LEFT       ,KC_DOWN       ,KC_RIGHT      ,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT
+  ),
+
+  [8] = LAYOUT_ergodox(
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_Q          ,KC_W          ,KC_E          ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_ENTER      ,KC_A          ,KC_S          ,KC_D          ,KC_F          ,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_Z          ,KC_X          ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,
+    KC_SPACE      ,KC_LSHIFT     ,KC_TRANSPARENT,
+
+    TO(0)         ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_PGDOWN     ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_ENTER      ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT
+  ),
+};
+// Used for blinking leds on layers higher than 7
+uint16_t blink_timer = 0;
+uint16_t blink_elapsed = 0;
+bool blink_led_1 = false;
+bool blink_led_2 = false;
+bool blink_led_3 = false;
+
+void matrix_scan_kb(void){
+    // first 7 layers do not need to blink
+    if(blink_led_1 || blink_led_2 || blink_led_3){
+        ergodox_board_led_off();
+        ergodox_right_led_1_off();
+        ergodox_right_led_2_off();
+        ergodox_right_led_3_off();
+        blink_elapsed = timer_elapsed(blink_timer);
+        if(blink_elapsed > 2000) { blink_timer = timer_read();}
+        if(blink_elapsed < 1000) {
+            if(blink_led_1) ergodox_right_led_1_on();
+            if(blink_led_2) ergodox_right_led_2_on();
+            if(blink_led_3) ergodox_right_led_3_on();
+        }
+    }
+    matrix_scan_user();
+};
+
+layer_state_t layer_state_set_user(layer_state_t state)
+{
+
+  uint8_t layer = get_highest_layer(state);
+
+  ergodox_board_led_off();
+  ergodox_right_led_1_off();
+  ergodox_right_led_2_off();
+  ergodox_right_led_3_off();
+  blink_led_1=false;
+  blink_led_2=false;
+  blink_led_3=false;
+
+  switch (layer)
+  {
+  case 0:
+    rgblight_setrgb(0, 200, 200);
+    break;
+  case 1:
+    ergodox_right_led_1_on();
+    rgblight_setrgb(0, 200, 0); // green
+    break;
+  case 2:
+    ergodox_right_led_2_on();
+    rgblight_setrgb(0, 0, 255);
+    break;
+  case 3:
+    ergodox_right_led_3_on();
+    rgblight_setrgb(255, 0, 0);
+    break;
+  case 4:
+    ergodox_right_led_1_on();
+    ergodox_right_led_2_on();
+    rgblight_setrgb(200, 65, 0);
+    break;
+  case 5:
+    ergodox_right_led_1_on();
+    ergodox_right_led_3_on();
+    rgblight_setrgb(0, 80, 33);
+    break;
+  case 6:
+    ergodox_right_led_2_on();
+    ergodox_right_led_3_on();
+    rgblight_setrgb(0, 10, 200);
+    break;
+  case 7:
+    ergodox_right_led_1_on();
+    ergodox_right_led_2_on();
+    ergodox_right_led_3_on();
+    rgblight_setrgb(90, 150, 90);
+    break;
+  case 8:
+    blink_led_1=true;
+    rgblight_setrgb(100, 0, 100);
+    break;
+  case 9:
+    rgblight_setrgb(200, 150, 90);
+    break;
+//   default:
+//     rgblight_setrgb(0, 200, 200);
+//     break;
+  }
+  return state;
+};
+
+// use leds to indicate when a one shot mod is on
+void oneshot_mods_changed_user(uint8_t mods) {
+  ergodox_board_led_off();
+  ergodox_right_led_1_off();
+  ergodox_right_led_2_off();
+  ergodox_right_led_3_off();
+  // One shot checks
+  if (mods & MOD_MASK_SHIFT) {
+    ergodox_right_led_1_on();
+  }
+  if (mods & MOD_MASK_CTRL) {
+    ergodox_right_led_2_on();
+  }
+  if (mods & MOD_MASK_ALT) {
+    ergodox_right_led_3_on();
+  }
+  // if (mods & MOD_MASK_GUI) {
+  //   println("Oneshot mods GUI");
+  // }
+  }
+
+void oneshot_locked_mods_changed_user(uint8_t mods) {
+    oneshot_mods_changed_user(mods);
+}
--- a/keyboards/ergodox_ez/keymaps/danielo515/rules.mk
+++ b/keyboards/ergodox_ez/keymaps/danielo515/rules.mk
@@ -0,0 +1,9 @@
+# Set any rules.mk overrides for your specific keymap here.
+# See rules at https://docs.qmk.fm/#/config_options?id=the-rulesmk-file
+LTO_ENABLE = yes
+AUTO_SHIFT_ENABLE = no
+TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
+LEADER_ENABLE = yes
+CONSOLE_ENABLE = no
+RGBLIGHT_ENABLE = yes
+COMBO_ENABLE = yes
--- a/keyboards/ergodox_stm32/chconf.h
+++ b/keyboards/ergodox_stm32/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/ergodox_stm32/rules.mk
+++ b/keyboards/ergodox_stm32/rules.mk
@@ -30,3 +30,7 @@ NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = yes # Custom matrix file
 NKRO_ENABLE      = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 UNICODE_ENABLE   = yes # Unicode
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/flx/virgo/info.json
+++ b/keyboards/flx/virgo/info.json
@@ -1,12 +1,11 @@
 {
-    "keyboard_name": "flx-virgo-default",
+    "keyboard_name": "FLX Virgo",
    "url": "",
    "maintainer": "qmk",
    "width": 20.25,
    "height": 6.25,
    "layouts": {
        "LAYOUT": {
-            "key_count": 91,
            "layout": [
                {"label":"K00 (C6,F0)", "x":0, "y":0},
                {"label":"K01 (C6,F1)", "x":1.5, "y":0},
--- a/keyboards/flx/virgo/keymaps/default/keymap.c
+++ b/keyboards/flx/virgo/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 MechMerlin
+/* Copyright 2020 Flexerm
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -17,20 +17,36 @@

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
-        KC_ESC,      KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,                     KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,         KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                      KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT,   KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,        MO(1),            KC_UP,
-        KC_LCTL,              KC_LGUI,      KC_LALT, KC_SPC,                      KC_SPC,                  KC_LALT, KC_RGUI,              KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1),              KC_UP,
+        KC_LCTL,          KC_LGUI, KC_LALT,          KC_SPC,                             KC_SPC,           KC_RALT, KC_RGUI,          KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
    ),
    [1] = LAYOUT(
-        _______,     _______, _______, _______, _______,      _______,                   _______, _______, _______,     _______, _______, _______, _______,        _______, _______, _______,
-        BL_TOGG, KC_1,    KC_2,    KC_3,    _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        RGB_TOG,     KC_4,    KC_5,    KC_6,    _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
-        _______,       KC_7,    KC_8,    KC_9,    _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
-        _______,   _______, KC_0,    KC_EQL,  _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,        _______,            _______,
-        _______,              _______,      _______, _______,                     _______,                 _______, _______,              _______,                 _______, _______, _______
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,                   RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,            BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,            KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS,         KC_TRNS,                            MO(2),            KC_TRNS, KC_TRNS,          KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,            KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS,         KC_TRNS,                            KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,            KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS,         KC_TRNS,                            KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS
    ),

 };
--- a/keyboards/flx/virgo/keymaps/via/keymap.c
+++ b/keyboards/flx/virgo/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2020 Flexerm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                      KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1),              KC_UP,
+        KC_LCTL,          KC_LGUI, KC_LALT,          KC_SPC,                             KC_SPC,           KC_RALT, KC_RGUI,          KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,                   RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,            BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,            KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS,         KC_TRNS,                            MO(2),            KC_TRNS, KC_TRNS,          KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,            KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS,         KC_TRNS,                            KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,            KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS,         KC_TRNS,                            KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
--- a/keyboards/flx/virgo/keymaps/via/readme.md
+++ b/keyboards/flx/virgo/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default VIA keymap for FLX - Virgo
--- a/keyboards/flx/virgo/keymaps/via/rules.mk
+++ b/keyboards/flx/virgo/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/flx/virgo/readme.md
+++ b/keyboards/flx/virgo/readme.md
@@ -6,7 +6,7 @@ Custom Split TKL

 * Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
 * Hardware Supported: Virgo PCB
-* Hardware Availability: GB TBD
+* Hardware Availability: GB FEB 15th 2020 - to be held on Geekhack

 Make example for this keyboard (after setting up your build environment):

--- a/keyboards/flx/virgo/rules.mk
+++ b/keyboards/flx/virgo/rules.mk
@@ -1,3 +1,4 @@
+# MCU name
 MCU = atmega32u4

 # Bootloader selection
@@ -16,8 +17,8 @@ BOOTLOADER = atmel-dfu
 BOOTMAGIC_ENABLE = lite      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes        # Mouse keys
 EXTRAKEY_ENABLE = yes        # Audio control and System control
-CONSOLE_ENABLE = yes         # Console for debug
-COMMAND_ENABLE = yes         # Commands for debug and configuration
+CONSOLE_ENABLE = no          # Console for debug
+COMMAND_ENABLE = no          # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no        # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
@@ -32,5 +33,3 @@ FAUXCLICKY_ENABLE = no       # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no          # Enable support for HD44780 based LCDs
 LINK_TIME_OPTIMIZATION_ENABLE = yes

-# generated by KBFirmware JSON to QMK Parser
-# https://noroadsleft.github.io/kbf_qmk_converter/
--- a/keyboards/flx/virgo/virgo.c
+++ b/keyboards/flx/virgo/virgo.c
@@ -1,4 +1,5 @@
 /* Copyright 2019 MechMerlin
+ * Edits etc 2020 Flexerm
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,7 +20,7 @@ void matrix_init_kb(void) {
    // put your keyboard start-up code here
    // runs once when the firmware starts up

-	setPinOutput(E6);
+  setPinOutput(E6);
  setPinOutput(B2);
  matrix_init_user();
 }
--- a/keyboards/flx/virgo/virgo.h
+++ b/keyboards/flx/virgo/virgo.h
@@ -1,4 +1,5 @@
 /* Copyright 2019 MechMerlin
+ * Edits etc 2020 Flexerm
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -18,26 +19,24 @@
 #include "quantum.h"

 #define LAYOUT( \
-    K00,   K01, K11, K02, K12,    K03,           K13, K04, K14,   K05, K15, K06, K16,     K07, K17, K08,  \
-    K20, K30, K21, K31, K22, K32, K23,           K33, K24, K34, K25, K35, K26, K36, K66,  K27, K37, K28,  \
-    K40,   K50, K41, K51, K42, K52,           K43, K53, K44, K54, K45, K55, K46, K56,     K47, K57, K48,  \
-    K60,    K70, K61, K71, K62, K72,           K63, K73, K64, K74, K65, K75, K76,                         \
-    K80,  K90, K81, K91, K82, K92, K83,      KA3, K93, K84, K94, K85, K95, K86,     K96,       K97,       \
-    KA0,        KB0,    KA1, KB2,            KB4,          KB5, KA6,        KB6,          KA7, KB7, KA8   \
+    K00,        K01,  K11,  K02,  K12,  K03,              K13,  K04,  K14,  K05,  K15,  K06,  K16,          K07,  K17,  K08, \
+    K20,  K30,  K21,  K31,  K22,  K32,  K23,              K33,  K24,  K34,  K25,  K35,  K26,  K36,  K66,    K27,  K37,  K28, \
+    K40,        K50,  K41,  K51,  K42,  K52,              K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,    K47,  K57,  K48, \
+    K60,        K70,  K61,  K71,  K62,  K72,              K63,  K73,  K64,  K74,  K65,  K75,  K76,                           \
+    K80,  K90,  K81,  K91,  K82,  K92,  K83,        KA3,  K93,  K84,  K94,  K85,  K95,  K86,  K96,                K97,       \
+    KA0,        KB0,  KA1,        KB2,                    KB4,              KB5,  KA6,        KB6,          KA7,  KB7,  KA8  \
 ) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
-    { KC_NO, K11,   K12,   K13,   K14,   K15,   K16,   K17,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   KC_NO }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO, KC_NO }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   KC_NO, KC_NO }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   KC_NO, KC_NO }, \
-    { K90,   K91,   K92,   K93,   K94,   K95,   K96,   K97,   KC_NO }, \
-    { KA0,   KA1,   KC_NO, KA3,   KC_NO, KC_NO, KA6,   KA7,   KA8   }, \
-    { KB0,   KC_NO, KB2,   KC_NO, KB4,   KB5,   KB6,   KB7,   KC_NO }, \
+    { K00,    K01,    K02,    K03,    K04,    K05,    K06,    K07,    K08    }, \
+    { KC_NO,  K11,    K12,    K13,    K14,    K15,    K16,    K17,    KC_NO  }, \
+    { K20,    K21,    K22,    K23,    K24,    K25,    K26,    K27,    K28    }, \
+    { K30,    K31,    K32,    K33,    K34,    K35,    K36,    K37,    KC_NO  }, \
+    { K40,    K41,    K42,    K43,    K44,    K45,    K46,    K47,    K48    }, \
+    { K50,    K51,    K52,    K53,    K54,    K55,    K56,    K57,    KC_NO  }, \
+    { K60,    K61,    K62,    K63,    K64,    K65,    K66,    KC_NO,  KC_NO  }, \
+    { K70,    K71,    K72,    K73,    K74,    K75,    K76,    KC_NO,  KC_NO  }, \
+    { K80,    K81,    K82,    K83,    K84,    K85,    K86,    KC_NO,  KC_NO  }, \
+    { K90,    K91,    K92,    K93,    K94,    K95,    K96,    K97,    KC_NO  }, \
+    { KA0,    KA1,    KC_NO,  KA3,    KC_NO,  KC_NO,  KA6,    KA7,    KA8    }, \
+    { KB0,    KC_NO,  KB2,    KC_NO,  KB4,    KB5,    KB6,    KB7,    KC_NO  }, \
 }

-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
--- a/keyboards/handwired/bluepill/bluepill70/chconf.h
+++ b/keyboards/handwired/bluepill/bluepill70/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/handwired/bluepill/bluepill70/rules.mk
+++ b/keyboards/handwired/bluepill/bluepill70/rules.mk
@@ -44,4 +44,8 @@ ARMV = 7
 # http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
 # This also requires a patch to chibios:
 #   <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
-#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800
+#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/handwired/ck4x4/chconf.h
+++ b/keyboards/handwired/ck4x4/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/handwired/ck4x4/rules.mk
+++ b/keyboards/handwired/ck4x4/rules.mk
@@ -15,3 +15,7 @@ NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file

 DEFAULT_FOLDER = handwired/ck4x4
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/handwired/onekey/bluepill/chconf.h
+++ b/keyboards/handwired/onekey/bluepill/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/handwired/onekey/bluepill/rules.mk
+++ b/keyboards/handwired/onekey/bluepill/rules.mk
@@ -8,3 +8,7 @@ BOARD = STM32_F103_STM32DUINO

 DFU_ARGS = -d 1eaf:0003 -a2 -R
 DFU_SUFFIX_ARGS = -v 1eaf -p 0003
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/handwired/onekey/stm32f0_disco/chconf.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/handwired/onekey/stm32f0_disco/rules.mk
+++ b/keyboards/handwired/onekey/stm32f0_disco/rules.mk
@@ -1,2 +1,6 @@
 # MCU name
 MCU = STM32F072
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/handwired/onekey/teensy_32/chconf.h
+++ b/keyboards/handwired/onekey/teensy_32/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/handwired/onekey/teensy_32/rules.mk
+++ b/keyboards/handwired/onekey/teensy_32/rules.mk
@@ -39,3 +39,7 @@ MCU  = cortex-m4
 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
 # I.e. 6 for Teensy LC; 7 for Teensy 3.x
 ARMV = 7
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/handwired/onekey/teensy_lc/chconf.h
+++ b/keyboards/handwired/onekey/teensy_lc/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/handwired/onekey/teensy_lc/rules.mk
+++ b/keyboards/handwired/onekey/teensy_lc/rules.mk
@@ -39,3 +39,7 @@ MCU  = cortex-m0plus
 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
 # I.e. 6 for Teensy LC; 7 for Teensy 3.x
 ARMV = 6
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/infinity60/chconf.h
+++ b/keyboards/infinity60/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/infinity60/rules.mk
+++ b/keyboards/infinity60/rules.mk
@@ -73,3 +73,7 @@ NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = yes # Custom matrix file

 LAYOUTS = 60_ansi_split_bs_rshift
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/jm60/chconf.h
+++ b/keyboards/jm60/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/jm60/rules.mk
+++ b/keyboards/jm60/rules.mk
@@ -34,7 +34,7 @@ ARMV = 7
 # 0x00000000-0x00001000 area is occupied by bootlaoder.*/
 # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB
 #OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000
-OPT_DEFS = 
+OPT_DEFS =

 # Build Options
 #   comment out to disable the options.
@@ -52,5 +52,9 @@ BACKLIGHT_ENABLE = no
 VISUALIZER_ENABLE = no

 #LED_DRIVER = is31fl3731c
-#LED_WIDTH = 16 
+#LED_WIDTH = 16
 #LED_HEIGHT = 5
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/k_type/chconf.h
+++ b/keyboards/k_type/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/k_type/rules.mk
+++ b/keyboards/k_type/rules.mk
@@ -74,3 +74,7 @@ SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = yes # Custom matrix file
 DEBUG_ENABLE = yes
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/maartenwut/wonderland/keymaps/rafael-azevedo/keymap.c
+++ b/keyboards/maartenwut/wonderland/keymaps/rafael-azevedo/keymap.c
@@ -0,0 +1,42 @@
+#include QMK_KEYBOARD_H
+
+#define CAPSTL CTL_T(KC_CAPS)
+
+enum layers {
+  _BASE,
+  _GAME,
+  _FUNC,
+  _RGB
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT(
+  KC_ESC, KC_GRV,  KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_PGUP,  KC_PGDN,
+ KC_HOME, KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+ KC_END,  CAPSTL,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+          KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_DEL,  MO(2),
+          TG(1),      KC_LAPO, KC_BSPC, KC_LGUI,     KC_SPC,       KC_RAPC,                   MO(3)
+   ),
+[_GAME] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, KC_BSPC,  _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,          _______,
+          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+          _______,          _______, KC_SPC,  _______,          _______,                   _______,                             _______
+   ),
+[_FUNC] = LAYOUT(
+ KC_PSCR, XXXXXXX,   KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, XXXXXXX,
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ _______, _______, KC_VOLU, KC_VOLD, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX,
+          KC_LSFT, KC_BRIU, KC_BRID, _______,  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX,
+          KC_MPLY,          KC_LALT, _______,  _______,          _______,                   KC_RALT,                            XXXXXXX
+   ),
+[_RGB] = LAYOUT(
+ RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, RESET,
+ RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+RGB_RMOD, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX,
+          KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX,
+          _______,          KC_LALT, _______, _______,          _______,                   KC_RALT,                            XXXXXXX
+   )
+};
--- a/keyboards/maartenwut/wonderland/keymaps/rafael-azevedo/readme.md
+++ b/keyboards/maartenwut/wonderland/keymaps/rafael-azevedo/readme.md
@@ -0,0 +1,9 @@
+## Rafael-Azevedo a layout for everyday use and gaming 
+
+### This layout was designed for everyday work with all necessary keys reachable from the home row, while having a toggle layer moving the space and backspace to a more traditional location. 
+
+* The main layer gives you access to home, end, pgup and pgdn. While keeping control, delete, backspace, and enter reachable when your fingers are in the home row. 
+* The main layer also includes capslock key while tapped and it becomes control when pressed. 
+* **Toggle(1)[Game]:** Toggles into a gaming layout that gives you space on your left hand thumb and moves the backspace to the traditional location. That way you can game one handed while using a mouse.  
+* **MO(2)[_FUNC]:** Is a momentary layer for all special functions including F keys , volume control, and print screen. It also keys character C and V, allowing you to copy and paste while using arrow keys. This is an easy to reach location for all special funtionality that is not normally used. 
+* **M(3)[_RGB]:** Is a momentary layer that gives you all the RGB control and keyboard Reset. This moves the funtionality not normally used to a place you won't accidently hit and get annoyed at.
--- a/keyboards/maxr1998/pulse4k/info.json
+++ b/keyboards/maxr1998/pulse4k/info.json
@@ -6,7 +6,7 @@
  "width": 3,
  "height": 2,
  "layouts": {
-    "LAYOUT_pulse4k": {
+    "LAYOUT": {
      "key_count": 6,
      "layout": [ 
        { "w": 1, "x": 0, "y": 0 }, 
--- a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
+++ b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
@@ -31,18 +31,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 void matrix_init_user(void) {
 }

+// Override if necessary
+/*
 void encoder_one_update(bool clockwise) {
-    if (clockwise) {
-        tap_code(KC_PGDN);
-    } else {
-        tap_code(KC_PGUP);
-    }
 }

 void encoder_two_update(bool clockwise) {
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
 }
+//*/
--- a/keyboards/maxr1998/pulse4k/pulse4k.c
+++ b/keyboards/maxr1998/pulse4k/pulse4k.c
@@ -59,3 +59,19 @@ void encoder_update_kb(uint8_t index, bool clockwise) {
        } else encoder_two_update(clockwise);
    }
 }
+
+__attribute__((weak)) void encoder_one_update(bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_PGDN);
+    } else {
+        tap_code(KC_PGUP);
+    }
+}
+
+__attribute__((weak)) void encoder_two_update(bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+}
--- a/keyboards/peiorisboards/ixora/chconf.h
+++ b/keyboards/peiorisboards/ixora/chconf.h
@@ -102,10 +102,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
@@ -518,4 +514,4 @@

 #endif  /* CHCONF_H */

-/** @} */
+/** @} */
--- a/keyboards/peiorisboards/ixora/rules.mk
+++ b/keyboards/peiorisboards/ixora/rules.mk
@@ -12,3 +12,7 @@ CONSOLE_ENABLE = no					# Console for debug
 COMMAND_ENABLE = no    				# Commands for debug and configuration
 NKRO_ENABLE = yes					# USB Nkey Rollover
 NO_USB_STARTUP_CHECK = no         	# Disable initialization only when usb is plugged in
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/planck/keymaps/samuel/README.org
+++ b/keyboards/planck/keymaps/samuel/README.org
@@ -7,117 +7,162 @@ before, so bear with me.

 * Layers

-#+BEGIN_COMMENT
-#+NAME: empty-layer
-| <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    |
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-| -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
-| -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
-| -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
-| -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-#+END_COMMENT
+  #+BEGIN_COMMENT
+  #+NAME: empty-layer
+  | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    |
+  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
+  | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
+  | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
+  | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
+  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  #+END_COMMENT

-This is my "pretty" org mode organized table for my main dvorak layer. If you
-don't use org mode, it won't be that exciting, but if you enjoy working in org
-mode, you can edit this table directly, and this file is tangled to the actual
-keymap. No more organizing spaces or converting to and from comments.
+  This is my "pretty" org mode organized table for my main dvorak layer. If you
+  don't use org mode, it won't be that exciting, but if you enjoy working in org
+  mode, you can edit this table directly, and this file is tangled to the actual
+  keymap. No more organizing spaces or converting to and from comments.

-#+NAME: home-layer
-|--------+--------+------+------+------+-----+-----+-----+------+-------+--------+--------|
-| T_LRSE | QUOT   | COMM | DOT  | P    | Y   | F   | G   | C    | R     | L      | T_RRSE |
-| T_LSFT | A      | O    | E    | U    | I   | D   | H   | T    | N     | S      | T_RSFT |
-| T_LCTL | SCLN   | Q    | J    | K    | X   | B   | M   | W    | V     | Z      | T_RCTL |
-| T_LGUI | T_LALT | UP   | DOWN | BSPC | TAB | ENT | SPC | LEFT | RIGHT | T_RALT | T_RGUI |
-|--------+--------+------+------+------+-----+-----+-----+------+-------+--------+--------|
+  #+NAME: home-layer
+  |--------+--------+------+------+-----+-----+------+-----+------+-------+--------+--------|
+  | T_LRSE | QUOT   | COMM | DOT  | P   | Y   | F    | G   | C    | R     | L      | T_RRSE |
+  | T_LSFT | A      | O    | E    | U   | I   | D    | H   | T    | N     | S      | T_RSFT |
+  | T_LCTL | SCLN   | Q    | J    | K   | X   | B    | M   | W    | V     | Z      | T_RCTL |
+  | T_LGUI | T_LALT | UP   | DOWN | SPC | EQL | GRAVE | SPC | LEFT | RIGHT | T_RALT | T_RGUI |
+  |--------+--------+------+------+-----+-----+------+-----+------+-------+--------+--------|

-This qwerty layout is just so normal people can try out the board. Tap keys
-would need to be customized I think, more on that later. I also put another
-dvorak key here because I have nightmares of getting trapped in this forsaken
-layout.
+  Tap keys. Used only with the "T_" keys above.

-#+NAME: qwerty-layer
-|--------+--------+----+------+------+-----+-----+-----+------+-------+--------+--------|
-| T_LRSE | Q      | W  | E    | R    | T   | Y   | U   | I    | O     | P      | T_RRSE |
-| T_LSFT | A      | S  | D    | F    | G   | H   | J   | K    | L     | SCLN   | T_RSFT |
-| T_LCTL | Z      | X  | C    | V    | B   | N   | M   | COMM | DOT   | QUOT   | T_RCTL |
-| T_LGUI | T_LALT | UP | DOWN | BSPC | TAB | ENT | SPC | LEFT | RIGHT | T_RALT | DVORAK |
-|--------+--------+----+------+------+-----+-----+-----+------+-------+--------+--------|
+  #+NAME: tap-layer
+  |----------+------+---+---+---+---+---+---+---+---+------+----------|
+  | DEL      | -    | - | - | - | - | - | - | - | - | -    | BSPC     |
+  | TAB      | -    | - | - | - | - | - | - | - | - | -    | ENTER    |
+  | LBRACKET | -    | - | - | - | - | - | - | - | - | -    | RBRACKET |
+  | SLASH    | LPRN | - | - | - | - | - | - | - | - | RPRN | MINS     |
+  |----------+------+---+---+---+---+---+---+---+---+------+----------|

-I tried to keep my layout bare bones, just what would be available on a normal
-keyboard, minus some keys I never used. This one secondary layer should cover a
-majority of the keys not found on the home layer. The bottom left copies a normal
-keyboards symbols from shifted numbers, and the rest is placed where convenient,
-with some considerations for one handed use, hence the shortcuts in the top
-left.
+  #+NAME: hold-layer
+  |------+------+---+---+---+---+---+---+---+---+------+------|
+  | RISE | -    | - | - | - | - | - | - | - | - | -    | RISE |
+  | LSFT | -    | - | - | - | - | - | - | - | - | -    | RSFT |
+  | LCTL | -    | - | - | - | - | - | - | - | - | -    | RCTL |
+  | LGUI | LALT | - | - | - | - | - | - | - | - | RALT | RGUI |
+  |------+------+---+---+---+---+---+---+---+---+------+------|

-#+NAME: secondary-layer
-|--------+--------+--------+--------+--------+------+------+-----+--------+--------+-------+--------|
-| --     | EZUNDO | EZCOPY | EZCUT  | EZPSTE | INS  | EQL  |   7 |      8 |      9 | --    | --     |
-| EZSHFT | ESC    | CAPS   | PGUP   | PGDN   | HOME | ASTR |   4 |      5 |      6 | 0     | EZSHFT |
-| EZCTRL | EXLM   | AT     | HASH   | DLR    | PERC | CIRC |   1 |      2 |      3 | COM   | EZCTRL |
-| EZGUI  | EZALT  | EZUP   | EZDOWN | SPC    | AMPR | PIPE | END | EZLEFT | EZRGHT | EZALT | EZGUI  |
-|--------+--------+--------+--------+--------+------+------+-----+--------+--------+-------+--------|
+  I tried to keep my layout bare bones, just what would be available on a normal
+  keyboard, minus some keys I never used. This one secondary layer should cover a
+  majority of the keys not found on the home layer. The bottom left copies a normal
+  keyboards symbols from shifted numbers, and the rest is placed where convenient,
+  with some considerations for one handed use, hence the shortcuts in the top
+  left.

-Basic command layer for one-shot macros and function keys.
+  #+NAME: secondary-layer
+  |--------+--------+--------+--------+--------+------+--------+-----+--------+--------+-------+--------|
+  | --     | EZUNDO | EZCOPY | EZCUT  | EZPSTE | INS  | ASTR   |   7 |      8 |      9 | --    | --     |
+  | EZSHFT | ESC    | CAPS   | PGUP   | PGDN   | HOME | AMPR   |   4 |      5 |      6 | 0     | EZSHFT |
+  | EZCTRL | EXLM   | AT     | HASH   | DLR    | PERC | CIRC   |   1 |      2 |      3 | COM   | EZCTRL |
+  | EZGUI  | EZALT  | EZUP   | EZDOWN | SPC    | PIPE | BSLASH | END | EZLEFT | EZRGHT | EZALT | EZGUI  |
+  |--------+--------+--------+--------+--------+------+--------+-----+--------+--------+-------+--------|

-#+NAME: command-layer
-|----+-----+-----+-----+-----+--------+--------+------+-------+------+-----+----|
-| -- | F1  | F2  | F3  | F4  | F5     | F6     | F7   | F8    | F9   | F10 | -- |
-| -- | F11 | F12 | F13 | F14 | F15    | F16    | F17  | F18   | F19  | F20 | -- |
-| -- | F21 | F22 | F23 | F24 | QWERTY | DVORAK | USER | EMAIL | NAME | --  | -- |
-| -- | --  | --  | --  | --  | --     | --     | DIR  | --    | --   | --  | -- |
-|----+-----+-----+-----+-----+--------+--------+------+-------+------+-----+----|
+  Basic command layer for one-shot macros and function keys.
+
+  #+NAME: command-layer
+  |----+-----+-----+-----+-----+--------+--------+-----+-----+-----+-----+----|
+  | -- | F1  | F2  | F3  | F4  | F5     | F6     | F7  | F8  | F9  | F10 | -- |
+  | -- | F11 | F12 | F13 | F14 | F15    | F16    | F17 | F18 | F19 | F20 | -- |
+  | -- | F21 | F22 | F23 | F24 | QWERTY | DVORAK | --  | --  | --  | --  | -- |
+  | -- | --  | --  | --  | --  | --     | --     | --  | --  | --  | --  | -- |
+  |----+-----+-----+-----+-----+--------+--------+-----+-----+-----+-----+----|
+
+  This qwerty layout is just so normal people can try out the board. Tap keys
+  would need to be customized I think, more on that later. I also put another
+  dvorak key here because I have nightmares of getting trapped in this forsaken
+  layout.
+
+  #+NAME: qwerty-layer
+  |--------+--------+----+------+-----+-----+------+-----+------+-------+--------+--------|
+  | T_LRSE | Q      | W  | E    | R   | T   | Y    | U   | I    | O     | P      | T_RRSE |
+  | T_LSFT | A      | S  | D    | F   | G   | H    | J   | K    | L     | SCLN   | T_RSFT |
+  | T_LCTL | Z      | X  | C    | V   | B   | N    | M   | COMM | DOT   | QUOT   | T_RCTL |
+  | T_LGUI | T_LALT | UP | DOWN | SPC | EQL | GRAVE | SPC | LEFT | RIGHT | T_RALT | DVORAK |
+  |--------+--------+----+------+-----+-----+------+-----+------+-------+--------+--------|

-But wait, we are missing several important keys? well, yes, but the modifier keys
-all do other keys when tapped. More about that in the keymap section.

 * Keymap Conversion in Python

-This python can convert that table into the array needed for the keymap file. It
-simply prepends every key with "KC_". I used to use a dictionary to convert some
-keys from the table into qmk keycodes, but the double convertion was
-unneccessary so I just prepended all my macros with KC and moved all the
-implementation to the `process-user-input` function.
+  This python can convert that table into the array needed for the keymap file. It
+  simply prepends every key with "KC_". I used to use a dictionary to convert some
+  keys from the table into qmk keycodes, but the double convertion was
+  unneccessary so I just prepended all my macros with KC and moved all the
+  implementation to the `process-user-input` function.

-#+NAME:layer-to-array
-#+BEGIN_SRC python :var keys=secondary-layer :tangle no
-results = "{"
-row = 0
-while row < len(keys):
-  results += '{ '
-  key = 0
-  while key < len(keys[row]):
-    keyName = str(keys[row][key])
+  #+NAME:layer-to-array
+  #+BEGIN_SRC python :var keys=secondary-layer :tangle no
+  row = 0
+  results = ''
+  while row < len(keys):
+    key = 0
+    while key < len(keys[row]):
+      keyName = str(keys[row][key])
+      if keyName == '--':
+        keyName = 'TRANSPARENT'
+      results += 'KC_' + keyName
+      if key != 11:
+        results += ', '
+      key+=1
+    if row != 3:
+      results += ','
+    results += '\n'
+    row+=1
+  return results
+  #+END_SRC
+
+  Tap keys are technically defined in the mod_lift function. but this is will
+  implement that function from the org table.
+
+  #+NAME:define-tap-key
+  #+BEGIN_SRC python :var row=3 :var col=1 :var id=0 :var tapkeys=tap-layer :var holdkeys=hold-layer :tangle no
+  def getKey(keys, istapkey):
+    if istapkey == True:
+      keyName = str(keys[row][col])
+    else:
+      keyName = str(keys[row][col])
    if keyName == '--':
      keyName = 'TRANSPARENT'
-    results += 'KC_' + keyName
-    if key != 11:
-      results += ', '
-    key+=1
-  results += '}'
-  if row != 3:
-    results += ','
-  results += '\n'
-  row+=1
-results += '},\n'
-return results
-#+END_SRC
+    if istapkey == False:
+      return 'KC_T_' + keyName, 'KC_' + keyName
+    else:
+      return 'KC_' + keyName
+  tapKeyName = getKey(tapkeys, True)
+  holdKeyMacro, holdKeyName = getKey(holdkeys, False)
+  return """case %s:
+  if (record->event.pressed) {
+     mod_press(%s, %s, %i);
+  } else {
+     mod_lift(%s, %s, %i);
+  }
+  return false;
+  break;""" % (holdKeyMacro, tapKeyName, holdKeyName, id, tapKeyName, holdKeyName, id)
+
+  #+END_SRC
+

 * keymap.c

-Now that we laid out our layout, lets lay out our kemap file.
+  Now that we laid out our layout, lets lay out our keymap file.

-#+BEGIN_SRC C :noweb yes
+** Headers
+
+   #+BEGIN_SRC C :noweb yes
 #include QMK_KEYBOARD_H

 extern keymap_config_t keymap_config;

-#+END_SRC
+   #+END_SRC

 ** Keycodes

-#+BEGIN_SRC C :noweb yes
+   #+BEGIN_SRC C :noweb yes
 // where the 'T_' communicates how the key does something different when tapped.
 enum planck_keycodes {
 //DVORAK = SAFE_RANGE,
@@ -145,18 +190,14 @@ KC_EZGUI,
 KC_EZALT,
 KC_DVORAK,
 KC_QWERTY,
-KC_USER,
-KC_EMAIL,
-KC_NAME,
-KC_DIR,
 KC_COM
 };

-#+END_SRC
+   #+END_SRC

 ** Import Key table

-#+BEGIN_SRC C :noweb yes
+   #+BEGIN_SRC C :noweb yes
 enum planck_layers {
 _DVORAK,
 _QWERTY,
@@ -166,457 +207,286 @@ _COMMAND

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-#+END_SRC
+   #+END_SRC

-#+BEGIN_SRC C :noweb yes
-[_DVORAK] =
-
-#+END_SRC
-
-#+BEGIN_SRC C :noweb yes
+   #+BEGIN_SRC C :noweb yes
+[_DVORAK] = LAYOUT_planck_grid(
 <<layer-to-array(home-layer)>>
-
-#+END_SRC
-
-#+BEGIN_SRC C :noweb yes
-[_QWERTY] =
-
-#+END_SRC
-
-#+BEGIN_SRC C :noweb yes
+),
+[_QWERTY] = LAYOUT_planck_grid(
 <<layer-to-array(qwerty-layer)>>
-
-#+END_SRC
-
-#+BEGIN_SRC C :noweb yes
-[_RISE] =
-
-#+END_SRC
-
-#+BEGIN_SRC C :noweb yes
+),
+[_RISE] = LAYOUT_planck_grid(
 <<layer-to-array(secondary-layer)>>
-
-#+END_SRC
-
-#+BEGIN_SRC C :noweb yes
-[_COMMAND] =
-
-#+END_SRC
-
-#+BEGIN_SRC C :noweb yes
+),
+[_COMMAND] = LAYOUT_planck_grid(
 <<layer-to-array(command-layer)>>
-
-#+END_SRC
-
-#+BEGIN_SRC C :noweb yes
+)
 };

-#+END_SRC
+   #+END_SRC

 ** Tap Keys

-I don't like tap keys coming out on release. When modified, I often let go of
-the modifier too early because the tap button doesn't come out untill release. I
-guess you could save the state of the board on press and then apply it after the
-timer, but what I really want is the keys to come out on press when they can and
-when it is most useful. For me, that is when they are modified a single time. So
-I kind "locked" the board into only doing single modifiers, making them faster.
-Disadvantages are double modified keys must be done with one shot keys (its
-actually not that bad, it feels like emacs!) and triple modified keys are
-impossible at the moment.
+   I don't like tap keys coming out on release. When modified, I often let go of
+   the modifier too early because the tap button doesn't come out untill release. I
+   guess you could save the state of the board on press and then apply it after the
+   timer, but what I really want is the keys to come out on press when they can and
+   when it is most useful. For me, that is when they are modified a single time. So
+   I kind of "locked" the board into only doing single modifiers, making them faster.
+   Disadvantages are double modified keys must be done with one shot keys (its
+   actually not that bad, it feels like emacs!) and triple modified keys are
+   impossible at the moment.

-#+BEGIN_SRC C :noweb yes
+   #+BEGIN_SRC C :noweb yes

-static uint16_t tap_timer = 0;
-char last_mod = 10;
+  static uint16_t tap_timer = 0;
+  char last_mod = 10;

-void mod_press(uint16_t tap_code, uint16_t hold_code, int id) {
-    // this first if body makes double modified keys impossible, but stops the
-    // delay when modifying a tap key which would result in the tap key not
-    // getting modified.
-    if (last_mod != id && last_mod != 10) {
-        tap_code16(tap_code);
-        last_mod = 10;
-    } else {
-        tap_timer = timer_read();
-        last_mod = id;
-        register_code(hold_code);
-    }
-}
+  void mod_press(uint16_t tap_code, uint16_t hold_code, int id) {
+      /* this first if body makes double modified keys impossible, but stops the */
+      /* delay when modifying a tap key which would result in the tap key not */
+      /* getting modified. */
+      if (last_mod != id && last_mod != 10) {
+          tap_code16(tap_code);
+          last_mod = 10;
+      } else {
+          tap_timer = timer_read();
+          last_mod = id;
+          register_code(hold_code);
+      }
+  }

-void mod_lift(uint16_t tap_code, uint16_t hold_code, int id) {
-    unregister_code(hold_code);
-    if (last_mod == id && timer_elapsed(tap_timer) < TAPPING_TERM) {
-        tap_code16(tap_code);
-        last_mod = 10;
-    }
-}
-
-#+END_SRC
+  void mod_lift(uint16_t tap_code, uint16_t hold_code, int id) {
+      unregister_code(hold_code);
+      if (last_mod == id && timer_elapsed(tap_timer) < TAPPING_TERM) {
+          tap_code16(tap_code);
+      }
+      last_mod = 10;
+  }

+   #+END_SRC
 ** Process User Input

-#+BEGIN_SRC C :noweb yes
+   #+BEGIN_SRC C :noweb yes
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    switch (keycode) {
-#+END_SRC
+   #+END_SRC

-** Layouts
+*** Layouts

-Set Dvorak layout
+    Set Dvorak layout

-#+BEGIN_SRC C :noweb yes
-case KC_DVORAK:
-if (record->event.pressed) {
-    set_single_persistent_default_layer(_DVORAK);
-}
-return true;
-break;
+    #+BEGIN_SRC C :noweb yes
+ case KC_DVORAK:
+ if (record->event.pressed) {
+     set_single_persistent_default_layer(_DVORAK);
+ }
+ return true;
+ break;

-#+END_SRC
+    #+END_SRC

-Set Qwerty layout.
+    Set Qwerty layout.

-#+BEGIN_SRC C :noweb yes
-case KC_QWERTY:
-if (record->event.pressed) {
-    set_single_persistent_default_layer(_QWERTY);
-}
-return true;
-break;
+    #+BEGIN_SRC C :noweb yes
+ case KC_QWERTY:
+ if (record->event.pressed) {
+     set_single_persistent_default_layer(_QWERTY);
+ }
+ return true;
+ break;

-#+END_SRC
+    #+END_SRC

-** Alt and ()
+*** Custom Keys
+**** Command Layer One Shot

-Left and right alt are ( and ) when tapped. I put them on alt instead of a more
-conveniant key like control because parentheses do not need to be shift modified
-ever, unlike some other tap keys seen in the next sections.
+    #+BEGIN_SRC C :noweb yes
+ case KC_COM:
+ if (record->event.pressed) {
+     layer_on(_COMMAND);
+     set_oneshot_layer(_COMMAND, ONESHOT_START);
+     last_mod = 10;
+ } else {
+     clear_oneshot_layer_state (ONESHOT_PRESSED);
+ }
+ return false;
+ break;
+    #+END_SRC

-#+BEGIN_SRC C :noweb yes
-case KC_T_LALT:
-if (record->event.pressed) {
-    mod_press(S(KC_9), KC_LALT, 0);
-} else {
-    mod_lift(S(KC_9), KC_LALT, 0);
-}
-return false;
-break;
-case KC_T_RALT:
-if (record->event.pressed) {
-    mod_press(S(KC_0), KC_RALT, 1);
-} else {
-    mod_lift(S(KC_0), KC_RALT, 1);
-}
-return false;
-break;
+**** Tap Keys

-#+END_SRC
+    #+BEGIN_SRC C :noweb yes
+    <<define-tap-key(3, 1, 0)>>
+    <<define-tap-key(3, 10, 1)>>
+    <<define-tap-key(3, 0, 2)>>
+    <<define-tap-key(3, 11, 3)>>
+    <<define-tap-key(2, 0, 4)>>
+    <<define-tap-key(2, 11, 5)>>
+    <<define-tap-key(1, 0, 6)>>
+    <<define-tap-key(1, 11, 7)>>
+    #+END_SRC

-** Gui and `\
+**** Rise Keys

-I place gui in the bottom corner because I believe it is the hardest key to
-reach, so gui seemed like a good fit for a dedicated key that I never want to
-have to spam. For tap keys, I used equally unused keys that are not apart of the
-number pad or shifted number keys.
+    #+BEGIN_SRC C :noweb yes
+ case KC_T_LRSE:
+ if (record->event.pressed) {
+     tap_timer = timer_read();
+     last_mod = 8;
+     layer_on(_RISE);
+ } else {
+     layer_off(_RISE);
+     if (last_mod == 8 && timer_elapsed(tap_timer) < TAPPING_TERM) {
+         tap_code16(KC_DELETE);
+         last_mod = 10;
+     }
+ }
+ return false;
+ break;
+ case KC_T_RRSE:
+ if (record->event.pressed) {
+     tap_timer = timer_read();
+     last_mod = 9;
+     layer_on(_RISE);
+ } else {
+     layer_off(_RISE);
+     if (last_mod == 9 && timer_elapsed(tap_timer) < TAPPING_TERM) {
+         tap_code16(KC_BSPACE);
+         last_mod = 10;
+     }
+ }
+ return false;
+ break;

-#+BEGIN_SRC C :noweb yes
-case KC_T_LGUI:
-if (record->event.pressed) {
-    mod_press(KC_GRAVE, KC_LGUI, 2);
-} else {
-    mod_lift(KC_GRAVE, KC_LGUI, 2);
-}
-return false;
-break;
-case KC_T_RGUI:
-if (record->event.pressed) {
-    mod_press(KC_BSLASH, KC_RGUI, 3);
-} else {
-    mod_lift(KC_BSLASH, KC_RGUI, 3);
-}
-return false;
-break;
+    #+END_SRC

-#+END_SRC
+**** One Shot Keys

-** Ctrl and []
+     Since I made modified tap keys occur on press instead of release, I need one
+     shot keys to press any key with more than one modifier.

-Left and right control are [] respectively when they are tapped, making { and }
-also very convenient.
+     #+BEGIN_SRC C :noweb yes
+ case KC_EZSHFT:
+ if (record->event.pressed) {
+     set_oneshot_mods(MOD_LSFT);
+     last_mod = 10;
+ }
+ return false;
+ break;
+ case KC_EZCTRL:
+ if (record->event.pressed) {
+     set_oneshot_mods(MOD_LCTL);
+     last_mod = 10;
+ }
+ return false;
+ break;
+ case KC_EZALT:
+ if (record->event.pressed) {
+     set_oneshot_mods(MOD_LALT);
+     last_mod = 10;
+ }
+ return false;
+ break;
+ case KC_EZGUI:
+ if (record->event.pressed) {
+     set_oneshot_mods(MOD_LGUI);
+     last_mod = 10;
+ }
+ return false;
+ break;

-#+BEGIN_SRC C :noweb yes
-case KC_T_LCTL:
-if (record->event.pressed) {
-    mod_press(KC_LBRACKET, KC_LCTL, 4);
-} else {
-    mod_lift(KC_LBRACKET, KC_LCTL, 4);
-}
-return false;
-break;
-case KC_T_RCTL:
-if (record->event.pressed) {
-    mod_press(KC_RBRACKET, KC_RCTL, 5);
-} else {
-    mod_lift(KC_RBRACKET, KC_RCTL, 5);
-}
-return false;
-break;
+     #+END_SRC

-#+END_SRC
+**** C-S Arrows

-** Shft and =-
+     I use ctrl+shift+arrows keys a lot, so when the layer key is pressed they became
+     lazy versions of themselves with control and shift already pressed.

-I place shift on the home row, so having '-' right of my pinkie is standard, and
-it only felt natural to put its opposite, '=/+' on the other side. I put an
-extra one on the right side in the secondary layer for the num pad.
+     I also added undo, copy, paste, and cut to be easily available with only the
+     left hand like on a qwerty or colemek keyboard.

-#+BEGIN_SRC C :noweb yes
-case KC_T_LSFT:
-if (record->event.pressed) {
-    mod_press(KC_EQUAL, KC_LSFT, 6);
-} else {
-    mod_lift(KC_EQUAL, KC_LSFT, 6);
-}
-return false;
-break;
-case KC_T_RSFT:
-if (record->event.pressed) {
-    mod_press(KC_MINUS, KC_RSFT, 7);
-} else {
-    mod_lift(KC_MINUS, KC_RSFT, 7);
-}
-return false;
-break;
+     #+BEGIN_SRC C :noweb yes
+ case KC_EZRGHT:
+ if (record->event.pressed) {
+     register_code(KC_LCTL);
+     tap_code16(S(KC_RGHT));
+     unregister_code(KC_LCTL);
+     last_mod = 10;
+ }
+ return false;
+ break;
+ case KC_EZLEFT:
+ if (record->event.pressed) {
+     register_code(KC_LCTL);
+     tap_code16(S(KC_LEFT));
+     unregister_code(KC_LCTL);
+     last_mod = 10;
+ }
+ return false;
+ break;
+ case KC_EZDOWN:
+ if (record->event.pressed) {
+     register_code(KC_LCTL);
+     tap_code16(S(KC_DOWN));
+     unregister_code(KC_LCTL);
+     last_mod = 10;
+ }
+ return false;
+ break;
+ case KC_EZUP:
+ if (record->event.pressed) {
+     register_code(KC_LCTL);
+     tap_code16(S(KC_UP));
+     unregister_code(KC_LCTL);
+     last_mod = 10;
+ }
+ return false;
+ break;
+     #+END_SRC

-#+END_SRC
+**** Undo, Copy, Cut, Paste

-** Rise, DEL, and /
+     #+BEGIN_SRC C :noweb yes
+ case KC_EZUNDO:
+ if (record->event.pressed) {
+     tap_code16(C(KC_Z));
+     last_mod = 10;
+ }
+ return false;
+ break;
+ case KC_EZCOPY:
+ if (record->event.pressed) {
+     tap_code16(C(KC_C));
+     last_mod = 10;
+ }
+ return false;
+ break;
+ case KC_EZCUT:
+ if (record->event.pressed) {
+     tap_code16(C(KC_X));
+     last_mod = 10;
+ }
+ return false;
+ break;
+ case KC_EZPSTE:
+ if (record->event.pressed) {
+     tap_code16(C(KC_V));
+     last_mod = 10;
+ }
+ return false;
+ break;
+     #+END_SRC

-I use the top corners as rise because I decided that I do not like using layers
-with my thumbs. It feels uncomfortable to hold keys down with the side of my
-thumb, and backspace, tab, enter, and spacebar keep them satisfied. My pinky is
-for holding modifiers, so it makes sense to put the layer key with the other
-modifiers. Both my left and right layer keys activate the same layer which also
-makes sense to me. You wouldn't want left and right shift to do different things
+*** Standard inputs interupt tap

-I used to have escape in the top left, but I use delete a lot more, and putting
-escape under a layer has not been a problem at all. I put / in the top right
-corner again mimicing a standard dvorak keyboard.
+    Finally, if just a standard key is tapped, set the interupted flag.
+    Keep this last.

-#+BEGIN_SRC C :noweb yes
-case KC_T_LRSE:
-if (record->event.pressed) {
-    tap_timer = timer_read();
-    last_mod = 8;
-    layer_on(_RISE);
-} else {
-    layer_off(_RISE);
-    if (last_mod == 8 && timer_elapsed(tap_timer) < TAPPING_TERM) {
-        tap_code16(KC_DELETE);
-        last_mod = 10;
-    }
-}
-return false;
-break;
-case KC_T_RRSE:
-if (record->event.pressed) {
-    tap_timer = timer_read();
-    last_mod = 9;
-    layer_on(_RISE);
-} else {
-    layer_off(_RISE);
-    if (last_mod == 9 && timer_elapsed(tap_timer) < TAPPING_TERM) {
-        tap_code16(KC_SLASH);
-        last_mod = 10;
-    }
-}
-return false;
-break;
-
-#+END_SRC
-
-** EZ Keys
-
-EZ or "easy" keys do things that can already be done on the board, but I want an
-easier way of doing them.
-
-*** One Shot Keys
-
-Since I made modified tap keys occur on press instead of release, I need one
-shot keys to press any key with more than one modifier.
-
-#+BEGIN_SRC C :noweb yes
-case KC_EZSHFT:
-if (record->event.pressed) {
-    set_oneshot_mods(MOD_LSFT);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZCTRL:
-if (record->event.pressed) {
-    set_oneshot_mods(MOD_LCTL);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZALT:
-if (record->event.pressed) {
-    set_oneshot_mods(MOD_LALT);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZGUI:
-if (record->event.pressed) {
-    set_oneshot_mods(MOD_LGUI);
-    last_mod = 10;
-}
-return false;
-break;
-
-#+END_SRC
-
-*** Arrows
-
-I use ctrl+shift+arrows keys a lot, so when the layer key is pressed they became
-lazy versions of themselves with control and shift already pressed.
-
-I also added undo, copy, paste, and cut to be easily available with only the
-left hand like on a qwerty or colemek keyboard.
-
-#+BEGIN_SRC C :noweb yes
-case KC_EZRGHT:
-if (record->event.pressed) {
-    register_code(KC_LCTL);
-    tap_code16(S(KC_RGHT));
-    unregister_code(KC_LCTL);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZLEFT:
-if (record->event.pressed) {
-    register_code(KC_LCTL);
-    tap_code16(S(KC_LEFT));
-    unregister_code(KC_LCTL);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZDOWN:
-if (record->event.pressed) {
-    register_code(KC_LCTL);
-    tap_code16(S(KC_DOWN));
-    unregister_code(KC_LCTL);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZUP:
-if (record->event.pressed) {
-    register_code(KC_LCTL);
-    tap_code16(S(KC_UP));
-    unregister_code(KC_LCTL);
-    last_mod = 10;
-}
-return false;
-break;
-#+END_SRC
-
-*** Undo, Copy, Cut, Paste
-
-#+BEGIN_SRC C :noweb yes
-case KC_EZUNDO:
-if (record->event.pressed) {
-    tap_code16(C(KC_Z));
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZCOPY:
-if (record->event.pressed) {
-    tap_code16(C(KC_C));
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZCUT:
-if (record->event.pressed) {
-    tap_code16(C(KC_X));
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZPSTE:
-if (record->event.pressed) {
-    tap_code16(C(KC_V));
-    last_mod = 10;
-}
-return false;
-break;
-#+END_SRC
-
-** Commands
-
-Start command layer one shot
-
-#+BEGIN_SRC C :noweb yes
-case KC_COM:
-if (record->event.pressed) {
-    layer_on(_COMMAND);
-    set_oneshot_layer(_COMMAND, ONESHOT_START);
-    last_mod = 10;
-} else {
-    clear_oneshot_layer_state (ONESHOT_PRESSED);
-}
-return false;
-break;
-#+END_SRC
-
-Just some strings I notice that I type a lot.
-
-#+BEGIN_SRC C :noweb yes
-case KC_USER:
-if (record->event.pressed) {
-    send_string("mhostley");
-    last_mod = 10;
-}
-return true;
-break;
-case KC_EMAIL:
-if (record->event.pressed) {
-    send_string("mhostley@gmail.com");
-    last_mod = 10;
-}
-return true;
-break;
-case KC_NAME:
-if (record->event.pressed) {
-    send_string("Samuel Jahnke");
-    last_mod = 10;
-}
-return true;
-break;
-case KC_DIR:
-if (record->event.pressed) {
-    send_string("home/mhostley/");
-    last_mod = 10;
-}
-return true;
-break;
-
-#+END_SRC
-
-** Standard inputs interupt tap
-
-Finally, if just a standard key is tapped, set the interupted flag.
-Keep this last.
-
-#+BEGIN_SRC C :noweb yes
-}
-last_mod = 10;
-return true;
-}
-#+END_SRC
+    #+BEGIN_SRC C :noweb yes
+ }
+ last_mod = 10;
+ return true;
+ }
+    #+END_SRC
--- a/keyboards/planck/keymaps/samuel/keymap.c
+++ b/keyboards/planck/keymaps/samuel/keymap.c
@@ -29,10 +29,6 @@ KC_EZGUI,
 KC_EZALT,
 KC_DVORAK,
 KC_QWERTY,
-KC_USER,
-KC_EMAIL,
-KC_NAME,
-KC_DIR,
 KC_COM
 };

@@ -45,47 +41,39 @@ _COMMAND

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-[_DVORAK] =
-
-{{ KC_T_LRSE, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_T_RRSE},
-{ KC_T_LSFT, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_T_RSFT},
-{ KC_T_LCTL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_T_RCTL},
-{ KC_T_LGUI, KC_T_LALT, KC_UP, KC_DOWN, KC_BSPC, KC_TAB, KC_ENT, KC_SPC, KC_LEFT, KC_RIGHT, KC_T_RALT, KC_T_RGUI}
-},
-
-[_QWERTY] =
-
-{{ KC_T_LRSE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_T_RRSE},
-{ KC_T_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_T_RSFT},
-{ KC_T_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT, KC_T_RCTL},
-{ KC_T_LGUI, KC_T_LALT, KC_UP, KC_DOWN, KC_BSPC, KC_TAB, KC_ENT, KC_SPC, KC_LEFT, KC_RIGHT, KC_T_RALT, KC_DVORAK}
-},
-
-[_RISE] =
-
-{{ KC_TRANSPARENT, KC_EZUNDO, KC_EZCOPY, KC_EZCUT, KC_EZPSTE, KC_INS, KC_EQL, KC_7, KC_8, KC_9, KC_TRANSPARENT, KC_TRANSPARENT},
-{ KC_EZSHFT, KC_ESC, KC_CAPS, KC_PGUP, KC_PGDN, KC_HOME, KC_ASTR, KC_4, KC_5, KC_6, KC_0, KC_EZSHFT},
-{ KC_EZCTRL, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_1, KC_2, KC_3, KC_COM, KC_EZCTRL},
-{ KC_EZGUI, KC_EZALT, KC_EZUP, KC_EZDOWN, KC_SPC, KC_AMPR, KC_PIPE, KC_END, KC_EZLEFT, KC_EZRGHT, KC_EZALT, KC_EZGUI}
-},
-
-[_COMMAND] =
-
-{{ KC_TRANSPARENT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRANSPARENT},
-{ KC_TRANSPARENT, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_TRANSPARENT},
-{ KC_TRANSPARENT, KC_F21, KC_F22, KC_F23, KC_F24, KC_QWERTY, KC_DVORAK, KC_USER, KC_EMAIL, KC_NAME, KC_TRANSPARENT, KC_TRANSPARENT},
-{ KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_DIR, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT}
-},
-
+[_DVORAK] = LAYOUT_planck_grid(
+KC_T_LRSE, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_T_RRSE,
+KC_T_LSFT, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_T_RSFT,
+KC_T_LCTL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_T_RCTL,
+KC_T_LGUI, KC_T_LALT, KC_UP, KC_DOWN, KC_SPC, KC_EQL, KC_GRAVE, KC_SPC, KC_LEFT, KC_RIGHT, KC_T_RALT, KC_T_RGUI
+),
+[_QWERTY] = LAYOUT_planck_grid(
+KC_T_LRSE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_T_RRSE,
+KC_T_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_T_RSFT,
+KC_T_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT, KC_T_RCTL,
+KC_T_LGUI, KC_T_LALT, KC_UP, KC_DOWN, KC_SPC, KC_EQL, KC_GRAVE, KC_SPC, KC_LEFT, KC_RIGHT, KC_T_RALT, KC_DVORAK
+),
+[_RISE] = LAYOUT_planck_grid(
+KC_TRANSPARENT, KC_EZUNDO, KC_EZCOPY, KC_EZCUT, KC_EZPSTE, KC_INS, KC_ASTR, KC_7, KC_8, KC_9, KC_TRANSPARENT, KC_TRANSPARENT,
+KC_EZSHFT, KC_ESC, KC_CAPS, KC_PGUP, KC_PGDN, KC_HOME, KC_AMPR, KC_4, KC_5, KC_6, KC_0, KC_EZSHFT,
+KC_EZCTRL, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_1, KC_2, KC_3, KC_COM, KC_EZCTRL,
+KC_EZGUI, KC_EZALT, KC_EZUP, KC_EZDOWN, KC_SPC, KC_PIPE, KC_BSLASH, KC_END, KC_EZLEFT, KC_EZRGHT, KC_EZALT, KC_EZGUI
+),
+[_COMMAND] = LAYOUT_planck_grid(
+KC_TRANSPARENT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRANSPARENT,
+KC_TRANSPARENT, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_TRANSPARENT,
+KC_TRANSPARENT, KC_F21, KC_F22, KC_F23, KC_F24, KC_QWERTY, KC_DVORAK, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
+KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
+)
 };

 static uint16_t tap_timer = 0;
 char last_mod = 10;

 void mod_press(uint16_t tap_code, uint16_t hold_code, int id) {
-    // this first if body makes double modified keys impossible, but stops the
-    // delay when modifying a tap key which would result in the tap key not
-    // getting modified.
+    /* this first if body makes double modified keys impossible, but stops the */
+    /* delay when modifying a tap key which would result in the tap key not */
+    /* getting modified. */
    if (last_mod != id && last_mod != 10) {
        tap_code16(tap_code);
        last_mod = 10;
@@ -100,8 +88,8 @@ void mod_lift(uint16_t tap_code, uint16_t hold_code, int id) {
    unregister_code(hold_code);
    if (last_mod == id && timer_elapsed(tap_timer) < TAPPING_TERM) {
        tap_code16(tap_code);
-        last_mod = 10;
    }
+    last_mod = 10;
 }

 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -121,73 +109,81 @@ if (record->event.pressed) {
 return true;
 break;

+case KC_COM:
+if (record->event.pressed) {
+    layer_on(_COMMAND);
+    set_oneshot_layer(_COMMAND, ONESHOT_START);
+    last_mod = 10;
+} else {
+    clear_oneshot_layer_state (ONESHOT_PRESSED);
+}
+return false;
+break;
+
 case KC_T_LALT:
-if (record->event.pressed) {
-    mod_press(S(KC_9), KC_LALT, 0);
-} else {
-    mod_lift(S(KC_9), KC_LALT, 0);
-}
-return false;
-break;
+	if (record->event.pressed) {
+	   mod_press(KC_LPRN, KC_LALT, 0);
+	} else {
+	   mod_lift(KC_LPRN, KC_LALT, 0);
+	}
+	return false;
+	break;
 case KC_T_RALT:
-if (record->event.pressed) {
-    mod_press(S(KC_0), KC_RALT, 1);
-} else {
-    mod_lift(S(KC_0), KC_RALT, 1);
-}
-return false;
-break;
-
+	if (record->event.pressed) {
+	   mod_press(KC_RPRN, KC_RALT, 1);
+	} else {
+	   mod_lift(KC_RPRN, KC_RALT, 1);
+	}
+	return false;
+	break;
 case KC_T_LGUI:
-if (record->event.pressed) {
-    mod_press(KC_GRAVE, KC_LGUI, 2);
-} else {
-    mod_lift(KC_GRAVE, KC_LGUI, 2);
-}
-return false;
-break;
+	if (record->event.pressed) {
+	   mod_press(KC_SLASH, KC_LGUI, 2);
+	} else {
+	   mod_lift(KC_SLASH, KC_LGUI, 2);
+	}
+	return false;
+	break;
 case KC_T_RGUI:
-if (record->event.pressed) {
-    mod_press(KC_BSLASH, KC_RGUI, 3);
-} else {
-    mod_lift(KC_BSLASH, KC_RGUI, 3);
-}
-return false;
-break;
-
+	if (record->event.pressed) {
+	   mod_press(KC_MINS, KC_RGUI, 3);
+	} else {
+	   mod_lift(KC_MINS, KC_RGUI, 3);
+	}
+	return false;
+	break;
 case KC_T_LCTL:
-if (record->event.pressed) {
-    mod_press(KC_LBRACKET, KC_LCTL, 4);
-} else {
-    mod_lift(KC_LBRACKET, KC_LCTL, 4);
-}
-return false;
-break;
+	if (record->event.pressed) {
+	   mod_press(KC_LBRACKET, KC_LCTL, 4);
+	} else {
+	   mod_lift(KC_LBRACKET, KC_LCTL, 4);
+	}
+	return false;
+	break;
 case KC_T_RCTL:
-if (record->event.pressed) {
-    mod_press(KC_RBRACKET, KC_RCTL, 5);
-} else {
-    mod_lift(KC_RBRACKET, KC_RCTL, 5);
-}
-return false;
-break;
-
+	if (record->event.pressed) {
+	   mod_press(KC_RBRACKET, KC_RCTL, 5);
+	} else {
+	   mod_lift(KC_RBRACKET, KC_RCTL, 5);
+	}
+	return false;
+	break;
 case KC_T_LSFT:
-if (record->event.pressed) {
-    mod_press(KC_EQUAL, KC_LSFT, 6);
-} else {
-    mod_lift(KC_EQUAL, KC_LSFT, 6);
-}
-return false;
-break;
+	if (record->event.pressed) {
+	   mod_press(KC_TAB, KC_LSFT, 6);
+	} else {
+	   mod_lift(KC_TAB, KC_LSFT, 6);
+	}
+	return false;
+	break;
 case KC_T_RSFT:
-if (record->event.pressed) {
-    mod_press(KC_MINUS, KC_RSFT, 7);
-} else {
-    mod_lift(KC_MINUS, KC_RSFT, 7);
-}
-return false;
-break;
+	if (record->event.pressed) {
+	   mod_press(KC_ENTER, KC_RSFT, 7);
+	} else {
+	   mod_lift(KC_ENTER, KC_RSFT, 7);
+	}
+	return false;
+	break;

 case KC_T_LRSE:
 if (record->event.pressed) {
@@ -211,7 +207,7 @@ if (record->event.pressed) {
 } else {
    layer_off(_RISE);
    if (last_mod == 9 && timer_elapsed(tap_timer) < TAPPING_TERM) {
-        tap_code16(KC_SLASH);
+        tap_code16(KC_BSPACE);
        last_mod = 10;
    }
 }
@@ -313,46 +309,6 @@ if (record->event.pressed) {
 return false;
 break;

-case KC_COM:
-if (record->event.pressed) {
-    layer_on(_COMMAND);
-    set_oneshot_layer(_COMMAND, ONESHOT_START);
-    last_mod = 10;
-} else {
-    clear_oneshot_layer_state (ONESHOT_PRESSED);
-}
-return false;
-break;
-
-case KC_USER:
-if (record->event.pressed) {
-    send_string("mhostley");
-    last_mod = 10;
-}
-return true;
-break;
-case KC_EMAIL:
-if (record->event.pressed) {
-    send_string("mhostley@gmail.com");
-    last_mod = 10;
-}
-return true;
-break;
-case KC_NAME:
-if (record->event.pressed) {
-    send_string("Samuel Jahnke");
-    last_mod = 10;
-}
-return true;
-break;
-case KC_DIR:
-if (record->event.pressed) {
-    send_string("home/mhostley/");
-    last_mod = 10;
-}
-return true;
-break;
-
 }
 last_mod = 10;
 return true;
--- a/keyboards/projectkb/alice/chconf.h
+++ b/keyboards/projectkb/alice/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/projectkb/alice/rules.mk
+++ b/keyboards/projectkb/alice/rules.mk
@@ -23,3 +23,7 @@ RGBLIGHT_ENABLE = yes

 # RAW_ENABLE = yes
 # DYNAMIC_KEYMAP_ENABLE = yes
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/vinta/chconf.h
+++ b/keyboards/vinta/chconf.h
@@ -102,10 +102,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
@@ -518,4 +514,4 @@

 #endif  /* CHCONF_H */

-/** @} */
+/** @} */
--- a/keyboards/vinta/rules.mk
+++ b/keyboards/vinta/rules.mk
@@ -13,4 +13,8 @@ COMMAND_ENABLE = no    				# Commands for debug and configuration
 NKRO_ENABLE = yes					# USB Nkey Rollover
 NO_USB_STARTUP_CHECK = no         	# Disable initialization only when usb is plugged in

-LAYOUTS = 65_ansi_blocker
+LAYOUTS = 65_ansi_blocker
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/whitefox/chconf.h
+++ b/keyboards/whitefox/chconf.h
@@ -105,10 +105,6 @@
 */
 #define CH_CFG_NO_IDLE_THREAD               FALSE

-/* Use __WFI in the idle thread for waiting. Does lower the power
- * consumption. */
-#define CORTEX_ENABLE_WFI_IDLE              TRUE
-
 /** @} */

 /*===========================================================================*/
--- a/keyboards/whitefox/rules.mk
+++ b/keyboards/whitefox/rules.mk
@@ -78,3 +78,7 @@ VISUALIZER_ENABLE = yes
 LED_DRIVER = is31fl3731c
 LED_WIDTH = 16
 LED_HEIGHT = 5
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/lib/python/qmk/cli/doctor.py
+++ b/lib/python/qmk/cli/doctor.py
@@ -168,15 +168,15 @@ def doctor(cli):
    ok = True

    # Determine our OS and run platform specific tests
-    OS = platform.system()  # noqa (N806), uppercase name is ok in this instance
+    OS = platform.platform().lower()  # noqa (N806), uppercase name is ok in this instance

-    if OS == 'Darwin':
+    if 'darwin' in OS:
        if not os_test_macos():
            ok = False
-    elif OS == 'Linux':
+    elif 'linux' in OS:
        if not os_test_linux():
            ok = False
-    elif OS == 'Windows':
+    elif 'windows' in OS:
        if not os_test_windows():
            ok = False
    else:
--- a/users/danielo515/combo.c
+++ b/users/danielo515/combo.c
@@ -0,0 +1,21 @@
+#include "combo.h"
+enum combos {
+  JK_ESC,
+  YU_COM,
+  UI_COM,
+  IO_COM,
+  OP_COM,
+  QW_COM
+};
+
+const uint16_t PROGMEM ui_combo[] = {KC_U, KC_I, COMBO_END};
+const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
+const uint16_t PROGMEM yu_combo[] = {KC_Y, KC_U, COMBO_END};
+const uint16_t PROGMEM io_combo[] = {KC_I, KC_O, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  [JK_ESC] = COMBO(jk_combo, KC_ESC),
+  [YU_COM] = COMBO(yu_combo, KC_CIRC),
+  [UI_COM] = COMBO(ui_combo, KC_ESC),
+  [IO_COM] = COMBO(io_combo, KC_TILD)
+};
--- a/users/danielo515/combo.h
+++ b/users/danielo515/combo.h
@@ -0,0 +1,2 @@
+#pragma once
+#include "quantum.h"
--- a/users/danielo515/config.h
+++ b/users/danielo515/config.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#if defined(COMBO_ENABLE)
+  #define COMBO_COUNT 4
+  #define COMBO_TERM  50
+#endif // !COMBO_ENABLE
--- a/users/danielo515/danielo515.c
+++ b/users/danielo515/danielo515.c
@@ -0,0 +1,373 @@
+#include "danielo515.h"
+
+bool onMac = true;
+// Send control or GUI depending if we are on windows or mac
+bool CMD(uint16_t kc) {
+  if(onMac){ tap_code16(LGUI(kc)); } else { tap_code16(LCTL(kc)); }
+  return false;
+}
+
+//**************** Handle keys function *********************//
+bool altPressed = false;
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record)
+{
+  bool pressed = record->event.pressed;
+  if(pressed){
+    refresh_incremental_macros(keycode);
+    if(process_incremental_macro(keycode)){
+      return false;
+    }
+    if(is_macro(keycode)){
+      return handle_macro(keycode);
+    }
+   switch (keycode) {
+        case MAC_TGL:
+        onMac = !onMac;
+        onMac ? SEND_STRING("On mac") : SEND_STRING("Not on MAC");
+        return false;
+      }
+  }
+
+  switch (keycode)
+  {
+    case QWERTY:
+        if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+        PLAY_SONG(tone_qwerty);
+        #endif
+        layer_on(_QWERTY);
+        }
+        return false;
+    case LOWER:
+        if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+        } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+        }
+        return false;
+    case RAISE:
+        if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+        } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+        }
+        return false;
+    case ADJUST:
+    if (record->event.pressed) {
+        layer_on(_ADJUST);
+        } else {
+        layer_off(_ADJUST);
+        }
+        return false;
+ // == Macros START ===
+  case ARROW:
+    if (record->event.pressed) SEND_STRING("->");
+    return false;
+  case F_ARROW:
+    if (record->event.pressed) SEND_STRING("=>");
+    return false;
+  case GREP:
+    if (record->event.pressed) SEND_STRING(" | grep "); return false;
+ // == Macros END ===
+ // == Multi Os START ===
+  case KC_HOME:// make the home behave the same on OSX
+    if (record->event.pressed && onMac) {
+        SEND_STRING(SS_LCTRL("a"));
+        return false;
+    }
+  case KC_END:// make the end behave the same on OSX
+    if (record->event.pressed && onMac) {
+        tap_code16(C(KC_E));
+        return false;
+    }
+  case AC_A:// Accent á
+    if (record->event.pressed) SEND_STRING(SS_LALT("e") "a"); return false;
+  case AC_E:// Accent é
+    if (record->event.pressed) SEND_STRING(SS_LALT("e") "e"); return false;
+  case AC_I:// Accent í
+    if (record->event.pressed) SEND_STRING(SS_LALT("e") "i"); return false;
+  case AC_O:// Accent ó
+    if (record->event.pressed) SEND_STRING(SS_LALT("e") "o"); return false;
+  case CUT: if (record->event.pressed) return CMD(KC_X);
+  case COPY:
+    if (record->event.pressed) {
+     onMac ?  SEND_STRING(SS_LGUI("c")) : SEND_STRING(SS_LCTRL("c"));
+    }
+    return false;
+  case PASTE:
+    if (record->event.pressed) {
+     onMac ?  SEND_STRING(SS_LGUI("v")) : SEND_STRING(SS_LCTRL("v"));
+    }
+    return false;
+  case SAVE:
+    if (record->event.pressed) {
+     onMac ?  SEND_STRING(SS_LGUI("s")) : SEND_STRING(SS_LCTRL("s"));
+    }
+    return false;
+  case UNDO:
+    if (record->event.pressed) {
+     onMac ?  SEND_STRING(SS_LGUI("z")) : SEND_STRING(SS_LCTRL("z"));
+    }
+    return false;
+  case FIND:
+    if (record->event.pressed) {
+     onMac ?  SEND_STRING(SS_LGUI("f")) : SEND_STRING(SS_LCTRL("f"));
+    }
+    return false;
+  case CHG_LAYOUT:
+    if (record->event.pressed) {
+     onMac ?  SEND_STRING(SS_LCTRL(" ")) : SEND_STRING(SS_LCTRL("f"));
+    }
+    return false;
+ // == Multi Os END ===
+#ifdef RGBLIGHT_ENABLE
+  case RGB_SLD:
+    if (record->event.pressed) { rgblight_mode(1); }
+    return false;
+    break;
+    //First time alt + tab, and alt stays sticky. Next press we just send tab. Any other key releases the alt
+#endif
+  case ALT_TAB:
+    if (record->event.pressed)
+    {
+      if (altPressed)
+      {
+        tap_code(KC_TAB);
+      }
+      else
+      {
+        altPressed = true;
+        layer_on(7); // go to movement layer
+        onMac ? register_code(KC_LGUI) : register_code(KC_LALT);
+        tap_code(KC_TAB);
+      }
+    }
+    return false;
+  // avoid alt releasing if the key is of movement
+  case KC_RIGHT ... KC_UP:
+    if (altPressed)
+    {
+      return true; // yes QMK, do your stuff
+    }
+  }
+  // Reset sticky alt tab
+  if (altPressed)
+  {
+    onMac ?  unregister_code(KC_LGUI) : unregister_code(KC_LALT);
+    altPressed = false;
+    layer_off(7);
+    return false;
+  }
+  return true;
+};
+
+//**************** LEADER *********************//
+#ifdef LEADER_ENABLE
+LEADER_EXTERNS();
+#ifdef RGBLIGHT_ENABLE
+
+void leader_start() {
+  rgblight_setrgb_range(5, 100, 199, 10,15);
+};
+
+void leader_end(){
+  rgblight_setrgb_range(200, 200, 255, 10,15);
+};
+#endif
+
+void matrix_scan_user(void)
+{
+  if (leading && leader_sequence_size > 0 && timer_elapsed(leader_time) > LEADER_TIMEOUT)
+  {
+    leading = false;
+    SEQ_ONE_KEY(KC_T) {
+      SEND_STRING("``" SS_TAP(X_LEFT));
+    }
+    // Triple ticks
+    SEQ_TWO_KEYS(KC_T, KC_T) {
+      SEND_STRING("```" SS_TAP(X_ENTER) SS_TAP(X_ENTER) "```" SS_TAP(X_UP));
+    }
+    // ==== International spanish accent vowels ====
+    SEQ_ONE_KEY(KC_A) {
+      SEND_STRING(SS_LALT("e") "a");
+    }
+    SEQ_ONE_KEY(KC_E) {
+      SEND_STRING(SS_LALT("e") "e");
+    }
+    SEQ_ONE_KEY(KC_I) {
+      SEND_STRING(SS_LALT("e") "i");
+    }
+    SEQ_ONE_KEY(KC_O) {
+      SEND_STRING(SS_LALT("e") "o");
+    }
+    SEQ_ONE_KEY(KC_U) {
+      SEND_STRING(SS_LALT("e") "u");
+    }
+    SEQ_ONE_KEY(KC_N) { // ñ
+      SEND_STRING(SS_LALT("n") "n");
+    }
+    // ==== MACROS ===
+    SEQ_ONE_KEY(KC_G) { // grep
+      SEND_STRING(" | grep ");
+    }
+    SEQ_ONE_KEY(KC_K) {
+        onMac ?  SEND_STRING(SS_LCTRL(" ")) : SEND_STRING(SS_LCTRL("f"));
+    }
+    SEQ_TWO_KEYS(KC_D, KC_G) { // vim delete all
+      if(onMac){
+        SEND_STRING(SS_LGUI("a") SS_TAP(X_D));
+      } else {
+        SEND_STRING(SS_LCTRL("a") SS_TAP(X_D));
+      }
+    }
+    SEQ_ONE_KEY(KC_BSPACE) { // tripe delete!
+      SEND_STRING(SS_TAP(X_BSPACE) SS_TAP(X_BSPACE) SS_TAP(X_BSPACE));
+    }
+    SEQ_TWO_KEYS(KC_P, KC_G) {
+      SEND_STRING("ps -ef | grep ");
+    }
+    SEQ_TWO_KEYS(KC_J, KC_A) {
+      SEND_STRING("() => {}"SS_TAP(X_LEFT) SS_TAP(X_LEFT)SS_TAP(X_LEFT) SS_TAP(X_LEFT)SS_TAP(X_LEFT) SS_TAP(X_LEFT)SS_TAP(X_LEFT));
+    }
+    SEQ_TWO_KEYS(KC_S, KC_S) {
+      SEND_STRING("~/.ssh/ "); // this is a pain to type
+    }
+    SEQ_TWO_KEYS(KC_F, KC_T) {
+      SEND_STRING("feat():" SS_TAP(X_LEFT) SS_TAP(X_LEFT));
+    }
+    // ### LAYER CHANGE
+    SEQ_ONE_KEY(KC_1) {
+      layer_on(1);
+    }
+    SEQ_ONE_KEY(KC_H) { // control enter, because yes
+      SEND_STRING(SS_DOWN(X_LCTRL) SS_TAP(X_ENTER) SS_UP(X_LCTRL));
+    }
+    // paste all
+    SEQ_ONE_KEY(KC_P) {
+      if(onMac){
+        SEND_STRING(SS_LGUI("a") SS_LGUI("v"));
+      } else {
+        SEND_STRING(SS_LCTRL("a") SS_LCTRL("v"));
+      }
+    }
+    SEQ_THREE_KEYS(KC_M, KC_A, KC_C) {
+      onMac = true;
+    #ifdef RGBLIGHT_ENABLE
+      rgblight_setrgb(255, 255, 255);
+    #endif
+    }
+    SEQ_THREE_KEYS(KC_W, KC_I, KC_N) {
+      onMac = false;
+    #ifdef RGBLIGHT_ENABLE
+      rgblight_setrgb(255, 255, 0);
+    #endif
+    }
+    /*  Copy all */
+    SEQ_ONE_KEY(KC_Y) {
+      if(onMac){
+        SEND_STRING(SS_LGUI("a") SS_LGUI("c"));
+      } else {
+        SEND_STRING(SS_LCTRL("a") SS_LCTRL("c"));
+      }
+    }
+    //emoji bar
+    SEQ_TWO_KEYS(KC_E, KC_E) {
+      SEND_STRING(SS_DOWN(X_LGUI) SS_LCTRL(" ") SS_UP(X_LGUI));
+    }
+
+    SEQ_TWO_KEYS(KC_F, KC_F) {
+      SEND_STRING("ps -ef | grep ");
+    }
+    SEQ_TWO_KEYS(KC_H, KC_T) {
+      SEND_STRING("https://");
+    }
+
+    leader_end();
+  }
+}
+#endif // LEADER
+
+// ======== INCREMENTAL MACROS STUFF =============
+
+#define MAX_INCREMENTAL_MACRO 20
+#define TAP_ROTATION_TIMEOUT 400
+
+uint16_t latest_kc = 0;
+uint16_t latest_rotation = 0;
+int key_count = 0;
+
+const char incremental_macros[][MAX_INCREMENTAL_MACRO] = { "String1"SS_TAP(X_HOME)"X-", "String2"SS_TAP(X_HOME) };
+
+bool process_incremental_macro (uint16_t kc) {
+
+  if( kc < INC_MACROS_START || kc > INC_MACROS_END ){
+    return false;
+  }
+  int macro_idx = (int) (kc - INC_MACROS_START) - 1;
+  char tempstring[3] = {0};
+  tempstring[0] = incremental_macros[macro_idx][key_count];
+  // Special cases of SS_TAP SS_UP and SS_DOWN, they require two characters so get both once and skip on next iteration
+  if( tempstring[0] == '\1' || tempstring[0] == '\2' || tempstring[0] == '\3'){
+    tempstring[1] = incremental_macros[macro_idx][++key_count];
+  }
+  if( tempstring[0] == '\0'){
+    key_count = 0;
+  }
+  send_string(tempstring);
+
+  return true;
+};
+
+void refresh_incremental_macros (uint16_t kc) {
+  if (kc == latest_kc)
+    {
+      if ( (timer_elapsed(latest_rotation) > TAP_ROTATION_TIMEOUT) || (key_count >= MAX_INCREMENTAL_MACRO) ) key_count = 0;
+      else key_count++;
+    } else {
+      key_count = 0;
+      latest_kc = kc;
+    }
+
+  latest_rotation = timer_read();
+}
+
+
+// ======== VISUAL STUDIO CODE SHORTCUTS STUFF
+
+bool is_macro (uint16_t kc){
+  return kc > MACRO_START && kc < MACRO_END;
+};
+
+bool command_shift_p (bool isMac) {
+   isMac
+   ? SEND_STRING(SS_DOWN(X_LSHIFT)SS_LGUI("p")SS_UP(X_LSHIFT))
+   : SEND_STRING(SS_DOWN(X_LSHIFT)SS_LCTRL("p")SS_UP(X_LSHIFT));
+   return false;
+};
+
+bool VSCommand(bool isMac, char *cmd)
+{
+  command_shift_p (isMac);
+  send_string(cmd);
+  SEND_STRING(SS_TAP(X_ENTER));
+  return false;
+};
+
+bool handle_macro(uint16_t kc)
+{
+  switch (kc)
+  {
+    case T_TERM: return VSCommand(onMac, "toit");
+    case FIX_ALL: return VSCommand(onMac, "faap");
+    case BLK_CMNT: return VSCommand(onMac, "tbc");
+    case LN_CMNT: return VSCommand(onMac, "tlic");
+    case CMD_S_P: return command_shift_p(onMac);
+    case TRI_TICKS: SEND_STRING("[[[ "); break;
+  }
+  return false;
+};
--- a/users/danielo515/danielo515.h
+++ b/users/danielo515/danielo515.h
@@ -0,0 +1,105 @@
+#pragma once
+
+#include "quantum.h"
+
+
+bool handle_macro(uint16_t kc);
+bool is_macro (uint16_t kc);
+bool process_incremental_macro (uint16_t);
+void refresh_incremental_macros (uint16_t);
+//**************** KEYCODES *********************//
+
+enum custom_keycodes
+{
+  PLACEHOLDER = SAFE_RANGE, // can always be here
+  EPRM,
+  RGB_SLD,
+  ALT_TAB,
+  // Macros
+  ARROW,
+  F_ARROW,
+  QWERTY,
+  GREP,
+  // Accented characters
+  AC_A,
+  AC_E,
+  AC_I,
+  AC_O,
+  // Custom multi-os key-codes
+  CUT,
+  COPY,
+  PASTE,
+  SAVE,
+  UNDO,
+  CHG_LAYOUT,
+  FIND,
+  // OTHER OLD STUFF
+  LOWER,
+  RAISE,
+  ADJUST,
+  MAC_TGL,
+  MACRO_START,  // START OF VSC DECLARATIONS
+  T_TERM,
+  FIX_ALL,
+  BLK_CMNT,
+  LN_CMNT,
+  CMD_S_P,
+  TRI_TICKS,
+  MACRO_END,  // END OF VSC DECLARATIONS
+  INC_MACROS_START,
+  INC_MACROS_END,
+};
+
+
+enum layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+  _F,
+  _D,
+  _A,
+  _S,
+  _J,
+  _K,
+  _MACROS,
+  _ADJUST,
+  _SAFE_LAYER
+};
+
+// Function letters
+#define FN_F LT(_F,KC_F)
+#define FN_D LT(_D,KC_D)
+#define FN_S LT(_S,KC_S)
+#define FN_A LT(_A,KC_A)
+#define FN_K LT(_K,KC_K)
+#define FN_J LT(_J,KC_J)
+#define KC_FN_D FN_D
+#define KC_FN_S FN_S
+#define KC_FN_F FN_F
+
+#define KC_MACROS OSL(_MACROS)
+
+
+#define KC_E_COLN LSFT(KC_DOT)
+#define KC_E_EQL ES_EQL
+#define KC_GUI OSM(MOD_RGUI)
+#define KC_R_NUB S(KC_NUBS)
+#define KC_E_LT KC_NUBS
+#define KC_E_GT S(KC_NUBS)
+#define KC_E_TILD ES_TILD
+#define KC_E_MINS ES_MINS
+#define KC_S_SPC SFT_T(KC_SPC)  // Tap for Space, hold for Shift
+#define KC_E_OVRR ES_OVRR
+#define KC_E_APOS ES_APOS
+#define KC_E_IEXL ES_IEXL
+// Short hand for complex key combinations
+# define WIN_LEFT_HALF LALT(LGUI(KC_LEFT))
+# define WIN_RIGHT_HALF LALT(LGUI(KC_RIGHT))
+# define WIN_TO_LEFT LALT(LSFT( LGUI(KC_LEFT) ))
+# define WIN_TO_RIGHT LALT(LSFT( LGUI(KC_RIGHT) ))
+
+// Ready to use Tap dance definitions, just put them on your layout
+
+#ifdef TAP_DANCE_ENABLE
+    #include "tap_dance.h"
+#endif
--- a/users/danielo515/readme.md
+++ b/users/danielo515/readme.md
@@ -0,0 +1,14 @@
+Copyright 2017 Daniel Rodriguez @ danielo515
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mikkel Jeppesen	197a401be6	Qmk doctor os check to support newer msys2/w10 installations (#8031 ) * Fixed OS detection on newer MSYS installations * made OS sting lower case	2020-01-28 22:21:00 +01:00
MechMerlin	4a208b8951	[Keyboard] 1up60hse VIA Support (#7992 ) * add VIA support for 1up60hse * choose a vendor and product id that is not taken * add mousekey_enable set to no as per Wilba's recommendation * Update keyboards/1upkeyboards/1up60hse/keymaps/via/readme.md * Update keyboards/1upkeyboards/1up60hse/keymaps/via/readme.md * add a fourth layer * might as well remove the config file as we are not including the one thing that was in it	2020-01-28 13:04:50 -08:00
coseyfannitutti	1e90f5c71c	Mysterium firmware fix (#8032 ) * Update config.h * Update rules.mk * Update usbconfig.h * Update config.h * Update rules.mk * Update usbconfig.h	2020-01-29 07:38:27 +11:00
Max Rumpf	0d80c7bd59	[Keyboard] Fix Pulse4k info.json LAYOUT name (#7965 ) * Fix Pulse4k info.json LAYOUT name * Add missing functions to fix configurator Add empty encoder functions to the keyboard code, as the configurator doesn't see the keymap defined functions at first. To be able to override these functions, they are marked as 'weak'. * Rework encoder functions another time Default implementation is now provided as part of the keyboard, but they can still be overriden within the keymap (template is commented out by default)	2020-01-28 09:08:39 -08:00
Nick Brassel	4d06d2835c	Move CORTEX_ENABLE_WFI_IDLE=TRUE to rules.mk files.	2020-01-28 23:45:42 +11:00
Samuel Jahnke	92c62352cf	[Keymap] Finalize Keymap Planck/Samuel (#8005 ) * indent and layout changes * finalizations * use layout macros here instead of the raw matrix arrays	2020-01-27 17:47:36 -08:00
Rafael Azevedo	1f0404e3c5	[Keymap] Added gaming layout and read me (#7996 ) * Added gaming layout and read me * Code format changes and spelling fixes for PR * Moved keymap to different folder	2020-01-27 17:42:46 -08:00
shela	ee88feb759	[Docs] Update Japanese translation (#8015 )	2020-01-27 17:18:12 -08:00
Flexerm	eb5e513d26	[Keyboard] FLX Virgo, cleaned up layouts and added VIA keymap (#7997 ) * Reworked for VIA support Reworked for VIA support and tidying up of older code. * Fixed naming issues, and prepared for VIA compat Via compat added * Improve layouts, tidy code, via keymap Added support for VIA and cleaned up some code and layouts. * Implimented suggestions by MechMerlin * Fix capitalisation Mistake raised by Drashna now fixed. * Tidy comments as requested by noroadsleft * Tidy comments as requested by fauxpark	2020-01-27 17:05:29 -08:00
dohq	a539bd63fe	Fix/remove missing package (#7897 ) * [fix] yay instead pacman install bootloadhid * [fix] add needed option * [mod] output red color * [fix] overwrite avr-gcc package * [mod] disable install bootloadhid from aur and check already installed * Apply suggestions from code review Co-Authored-By: Joel Challis <git@zvecr.com> * Update util/linux_install.sh Co-Authored-By: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>	2020-01-28 00:23:24 +00:00
Daniel Rodríguez Rivero	1b7a003d84	[Keymap] update to Danielo515 keymaps (#8004 ) * feat(build): added script for compiling with docker easily * chore: bring my own build with docker to master * feat: merge ergodox ez into latest maste * chore: remove my build with docker file * chore: remove my changes to process_leader * feat: more modular user danielo515 * Apply suggestions from @ridingqwerty Co-Authored-By: ridingqwerty <george.g.koenig@gmail.com> * chore: more suggestions implemented * chore: add my basic details * Apply suggestions from @drashna Co-Authored-By: Drashna Jaelre <drashna@live.com> * fix: more @drashna fixes * feat: @fauxpark optimization * fix: some more @drashna improvements Co-Authored-By: Drashna Jaelre <drashna@live.com> * chore: small improvement on layout * fix: some more @drashna improvements * chore: remove some F dance Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>	2020-01-27 14:42:38 -08:00
Joel Challis	0804f0a5dd	Merge pull request #7995 from zvecr/feature/split_arm_i2c_remove Remove compilation of i2c for arm split	2020-01-27 22:40:32 +00:00
zvecr	6efcfaa264	Remove compilation of i2c for arm split	2020-01-24 14:11:01 +00:00