summaryrefslogtreecommitdiff
path: root/keyboards/helix/rev2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/helix/rev2')
-rw-r--r--keyboards/helix/rev2/back/oled/rules.mk1
-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
-rw-r--r--keyboards/helix/rev2/local_features.mk78
-rw-r--r--keyboards/helix/rev2/oled/back/rules.mk1
-rw-r--r--keyboards/helix/rev2/oled/rules.mk1
-rw-r--r--keyboards/helix/rev2/oled/under/rules.mk1
-rw-r--r--keyboards/helix/rev2/qmk_conf/config.h38
-rw-r--r--keyboards/helix/rev2/qmk_conf/rules.mk4
-rw-r--r--keyboards/helix/rev2/rules.mk2
-rw-r--r--keyboards/helix/rev2/sc/back/rules.mk1
-rw-r--r--keyboards/helix/rev2/sc/oled/rules.mk1
-rw-r--r--keyboards/helix/rev2/sc/oledback/rules.mk2
-rw-r--r--keyboards/helix/rev2/sc/oledunder/rules.mk2
-rw-r--r--keyboards/helix/rev2/sc/rules.mk1
-rw-r--r--keyboards/helix/rev2/sc/under/rules.mk1
-rw-r--r--keyboards/helix/rev2/under/oled/rules.mk1
19 files changed, 131 insertions, 66 deletions
diff --git a/keyboards/helix/rev2/back/oled/rules.mk b/keyboards/helix/rev2/back/oled/rules.mk
deleted file mode 100644
index dd68e9d3b0..0000000000
--- a/keyboards/helix/rev2/back/oled/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
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 :=
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
index 3f8a7216f9..1d0b55cbf1 100644
--- a/keyboards/helix/rev2/local_features.mk
+++ b/keyboards/helix/rev2/local_features.mk
@@ -5,6 +5,8 @@
# combinations of standard options) into QMK standard options.
#
+KEYBOARD_LOCAL_FEATURES_MK :=
+
define HELIX_CUSTOMISE_MSG
$(info Helix Spacific Build Options)
$(info - OLED_ENABLE = $(OLED_ENABLE))
@@ -15,42 +17,79 @@ define HELIX_CUSTOMISE_MSG
$(info )
endef
+define HELIX_HELP_MSG
+ $(info Helix keyboard convenient command line option)
+ $(info - make HELIX=<options> helix:<keymap>)
+ $(info - option= oled | no-oled | back | no-back | under | na | no-ani)
+ $(info - ios | sc | split-common | scan | verbose)
+ $(info - ex.)
+ $(info - make HELIX=no-oled helix:<keymap>)
+ $(info - make HELIX=oled,no-back helix:<keymap>)
+ $(info - make HELIX=oled,under helix:<keymap>)
+ $(info - make HELIX=oled,back,na helix:<keymap>)
+ $(info - make HELIX=oled,back,ios helix:<keymap>)
+ $(info )
+endef
+
ifneq ($(strip $(HELIX)),)
- ### Helix keyboard keymap: convenient command line option
- ## make HELIX=<options> helix:<keymap>
- ## option= oled | back | under | na | ios
- ## ex.
- ## make HELIX=oled helix:<keymap>
- ## make HELIX=oled,back helix:<keymap>
- ## make HELIX=oled,under helix:<keymap>
- ## make HELIX=oled,back,na helix:<keymap>
- ## make HELIX=oled,back,ios helix:<keymap>
- ##
- ifeq ($(findstring oled,$(HELIX)), oled)
+ COMMA=,
+ helix_option := $(subst $(COMMA), , $(HELIX))
+ ifneq ($(filter help,$(helix_option)),)
+ $(eval $(call HELIX_HELP_MSG))
+ $(error )
+ endif
+ ifneq ($(filter nooled,$(helix_option)),)
+ OLED_ENABLE = no
+ else ifneq ($(filter no-oled,$(helix_option)),)
+ OLED_ENABLE = no
+ else ifneq ($(filter oled,$(helix_option)),)
OLED_ENABLE = yes
endif
- ifeq ($(findstring back,$(HELIX)), back)
+ ifneq ($(filter noback,$(helix_option)),)
+ LED_BACK_ENABLE = no
+ LED_UNDERGLOW_ENABLE = no
+ else ifneq ($(filter no-back,$(helix_option)),)
+ LED_BACK_ENABLE = no
+ LED_UNDERGLOW_ENABLE = no
+ else ifneq ($(filter nounder,$(helix_option)),)
+ LED_BACK_ENABLE = no
+ LED_UNDERGLOW_ENABLE = no
+ else ifneq ($(filter no-under,$(helix_option)),)
+ LED_BACK_ENABLE = no
+ LED_UNDERGLOW_ENABLE = no
+ else ifneq ($(filter back,$(helix_option)),)
LED_BACK_ENABLE = yes
- else ifeq ($(findstring under,$(HELIX)), under)
+ LED_UNDERGLOW_ENABLE = no
+ else ifneq ($(filter under,$(helix_option)),)
+ LED_BACK_ENABLE = no
LED_UNDERGLOW_ENABLE = yes
endif
- ifeq ($(findstring na,$(HELIX)), na)
+ ifneq ($(filter na,$(helix_option)),)
LED_ANIMATIONS = no
endif
- ifeq ($(findstring no_ani,$(HELIX)), no_ani)
+ ifneq ($(filter no_ani,$(helix_option)),)
LED_ANIMATIONS = no
endif
- ifeq ($(findstring ios,$(HELIX)), ios)
+ ifneq ($(filter no-ani,$(helix_option)),)
+ LED_ANIMATIONS = no
+ endif
+ ifneq ($(filter ios,$(helix_option)),)
IOS_DEVICE_ENABLE = yes
endif
- ifeq ($(findstring scan,$(HELIX)), scan)
+ ifneq ($(filter sc,$(helix_option)),)
+ SPLIT_KEYBOARD = yes
+ endif
+ ifneq ($(filter split-common,$(helix_option)),)
+ SPLIT_KEYBOARD = yes
+ endif
+ ifneq ($(filter scan,$(helix_option)),)
# use DEBUG_MATRIX_SCAN_RATE
# see docs/newbs_testing_debugging.md
OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
CONSOLE_ENABLE = yes
SHOW_VERBOSE_INFO = yes
endif
- ifeq ($(findstring verbose,$(HELIX)), verbose)
+ ifeq ($(filter verbose,$(helix_option)), verbose)
SHOW_VERBOSE_INFO = yes
endif
SHOW_HELIX_OPTIONS = yes
@@ -119,7 +158,8 @@ ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
$(info -- OLED_DRIVER_ENABLE = $(OLED_DRIVER_ENABLE))
$(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE))
$(info -- OPT_DEFS = $(OPT_DEFS))
- $(info -- LTO_ENABLE = $(LTO_ENABLE))
+ $(info -- SPLIT_KEYBOARD = $(SPLIT_KEYBOARD))
+ $(info -- LTO_ENABLE = $(LTO_ENABLE))
$(info )
endif
endif
diff --git a/keyboards/helix/rev2/oled/back/rules.mk b/keyboards/helix/rev2/oled/back/rules.mk
deleted file mode 100644
index 066fffb74a..0000000000
--- a/keyboards/helix/rev2/oled/back/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/rev2/oled/rules.mk b/keyboards/helix/rev2/oled/rules.mk
deleted file mode 100644
index dd68e9d3b0..0000000000
--- a/keyboards/helix/rev2/oled/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/helix/rev2/oled/under/rules.mk b/keyboards/helix/rev2/oled/under/rules.mk
deleted file mode 100644
index a37aa6fab3..0000000000
--- a/keyboards/helix/rev2/oled/under/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_UNDERGLOW_ENABLE = yes
diff --git a/keyboards/helix/rev2/qmk_conf/config.h b/keyboards/helix/rev2/qmk_conf/config.h
new file mode 100644
index 0000000000..b8c1041cdc
--- /dev/null
+++ b/keyboards/helix/rev2/qmk_conf/config.h
@@ -0,0 +1,38 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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/>.
+*/
+
+#pragma once
+
+// place overrides here
+
+// If you need more program area, try select and reduce rgblight modes to use.
+
+// Selection of RGBLIGHT MODE to use.
+#if defined(LED_ANIMATIONS)
+ #define RGBLIGHT_EFFECT_BREATHING
+ #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+ #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+ #define RGBLIGHT_EFFECT_SNAKE
+ #define RGBLIGHT_EFFECT_KNIGHT
+ #define RGBLIGHT_EFFECT_CHRISTMAS
+ #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+ //#define RGBLIGHT_EFFECT_RGB_TEST
+ //#define RGBLIGHT_EFFECT_ALTERNATING
+#endif
diff --git a/keyboards/helix/rev2/qmk_conf/rules.mk b/keyboards/helix/rev2/qmk_conf/rules.mk
new file mode 100644
index 0000000000..67caab1ce6
--- /dev/null
+++ b/keyboards/helix/rev2/qmk_conf/rules.mk
@@ -0,0 +1,4 @@
+LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.)
+LED_ANIMATIONS = yes # LED animations
+
+include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk
index db584c0b23..d5d69c979c 100644
--- a/keyboards/helix/rev2/rules.mk
+++ b/keyboards/helix/rev2/rules.mk
@@ -2,7 +2,7 @@ KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.
# Helix Spacific Build Options default values
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.)
diff --git a/keyboards/helix/rev2/sc/back/rules.mk b/keyboards/helix/rev2/sc/back/rules.mk
deleted file mode 100644
index 066fffb74a..0000000000
--- a/keyboards/helix/rev2/sc/back/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/rev2/sc/oled/rules.mk b/keyboards/helix/rev2/sc/oled/rules.mk
deleted file mode 100644
index dd68e9d3b0..0000000000
--- a/keyboards/helix/rev2/sc/oled/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/helix/rev2/sc/oledback/rules.mk b/keyboards/helix/rev2/sc/oledback/rules.mk
deleted file mode 100644
index 645984f865..0000000000
--- a/keyboards/helix/rev2/sc/oledback/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OLED_ENABLE = yes
-LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/rev2/sc/oledunder/rules.mk b/keyboards/helix/rev2/sc/oledunder/rules.mk
deleted file mode 100644
index e415cbd492..0000000000
--- a/keyboards/helix/rev2/sc/oledunder/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OLED_ENABLE = yes
-LED_UNDERGLOW_ENABLE = yes
diff --git a/keyboards/helix/rev2/sc/rules.mk b/keyboards/helix/rev2/sc/rules.mk
index d38a618090..4ed0672a70 100644
--- a/keyboards/helix/rev2/sc/rules.mk
+++ b/keyboards/helix/rev2/sc/rules.mk
@@ -1 +1,2 @@
SPLIT_KEYBOARD = yes
+LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/rev2/sc/under/rules.mk b/keyboards/helix/rev2/sc/under/rules.mk
deleted file mode 100644
index a37aa6fab3..0000000000
--- a/keyboards/helix/rev2/sc/under/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_UNDERGLOW_ENABLE = yes
diff --git a/keyboards/helix/rev2/under/oled/rules.mk b/keyboards/helix/rev2/under/oled/rules.mk
deleted file mode 100644
index dd68e9d3b0..0000000000
--- a/keyboards/helix/rev2/under/oled/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 19:44:06 +0000