aboutsummaryrefslogtreecommitdiff
path: root/keyboards/helix
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
parent15385d4113414d42bd062c60c9de5df797d3157f (diff)
downloadqmk_firmware-c66df1664497546f32662409778731143e45a552.tar.gz
qmk_firmware-c66df1664497546f32662409778731143e45a552.zip
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')
-rw-r--r--keyboards/helix/pico/keymaps/default/readme.md6
-rw-r--r--keyboards/helix/pico/local_features.mk60
-rw-r--r--keyboards/helix/pico/qmk_conf/config.h43
-rw-r--r--keyboards/helix/pico/qmk_conf/rules.mk4
-rw-r--r--keyboards/helix/pico/sc/back/rules.mk1
-rw-r--r--keyboards/helix/pico/sc/rules.mk1
-rw-r--r--keyboards/helix/pico/sc/under/rules.mk1
-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
-rw-r--r--keyboards/helix/rev3_4rows/rules.mk3
-rw-r--r--keyboards/helix/rev3_5rows/rules.mk3
28 files changed, 226 insertions, 93 deletions
diff --git a/keyboards/helix/pico/keymaps/default/readme.md b/keyboards/helix/pico/keymaps/default/readme.md
index 3c097247e..789097021 100644
--- a/keyboards/helix/pico/keymaps/default/readme.md
+++ b/keyboards/helix/pico/keymaps/default/readme.md
@@ -116,15 +116,13 @@ build
116``` 116```
117$ make helix/pico:default 117$ make helix/pico:default
118$ make helix/pico/back:default # with backlight 118$ make helix/pico/back:default # with backlight
119$ make HELIX=no_ani helix/pico/back:default # with backlight without animation 119$ make HELIX=no-ani helix/pico/back:default # with backlight without animation
120$ make helix/pico/under:default # with underglow 120$ make helix/pico/under:default # with underglow
121``` 121```
122 122
123build (experimental use of split_common) 123build (experimental use of split_common with backlight)
124``` 124```
125$ make helix/pico/sc:default 125$ make helix/pico/sc:default
126$ make helix/pico/sc/back:default
127$ make helix/pico/sc/under:default
128``` 126```
129 127
130flash to keyboard 128flash to keyboard
diff --git a/keyboards/helix/pico/local_features.mk b/keyboards/helix/pico/local_features.mk
index a98444686..25dcb8b6d 100644
--- a/keyboards/helix/pico/local_features.mk
+++ b/keyboards/helix/pico/local_features.mk
@@ -5,6 +5,8 @@
5# combinations of standard options) into QMK standard options. 5# combinations of standard options) into QMK standard options.
6# 6#
7 7
8KEYBOARD_LOCAL_FEATURES_MK :=
9
8define HELIX_CUSTOMISE_MSG 10define HELIX_CUSTOMISE_MSG
9 $(info Helix Spacific Build Options) 11 $(info Helix Spacific Build Options)
10 $(info - OLED_ENABLE = $(OLED_ENABLE)) 12 $(info - OLED_ENABLE = $(OLED_ENABLE))
@@ -15,42 +17,61 @@ define HELIX_CUSTOMISE_MSG
15 $(info ) 17 $(info )
16endef 18endef
17 19
20define HELIX_HELP_MSG
21 $(info Helix keyboard convenient command line option)
22 $(info - make HELIX=<options> helix/pico:<keymap>)
23 $(info - option= oled | back | under | na | no-ani)
24 $(info - ios | sc | split-common | scan | verbose)
25 $(info - ex.)
26 $(info - make HELIX=oled helix/pico:<keymap>)
27 $(info - make HELIX=back helix/pico:<keymap>)
28 $(info - make HELIX=under helix/pico:<keymap>)
29 $(info - make HELIX=back,na helix/pico:<keymap>)
30 $(info - make HELIX=back,ios helix/pico:<keymap>)
31 $(info )
32endef
33
18 ifneq ($(strip $(HELIX)),) 34 ifneq ($(strip $(HELIX)),)
19 ### Helix keyboard keymap: convenient command line option 35 COMMA=,
20 ## make HELIX=<options> helix/pico:<keymap> 36 helix_option := $(subst $(COMMA), , $(HELIX))
21 ## option= oled | back | under | no_ani | na | ios | verbose 37 ifneq ($(filter help,$(helix_option)),)
22 ## ex. 38 $(eval $(call HELIX_HELP_MSG))
23 ## make HELIX=oled helix/pico:<keymap> 39 $(error )
24 ## make HELIX=oled,back helix/pico:<keymap> 40 endif
25 ## make HELIX=oled,under helix/pico:<keymap> 41 ifneq ($(filter oled,$(helix_option)),)
26 ## make HELIX=oled,back,na helix/pico:<keymap>
27 ## make HELIX=oled,back,ios helix/pico:<keymap>
28 ##
29 ifeq ($(findstring oled,$(HELIX)), oled)
30 OLED_ENABLE = yes 42 OLED_ENABLE = yes
31 endif 43 endif
32 ifeq ($(findstring back,$(HELIX)), back) 44 ifneq ($(filter back,$(helix_option)),)
33 LED_BACK_ENABLE = yes 45 LED_BACK_ENABLE = yes
34 else ifeq ($(findstring under,$(HELIX)), under) 46 else ifneq ($(filter under,$(helix_option)),)
35 LED_UNDERGLOW_ENABLE = yes 47 LED_UNDERGLOW_ENABLE = yes
36 endif 48 endif
37 ifeq ($(findstring na,$(HELIX)), na) 49 ifneq ($(filter na,$(helix_option)),)
38 LED_ANIMATIONS = no 50 LED_ANIMATIONS = no
39 endif 51 endif
40 ifeq ($(findstring no_ani,$(HELIX)), no_ani) 52 ifneq ($(filter no_ani,$(helix_option)),)
41 LED_ANIMATIONS = no 53 LED_ANIMATIONS = no
42 endif 54 endif
43 ifeq ($(findstring ios,$(HELIX)), ios) 55 ifneq ($(filter no-ani,$(helix_option)),)
56 LED_ANIMATIONS = no
57 endif
58 ifneq ($(filter ios,$(helix_option)),)
44 IOS_DEVICE_ENABLE = yes 59 IOS_DEVICE_ENABLE = yes
45 endif 60 endif
46 ifeq ($(findstring scan,$(HELIX)), scan) 61 ifneq ($(filter sc,$(helix_option)),)
62 SPLIT_KEYBOARD = yes
63 endif
64 ifneq ($(filter split-common,$(helix_option)),)
65 SPLIT_KEYBOARD = yes
66 endif
67 ifneq ($(filter scan,$(helix_option)),)
47 # use DEBUG_MATRIX_SCAN_RATE 68 # use DEBUG_MATRIX_SCAN_RATE
48 # see docs/newbs_testing_debugging.md 69 # see docs/newbs_testing_debugging.md
49 OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE 70 OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
50 CONSOLE_ENABLE = yes 71 CONSOLE_ENABLE = yes
51 SHOW_VERBOSE_INFO = yes 72 SHOW_VERBOSE_INFO = yes
52 endif 73 endif
53 ifeq ($(findstring verbose,$(HELIX)), verbose) 74 ifneq ($(filter verbose,$(helix_option)),)
54 SHOW_VERBOSE_INFO = yes 75 SHOW_VERBOSE_INFO = yes
55 endif 76 endif
56 SHOW_HELIX_OPTIONS = yes 77 SHOW_HELIX_OPTIONS = yes
@@ -120,7 +141,8 @@ ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
120 $(info -- OLED_DRIVER_ENABLE = $(OLED_DRIVER_ENABLE)) 141 $(info -- OLED_DRIVER_ENABLE = $(OLED_DRIVER_ENABLE))
121 $(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE)) 142 $(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE))
122 $(info -- OPT_DEFS = $(OPT_DEFS)) 143 $(info -- OPT_DEFS = $(OPT_DEFS))
123 $(info -- LTO_ENABLE = $(LTO_ENABLE)) 144 $(info -- SPLIT_KEYBOARD = $(SPLIT_KEYBOARD))
145 $(info -- LTO_ENABLE = $(LTO_ENABLE))
124 $(info ) 146 $(info )
125 endif 147 endif
126endif 148endif
diff --git a/keyboards/helix/pico/qmk_conf/config.h b/keyboards/helix/pico/qmk_conf/config.h
new file mode 100644
index 000000000..765318519
--- /dev/null
+++ b/keyboards/helix/pico/qmk_conf/config.h
@@ -0,0 +1,43 @@
1/*
2This is the c configuration file for the keymap
3
4Copyright 2012 Jun Wako <wakojun@gmail.com>
5Copyright 2015 Jack Humbert
6
7This program is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 2 of the License, or
10(at your option) any later version.
11
12This program is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with this program. If not, see <http://www.gnu.org/licenses/>.
19*/
20
21#pragma once
22
23// place overrides here
24
25#ifdef AUDIO_ENABLE
26 #define STARTUP_SONG SONG(STARTUP_SOUND)
27 #define AUDIO_CLICKY
28#endif
29
30// If you need more program area, try select and reduce rgblight modes to use.
31
32// Selection of RGBLIGHT MODE to use.
33#if defined(LED_ANIMATIONS)
34 #define RGBLIGHT_EFFECT_BREATHING
35 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
36 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
37 #define RGBLIGHT_EFFECT_SNAKE
38 #define RGBLIGHT_EFFECT_KNIGHT
39 #define RGBLIGHT_EFFECT_CHRISTMAS
40 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
41 //#define RGBLIGHT_EFFECT_RGB_TEST
42 //#define RGBLIGHT_EFFECT_ALTERNATING
43#endif
diff --git a/keyboards/helix/pico/qmk_conf/rules.mk b/keyboards/helix/pico/qmk_conf/rules.mk
new file mode 100644
index 000000000..966e64d61
--- /dev/null
+++ b/keyboards/helix/pico/qmk_conf/rules.mk
@@ -0,0 +1,4 @@
1EXTRAKEY_ENABLE = yes # Audio control and System control
2AUDIO_ENABLE = yes # Audio output on port B5
3
4include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
diff --git a/keyboards/helix/pico/sc/back/rules.mk b/keyboards/helix/pico/sc/back/rules.mk
deleted file mode 100644
index 066fffb74..000000000
--- a/keyboards/helix/pico/sc/back/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/pico/sc/rules.mk b/keyboards/helix/pico/sc/rules.mk
index d38a61809..4ed0672a7 100644
--- a/keyboards/helix/pico/sc/rules.mk
+++ b/keyboards/helix/pico/sc/rules.mk
@@ -1 +1,2 @@
1SPLIT_KEYBOARD = yes 1SPLIT_KEYBOARD = yes
2LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/pico/sc/under/rules.mk b/keyboards/helix/pico/sc/under/rules.mk
deleted file mode 100644
index a37aa6fab..000000000
--- a/keyboards/helix/pico/sc/under/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1LED_UNDERGLOW_ENABLE = yes
diff --git a/keyboards/helix/rev2/back/oled/rules.mk b/keyboards/helix/rev2/back/oled/rules.mk
deleted file mode 100644
index dd68e9d3b..000000000
--- a/keyboards/helix/rev2/back/oled/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1OLED_ENABLE = yes
diff --git a/keyboards/helix/rev2/keymaps/default/readme.md b/keyboards/helix/rev2/keymaps/default/readme.md
index 1237e5d5b..8614fce53 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`
112# you can uncomment and edit follows 7 Variables 112# you can uncomment and edit follows 7 Variables
113# jp: 以下ã®7ã¤ã®å¤‰æ•°ã‚’å¿…è¦ã«å¿œã˜ã¦ç·¨é›†ã—ã€ã‚³ãƒ¡ãƒ³ãƒˆã‚¢ã‚¦ãƒˆã‚’ã¯ãšã—ã¾ã™ã€‚ 113# jp: 以下ã®7ã¤ã®å¤‰æ•°ã‚’å¿…è¦ã«å¿œã˜ã¦ç·¨é›†ã—ã€ã‚³ãƒ¡ãƒ³ãƒˆã‚¢ã‚¦ãƒˆã‚’ã¯ãšã—ã¾ã™ã€‚
114# HELIX_ROWS = 5 # Helix Rows is 4 or 5 114# HELIX_ROWS = 5 # Helix Rows is 4 or 5
115# OLED_ENABLE = no # OLED_ENABLE 115# OLED_ENABLE = yes # OLED_ENABLE
116# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" 116# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
117# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.) 117# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
118# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) 118# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
@@ -128,35 +128,25 @@ $ cd qmk_firmware
128 128
129build 129build
130``` 130```
131$ make helix:default 131$ make helix:default # with oled
132$ make helix/rev2/back:default # with backlight 132$ make helix/rev2/back:default # with oled and backlight
133$ make HELIX=no_ani helix/rev2/back:default # with backlight without animation 133$ make HELIX=no-ani helix/rev2/back:default # with oled and backlight without animation
134$ make helix/rev2/under:default # with underglow 134$ make helix/rev2/under:default # with oled and underglow
135$ make helix/rev2/oled:default # with oled 135$ make HELIX=no-oled helix:default # without oled
136$ make helix/rev2/oled/back:default # with oled and backlight
137$ make helix/rev2/oled/under:default # with oled and underglow
138``` 136```
139 137
140build (experimental use of split_common) 138build (experimental use of split_common with backlight and oled)
141``` 139```
142$ make helix/rev2/sc:default 140$ make helix/rev2/sc:default
143$ make helix/rev2/sc/back:default
144$ make helix/rev2/sc/under:default
145$ make helix/rev2/sc/oled:default
146$ make helix/rev2/sc/oledback:default
147$ make helix/rev2/sc/oledunder:default
148``` 141```
149 142
150flash to keyboard 143flash to keyboard
151``` 144```
152$ make helix:default:flash 145$ make helix:default:flash # with oled
153$ make helix/rev2/back:default:flash # with backlight 146$ make helix/rev2/back:default:flash # with oled and backlight
154$ make HELIX=no_ani helix/rev2/back:default:flash # with backlight without animation 147$ make HELIX=no-ani helix/rev2/back:default:flash # with oled and backlight without animation
155$ make helix/rev2/under:default:flash # with underglow 148$ make helix/rev2/under:default:flash # with oled and underglow
156$ make helix/rev2/oled:default:flash # with oled 149$ make HELIX=no-oled helix:default:flash # without oled
157$ make helix/rev2/oled/back:default:flash # with oled and backlight
158$ make helix/rev2/oled/under:default:flash # with oled and underglow
159
160``` 150```
161 151
162## Link 152## Link
diff --git a/keyboards/helix/rev2/keymaps/default/readme_jp.md b/keyboards/helix/rev2/keymaps/default/readme_jp.md
index 2dfab351b..5f0295f8f 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 ã‚’ã¤ã‘ãŸå ´åˆã¯ã€
30# you can uncomment and edit follows 7 Variables 30# you can uncomment and edit follows 7 Variables
31# jp: 以下ã®7ã¤ã®å¤‰æ•°ã‚’å¿…è¦ã«å¿œã˜ã¦ç·¨é›†ã—ã€ã‚³ãƒ¡ãƒ³ãƒˆã‚¢ã‚¦ãƒˆã‚’ã¯ãšã—ã¾ã™ã€‚ 31# jp: 以下ã®7ã¤ã®å¤‰æ•°ã‚’å¿…è¦ã«å¿œã˜ã¦ç·¨é›†ã—ã€ã‚³ãƒ¡ãƒ³ãƒˆã‚¢ã‚¦ãƒˆã‚’ã¯ãšã—ã¾ã™ã€‚
32# HELIX_ROWS = 5 # Helix Rows is 4 or 5 32# HELIX_ROWS = 5 # Helix Rows is 4 or 5
33# OLED_ENABLE = no # OLED_ENABLE 33# OLED_ENABLE = yes # OLED_ENABLE
34# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" 34# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
35# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.) 35# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
36# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) 36# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
@@ -61,11 +61,12 @@ rules.mk ã®ä¸‹è¨˜ã®éƒ¨åˆ†ã‚’編集ã—㦠no ã‚’ yes ã«å¤‰æ›´ã—ã¦ãã ã•ã
61LED_UNDERGLOW_ENABLE = yes # LED underglow (Enable WS2812 RGB underlight.) 61LED_UNDERGLOW_ENABLE = yes # LED underglow (Enable WS2812 RGB underlight.)
62``` 62```
63 63
64## OLEDを有効ã«ã™ã‚‹ 64## OLEDを無効ã«ã™ã‚‹
65 65
66rules.mk ã®ä¸‹è¨˜ã®éƒ¨åˆ†ã‚’編集ã—㦠no ã‚’ yes ã«å¤‰æ›´ã—ã¦ãã ã•ã„。 66OLED ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§æœ‰åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚
67無効ã«ã—ãŸã„ã¨ã㯠rules.mk ã®ä¸‹è¨˜ã®éƒ¨åˆ†ã‚’編集ã—㦠yes ã‚’ no ã«å¤‰æ›´ã—ã¦ãã ã•ã„。
67``` 68```
68OLED_ENABLE = yes # OLED_ENABLE 69OLED_ENABLE = no # OLED_ENABLE
69``` 70```
70 71
71## iPad/iPhoneサãƒãƒ¼ãƒˆã‚’有効ã«ã™ã‚‹ã€‚ 72## iPad/iPhoneサãƒãƒ¼ãƒˆã‚’有効ã«ã™ã‚‹ã€‚
@@ -104,9 +105,9 @@ $ make helix:default:clean
104 105
105上記ã®ã€rules.mk ã«ã‚ˆã‚‹ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºé …ç›®ã®ä¸€éƒ¨ã¯ä¸‹è¨˜ã®ã‚ˆã†ã«ã‚³ãƒžãƒ³ãƒ‰ä¸Šã§ç›´æŽ¥æŒ‡å®šã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚ 106上記ã®ã€rules.mk ã«ã‚ˆã‚‹ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºé …ç›®ã®ä¸€éƒ¨ã¯ä¸‹è¨˜ã®ã‚ˆã†ã«ã‚³ãƒžãƒ³ãƒ‰ä¸Šã§ç›´æŽ¥æŒ‡å®šã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚
106 107
107OLED を有効ã«ã—ã¦ã‚³ãƒ³ãƒ‘イルã—ã¦ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰ã¸ã®æ›¸ã込む。 108OLED を無効ã«ã—ã¦ã‚³ãƒ³ãƒ‘イルã—ã¦ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰ã¸ã®æ›¸ã込む。
108``` 109```
109$ make helix/rev2/oled:default:flash 110$ make HELIX=no-oled helix/rev2:default:flash
110``` 111```
111 112
112RGB ãƒãƒƒã‚¯ãƒ©ã‚¤ãƒˆã‚’有効ã«ã—ã¦ã‚³ãƒ³ãƒ‘イルã—ã¦ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰ã¸æ›¸ã込む。 113RGB ãƒãƒƒã‚¯ãƒ©ã‚¤ãƒˆã‚’有効ã«ã—ã¦ã‚³ãƒ³ãƒ‘イルã—ã¦ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰ã¸æ›¸ã込む。
@@ -119,14 +120,14 @@ RGB Underglow を有効ã«ã—ã¦ã‚³ãƒ³ãƒ‘イルã—ã¦ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰ã¸æ›¸ãè¾¼
119$ make helix/rev2/under:default:flash 120$ make helix/rev2/under:default:flash
120``` 121```
121 122
122OLED ã¨RGB ãƒãƒƒã‚¯ãƒ©ã‚¤ãƒˆã‚’有効ã«ã—ã¦ã‚³ãƒ³ãƒ‘イルã—ã¦ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰ã¸æ›¸ã込む。 123OLED を無効ã«ã—ã¦ã€RGB ãƒãƒƒã‚¯ãƒ©ã‚¤ãƒˆã‚’有効ã«ã—ã¦ã‚³ãƒ³ãƒ‘イルã—ã¦ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰ã¸æ›¸ã込む。
123``` 124```
124$ make helix/rev2/oled/back:default:flash 125$ make HELIX=no-oled helix/rev2/back:default:flash
125``` 126```
126 127
127OLED ã¨RGB Underglowを有効ã«ã—ã¦ã‚³ãƒ³ãƒ‘イルã—ã¦ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰ã¸æ›¸ã込む。 128OLED を無効ã«ã—ã¦ã€RGB Underglowを有効ã«ã—ã¦ã‚³ãƒ³ãƒ‘イルã—ã¦ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰ã¸æ›¸ã込む。
128``` 129```
129$ make helix/rev2/oled/under:default:flash 130$ make HELIX=no-oled helix/rev2/under:default:flash
130``` 131```
131 132
132## リンク 133## リンク
diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk
index 013ef1482..cc6d56811 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
14OLED_ENABLE = yes # OLED_ENABLE 14OLED_ENABLE = yes # OLED_ENABLE
15# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" 15# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
16LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.) 16LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.)
17# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) 17LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
18LED_ANIMATIONS = yes # LED animations 18LED_ANIMATIONS = yes # LED animations
19# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) 19# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
20 20
21SRC += led_test_init.c 21SRC += led_test_init.c
diff --git a/keyboards/helix/rev2/keymaps/xulkal/rules.mk b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
index 03800f9bb..7fac4df7e 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\"
11OPT_DEFS += -DOLED_90ROTATION 11OPT_DEFS += -DOLED_90ROTATION
12 12
13SPLIT_KEYBOARD = yes 13SPLIT_KEYBOARD = yes
14
15# Explicitly disable helix standard post-processing
16KEYBOARD_LOCAL_FEATURES_MK :=
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
index 3f8a7216f..1d0b55cbf 100644
--- a/keyboards/helix/rev2/local_features.mk
+++ b/keyboards/helix/rev2/local_features.mk
@@ -5,6 +5,8 @@
5# combinations of standard options) into QMK standard options. 5# combinations of standard options) into QMK standard options.
6# 6#
7 7
8KEYBOARD_LOCAL_FEATURES_MK :=
9
8define HELIX_CUSTOMISE_MSG 10define HELIX_CUSTOMISE_MSG
9 $(info Helix Spacific Build Options) 11 $(info Helix Spacific Build Options)
10 $(info - OLED_ENABLE = $(OLED_ENABLE)) 12 $(info - OLED_ENABLE = $(OLED_ENABLE))
@@ -15,42 +17,79 @@ define HELIX_CUSTOMISE_MSG
15 $(info ) 17 $(info )
16endef 18endef
17 19
20define HELIX_HELP_MSG
21 $(info Helix keyboard convenient command line option)
22 $(info - make HELIX=<options> helix:<keymap>)
23 $(info - option= oled | no-oled | back | no-back | under | na | no-ani)
24 $(info - ios | sc | split-common | scan | verbose)
25 $(info - ex.)
26 $(info - make HELIX=no-oled helix:<keymap>)
27 $(info - make HELIX=oled,no-back helix:<keymap>)
28 $(info - make HELIX=oled,under helix:<keymap>)
29 $(info - make HELIX=oled,back,na helix:<keymap>)
30 $(info - make HELIX=oled,back,ios helix:<keymap>)
31 $(info )
32endef
33
18 ifneq ($(strip $(HELIX)),) 34 ifneq ($(strip $(HELIX)),)
19 ### Helix keyboard keymap: convenient command line option 35 COMMA=,
20 ## make HELIX=<options> helix:<keymap> 36 helix_option := $(subst $(COMMA), , $(HELIX))
21 ## option= oled | back | under | na | ios 37 ifneq ($(filter help,$(helix_option)),)
22 ## ex. 38 $(eval $(call HELIX_HELP_MSG))
23 ## make HELIX=oled helix:<keymap> 39 $(error )
24 ## make HELIX=oled,back helix:<keymap> 40 endif
25 ## make HELIX=oled,under helix:<keymap> 41 ifneq ($(filter nooled,$(helix_option)),)
26 ## make HELIX=oled,back,na helix:<keymap> 42 OLED_ENABLE = no
27 ## make HELIX=oled,back,ios helix:<keymap> 43 else ifneq ($(filter no-oled,$(helix_option)),)
28 ## 44 OLED_ENABLE = no
29 ifeq ($(findstring oled,$(HELIX)), oled) 45 else ifneq ($(filter oled,$(helix_option)),)
30 OLED_ENABLE = yes 46 OLED_ENABLE = yes
31 endif 47 endif
32 ifeq ($(findstring back,$(HELIX)), back) 48 ifneq ($(filter noback,$(helix_option)),)
49 LED_BACK_ENABLE = no
50 LED_UNDERGLOW_ENABLE = no
51 else ifneq ($(filter no-back,$(helix_option)),)
52 LED_BACK_ENABLE = no
53 LED_UNDERGLOW_ENABLE = no
54 else ifneq ($(filter nounder,$(helix_option)),)
55 LED_BACK_ENABLE = no
56 LED_UNDERGLOW_ENABLE = no
57 else ifneq ($(filter no-under,$(helix_option)),)
58 LED_BACK_ENABLE = no
59 LED_UNDERGLOW_ENABLE = no
60 else ifneq ($(filter back,$(helix_option)),)
33 LED_BACK_ENABLE = yes 61 LED_BACK_ENABLE = yes
34 else ifeq ($(findstring under,$(HELIX)), under) 62 LED_UNDERGLOW_ENABLE = no
63 else ifneq ($(filter under,$(helix_option)),)
64 LED_BACK_ENABLE = no
35 LED_UNDERGLOW_ENABLE = yes 65 LED_UNDERGLOW_ENABLE = yes
36 endif 66 endif
37 ifeq ($(findstring na,$(HELIX)), na) 67 ifneq ($(filter na,$(helix_option)),)
38 LED_ANIMATIONS = no 68 LED_ANIMATIONS = no
39 endif 69 endif
40 ifeq ($(findstring no_ani,$(HELIX)), no_ani) 70 ifneq ($(filter no_ani,$(helix_option)),)
41 LED_ANIMATIONS = no 71 LED_ANIMATIONS = no
42 endif 72 endif
43 ifeq ($(findstring ios,$(HELIX)), ios) 73 ifneq ($(filter no-ani,$(helix_option)),)
74 LED_ANIMATIONS = no
75 endif
76 ifneq ($(filter ios,$(helix_option)),)
44 IOS_DEVICE_ENABLE = yes 77 IOS_DEVICE_ENABLE = yes
45 endif 78 endif
46 ifeq ($(findstring scan,$(HELIX)), scan) 79 ifneq ($(filter sc,$(helix_option)),)
80 SPLIT_KEYBOARD = yes
81 endif
82 ifneq ($(filter split-common,$(helix_option)),)
83 SPLIT_KEYBOARD = yes
84 endif
85 ifneq ($(filter scan,$(helix_option)),)
47 # use DEBUG_MATRIX_SCAN_RATE 86 # use DEBUG_MATRIX_SCAN_RATE
48 # see docs/newbs_testing_debugging.md 87 # see docs/newbs_testing_debugging.md
49 OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE 88 OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
50 CONSOLE_ENABLE = yes 89 CONSOLE_ENABLE = yes
51 SHOW_VERBOSE_INFO = yes 90 SHOW_VERBOSE_INFO = yes
52 endif 91 endif
53 ifeq ($(findstring verbose,$(HELIX)), verbose) 92 ifeq ($(filter verbose,$(helix_option)), verbose)
54 SHOW_VERBOSE_INFO = yes 93 SHOW_VERBOSE_INFO = yes
55 endif 94 endif
56 SHOW_HELIX_OPTIONS = yes 95 SHOW_HELIX_OPTIONS = yes
@@ -119,7 +158,8 @@ ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
119 $(info -- OLED_DRIVER_ENABLE = $(OLED_DRIVER_ENABLE)) 158 $(info -- OLED_DRIVER_ENABLE = $(OLED_DRIVER_ENABLE))
120 $(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE)) 159 $(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE))
121 $(info -- OPT_DEFS = $(OPT_DEFS)) 160 $(info -- OPT_DEFS = $(OPT_DEFS))
122 $(info -- LTO_ENABLE = $(LTO_ENABLE)) 161 $(info -- SPLIT_KEYBOARD = $(SPLIT_KEYBOARD))
162 $(info -- LTO_ENABLE = $(LTO_ENABLE))
123 $(info ) 163 $(info )
124 endif 164 endif
125endif 165endif
diff --git a/keyboards/helix/rev2/oled/back/rules.mk b/keyboards/helix/rev2/oled/back/rules.mk
deleted file mode 100644
index 066fffb74..000000000
--- a/keyboards/helix/rev2/oled/back/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/rev2/oled/rules.mk b/keyboards/helix/rev2/oled/rules.mk
deleted file mode 100644
index dd68e9d3b..000000000
--- a/keyboards/helix/rev2/oled/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1OLED_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 a37aa6fab..000000000
--- a/keyboards/helix/rev2/oled/under/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1LED_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 000000000..b8c1041cd
--- /dev/null
+++ b/keyboards/helix/rev2/qmk_conf/config.h
@@ -0,0 +1,38 @@
1/*
2This is the c configuration file for the keymap
3
4Copyright 2012 Jun Wako <wakojun@gmail.com>
5Copyright 2015 Jack Humbert
6
7This program is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 2 of the License, or
10(at your option) any later version.
11
12This program is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with this program. If not, see <http://www.gnu.org/licenses/>.
19*/
20
21#pragma once
22
23// place overrides here
24
25// If you need more program area, try select and reduce rgblight modes to use.
26
27// Selection of RGBLIGHT MODE to use.
28#if defined(LED_ANIMATIONS)
29 #define RGBLIGHT_EFFECT_BREATHING
30 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
31 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
32 #define RGBLIGHT_EFFECT_SNAKE
33 #define RGBLIGHT_EFFECT_KNIGHT
34 #define RGBLIGHT_EFFECT_CHRISTMAS
35 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
36 //#define RGBLIGHT_EFFECT_RGB_TEST
37 //#define RGBLIGHT_EFFECT_ALTERNATING
38#endif
diff --git a/keyboards/helix/rev2/qmk_conf/rules.mk b/keyboards/helix/rev2/qmk_conf/rules.mk
new file mode 100644
index 000000000..67caab1ce
--- /dev/null
+++ b/keyboards/helix/rev2/qmk_conf/rules.mk
@@ -0,0 +1,4 @@
1LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.)
2LED_ANIMATIONS = yes # LED animations
3
4include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk
index db584c0b2..d5d69c979 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.
2 2
3# Helix Spacific Build Options default values 3# Helix Spacific Build Options default values
4HELIX_ROWS = 5 # Helix Rows is 4 or 5 4HELIX_ROWS = 5 # Helix Rows is 4 or 5
5OLED_ENABLE = no # OLED_ENABLE 5OLED_ENABLE = yes # OLED_ENABLE
6LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" 6LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
7LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.) 7LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
8LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) 8LED_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 066fffb74..000000000
--- a/keyboards/helix/rev2/sc/back/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1LED_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 dd68e9d3b..000000000
--- a/keyboards/helix/rev2/sc/oled/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1OLED_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 645984f86..000000000
--- a/keyboards/helix/rev2/sc/oledback/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
1OLED_ENABLE = yes
2LED_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 e415cbd49..000000000
--- a/keyboards/helix/rev2/sc/oledunder/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
1OLED_ENABLE = yes
2LED_UNDERGLOW_ENABLE = yes
diff --git a/keyboards/helix/rev2/sc/rules.mk b/keyboards/helix/rev2/sc/rules.mk
index d38a61809..4ed0672a7 100644
--- a/keyboards/helix/rev2/sc/rules.mk
+++ b/keyboards/helix/rev2/sc/rules.mk
@@ -1 +1,2 @@
1SPLIT_KEYBOARD = yes 1SPLIT_KEYBOARD = yes
2LED_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 a37aa6fab..000000000
--- a/keyboards/helix/rev2/sc/under/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1LED_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 dd68e9d3b..000000000
--- a/keyboards/helix/rev2/under/oled/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1OLED_ENABLE = yes
diff --git a/keyboards/helix/rev3_4rows/rules.mk b/keyboards/helix/rev3_4rows/rules.mk
index 7168f174f..a5916c114 100644
--- a/keyboards/helix/rev3_4rows/rules.mk
+++ b/keyboards/helix/rev3_4rows/rules.mk
@@ -1,7 +1,8 @@
1EXTRAKEY_ENABLE = yes # Audio control and System control 1EXTRAKEY_ENABLE = yes # Audio control and System control
2RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow 2RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
3SPLIT_KEYBOARD = yes 3SPLIT_KEYBOARD = yes
4#RGB_MATRIX_ENABLE = WS2812 4RGB_MATRIX_ENABLE = no
5RGB_MATRIX_DRIVER = WS2812
5OLED_DRIVER_ENABLE = yes 6OLED_DRIVER_ENABLE = yes
6ENCODER_ENABLE = yes 7ENCODER_ENABLE = yes
7DIP_SWITCH_ENABLE = yes 8DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk
index 7168f174f..a5916c114 100644
--- a/keyboards/helix/rev3_5rows/rules.mk
+++ b/keyboards/helix/rev3_5rows/rules.mk
@@ -1,7 +1,8 @@
1EXTRAKEY_ENABLE = yes # Audio control and System control 1EXTRAKEY_ENABLE = yes # Audio control and System control
2RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow 2RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
3SPLIT_KEYBOARD = yes 3SPLIT_KEYBOARD = yes
4#RGB_MATRIX_ENABLE = WS2812 4RGB_MATRIX_ENABLE = no
5RGB_MATRIX_DRIVER = WS2812
5OLED_DRIVER_ENABLE = yes 6OLED_DRIVER_ENABLE = yes
6ENCODER_ENABLE = yes 7ENCODER_ENABLE = yes
7DIP_SWITCH_ENABLE = yes 8DIP_SWITCH_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 13:51:27 +0000