summaryrefslogtreecommitdiff
path: root/keyboards/helix/rev2/keymaps
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2020-11-28 12:02:18 -0800
committerGitHub <noreply@github.com>2020-11-28 12:02:18 -0800
commitc66df1664497546f32662409778731143e45a552 (patch)
treeda73a2d532a27685a31d932b3a44a707d4a3af81 /keyboards/helix/rev2/keymaps
parent15385d4113414d42bd062c60c9de5df797d3157f (diff)
2020 November 28 Breaking Changes Update (#11053)
* Branch point for 2020 November 28 Breaking Change * Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183) * Add support for soft serial to ATmega32U2 (#10204) * Change MIDI velocity implementation to allow direct control of velocity value (#9940) * Add ability to build a subset of all keyboards based on platform. * Actually use eeprom_driver_init(). * Make bootloader_jump weak for ChibiOS. (#10417) * Joystick 16-bit support (#10439) * Per-encoder resolutions (#10259) * Share button state from mousekey to pointing_device (#10179) * Add hotfix for chibios keyboards not wake (#10088) * Add advanced/efficient RGB Matrix Indicators (#8564) * Naming change. * Support for STM32 GPIOF,G,H,I,J,K (#10206) * Add milc as a dependency and remove the installed milc (#10563) * ChibiOS upgrade: early init conversions (#10214) * ChibiOS upgrade: configuration file migrator (#9952) * Haptic and solenoid cleanup (#9700) * XD75 cleanup (#10524) * OLED display update interval support (#10388) * Add definition based on currently-selected serial driver. (#10716) * New feature: Retro Tapping per key (#10622) * Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638) * Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530) * Rescale both ChibiOS and AVR backlighting. * Reduce Helix keyboard build variation (#8669) * Minor change to behavior allowing display updates to continue between task ticks (#10750) * Some GPIO manipulations in matrix.c change to atomic. (#10491) * qmk cformat (#10767) * [Keyboard] Update the Speedo firmware for v3.0 (#10657) * Maartenwut/Maarten namechange to evyd13/Evy (#10274) * [quantum] combine repeated lines of code (#10837) * Add step sequencer feature (#9703) * aeboards/ext65 refactor (#10820) * Refactor xelus/dawn60 for Rev2 later (#10584) * add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824) * [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549) * update chibios os usb for the otg driver (#8893) * Remove HD44780 References, Part 4 (#10735) * [Keyboard] Add Valor FRL TKL (+refactor) (#10512) * Fix cursor position bug in oled_write_raw functions (#10800) * Fixup version.h writing when using SKIP_VERSION=yes (#10972) * Allow for certain code in the codebase assuming length of string. (#10974) * Add AT90USB support for serial.c (#10706) * Auto shift: support repeats and early registration (#9826) * Rename ledmatrix.h to match .c file (#7949) * Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231) * Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840) * Merge point for 2020 Nov 28 Breaking Change
Diffstat (limited to 'keyboards/helix/rev2/keymaps')
-rw-r--r--keyboards/helix/rev2/keymaps/default/readme.md34
-rw-r--r--keyboards/helix/rev2/keymaps/default/readme_jp.md21
-rw-r--r--keyboards/helix/rev2/keymaps/led_test/rules.mk4
-rw-r--r--keyboards/helix/rev2/keymaps/xulkal/rules.mk3
4 files changed, 28 insertions, 34 deletions
diff --git a/keyboards/helix/rev2/keymaps/default/readme.md b/keyboards/helix/rev2/keymaps/default/readme.md
index 1237e5d5b6..8614fce53d 100644
--- a/keyboards/helix/rev2/keymaps/default/readme.md
+++ b/keyboards/helix/rev2/keymaps/default/readme.md
@@ -112,7 +112,7 @@ see `qmk_firmware/keyboards/helix/rev2/keymaps/default/rules.mk`
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
# HELIX_ROWS = 5 # Helix Rows is 4 or 5
-# OLED_ENABLE = no # OLED_ENABLE
+# OLED_ENABLE = yes # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
@@ -128,35 +128,25 @@ $ cd qmk_firmware
build
```
-$ make helix:default
-$ make helix/rev2/back:default # with backlight
-$ make HELIX=no_ani helix/rev2/back:default # with backlight without animation
-$ make helix/rev2/under:default # with underglow
-$ make helix/rev2/oled:default # with oled
-$ make helix/rev2/oled/back:default # with oled and backlight
-$ make helix/rev2/oled/under:default # with oled and underglow
+$ make helix:default # with oled
+$ make helix/rev2/back:default # with oled and backlight
+$ make HELIX=no-ani helix/rev2/back:default # with oled and backlight without animation
+$ make helix/rev2/under:default # with oled and underglow
+$ make HELIX=no-oled helix:default # without oled
```
-build (experimental use of split_common)
+build (experimental use of split_common with backlight and oled)
```
$ make helix/rev2/sc:default
-$ make helix/rev2/sc/back:default
-$ make helix/rev2/sc/under:default
-$ make helix/rev2/sc/oled:default
-$ make helix/rev2/sc/oledback:default
-$ make helix/rev2/sc/oledunder:default
```
flash to keyboard
```
-$ make helix:default:flash
-$ make helix/rev2/back:default:flash # with backlight
-$ make HELIX=no_ani helix/rev2/back:default:flash # with backlight without animation
-$ make helix/rev2/under:default:flash # with underglow
-$ make helix/rev2/oled:default:flash # with oled
-$ make helix/rev2/oled/back:default:flash # with oled and backlight
-$ make helix/rev2/oled/under:default:flash # with oled and underglow
-
+$ make helix:default:flash # with oled
+$ make helix/rev2/back:default:flash # with oled and backlight
+$ make HELIX=no-ani helix/rev2/back:default:flash # with oled and backlight without animation
+$ make helix/rev2/under:default:flash # with oled and underglow
+$ make HELIX=no-oled helix:default:flash # without oled
```
## Link
diff --git a/keyboards/helix/rev2/keymaps/default/readme_jp.md b/keyboards/helix/rev2/keymaps/default/readme_jp.md
index 2dfab351b0..5f0295f8f3 100644
--- a/keyboards/helix/rev2/keymaps/default/readme_jp.md
+++ b/keyboards/helix/rev2/keymaps/default/readme_jp.md
@@ -30,7 +30,7 @@ RGB バックライトまたは、RGB Underglow をつけた場合は、
# you can uncomment and edit follows 7 Variables
# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
# HELIX_ROWS = 5 # Helix Rows is 4 or 5
-# OLED_ENABLE = no # OLED_ENABLE
+# OLED_ENABLE = yes # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
@@ -61,11 +61,12 @@ rules.mk の下記の部分を編集して no を yes に変更してくださ
LED_UNDERGLOW_ENABLE = yes # LED underglow (Enable WS2812 RGB underlight.)
```
-## OLEDを有効にする
+## OLEDを無効にする
-rules.mk の下記の部分を編集して no を yes に変更してください。
+OLED はデフォルトで有効になっています。
+無効にしたいときは rules.mk の下記の部分を編集して yes を no に変更してください。
```
-OLED_ENABLE = yes # OLED_ENABLE
+OLED_ENABLE = no # OLED_ENABLE
```
## iPad/iPhoneサポートを有効にする。
@@ -104,9 +105,9 @@ $ make helix:default:clean
上記の、rules.mk によるカスタマイズ項目の一部は下記のようにコマンド上で直接指定することも可能です。
-OLED を有効にしてコンパイルしてキーボードへの書き込む。
+OLED を無効にしてコンパイルしてキーボードへの書き込む。
```
-$ make helix/rev2/oled:default:flash
+$ make HELIX=no-oled helix/rev2:default:flash
```
RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
@@ -119,14 +120,14 @@ RGB Underglow を有効にしてコンパイルしてキーボードへ書き込
$ make helix/rev2/under:default:flash
```
-OLED とRGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
+OLED を無効にして、RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
```
-$ make helix/rev2/oled/back:default:flash
+$ make HELIX=no-oled helix/rev2/back:default:flash
```
-OLED とRGB Underglowを有効にしてコンパイルしてキーボードへ書き込む。
+OLED を無効にして、RGB Underglowを有効にしてコンパイルしてキーボードへ書き込む。
```
-$ make helix/rev2/oled/under:default:flash
+$ make HELIX=no-oled helix/rev2/under:default:flash
```
## リンク
diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk
index 013ef1482d..cc6d568111 100644
--- a/keyboards/helix/rev2/keymaps/led_test/rules.mk
+++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk
@@ -14,8 +14,8 @@ LTO_ENABLE = no # if firmware size over limit, try this option
OLED_ENABLE = yes # OLED_ENABLE
# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes # LED animations
+LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
+LED_ANIMATIONS = yes # LED animations
# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
SRC += led_test_init.c
diff --git a/keyboards/helix/rev2/keymaps/xulkal/rules.mk b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
index 03800f9bb9..7fac4df7e1 100644
--- a/keyboards/helix/rev2/keymaps/xulkal/rules.mk
+++ b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
@@ -11,3 +11,6 @@ OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
OPT_DEFS += -DOLED_90ROTATION
SPLIT_KEYBOARD = yes
+
+# Explicitly disable helix standard post-processing
+KEYBOARD_LOCAL_FEATURES_MK :=