Browse Source

edit all references to keyboard/helix to be keyboard/yushakobo/helix, tested working on most keymaps

pull/16090/head
peepeetee 1 year ago
parent
commit
65ecb7bc24
25 changed files with 71 additions and 71 deletions
  1. +8
    -8
      keyboards/yushakobo/helix/config.h
  2. +5
    -5
      keyboards/yushakobo/helix/helix.h
  3. +1
    -1
      keyboards/yushakobo/helix/pico/keymaps/biacco/rules.mk
  4. +10
    -10
      keyboards/yushakobo/helix/pico/keymaps/default/readme.md
  5. +6
    -6
      keyboards/yushakobo/helix/pico/keymaps/default/readme_jp.md
  6. +1
    -1
      keyboards/yushakobo/helix/pico/keymaps/mtei/rules.mk
  7. +3
    -3
      keyboards/yushakobo/helix/pico/post_rules.mk
  8. +9
    -9
      keyboards/yushakobo/helix/rev2/keymaps/default/readme_jp.md
  9. +2
    -2
      keyboards/yushakobo/helix/rev2/keymaps/default/rules.mk
  10. +1
    -1
      keyboards/yushakobo/helix/rev2/keymaps/edvorakjp/rules.mk
  11. +2
    -2
      keyboards/yushakobo/helix/rev2/keymaps/five_rows_jis/rules.mk
  12. +1
    -1
      keyboards/yushakobo/helix/rev2/keymaps/fraanrosi/readme.md
  13. +1
    -1
      keyboards/yushakobo/helix/rev2/keymaps/fraanrosi/rules.mk
  14. +3
    -3
      keyboards/yushakobo/helix/rev2/keymaps/froggy/rules.mk
  15. +3
    -3
      keyboards/yushakobo/helix/rev2/keymaps/froggy_106/rules.mk
  16. +2
    -2
      keyboards/yushakobo/helix/rev2/keymaps/led_test/README.md
  17. +1
    -1
      keyboards/yushakobo/helix/rev2/keymaps/led_test/rules.mk
  18. +2
    -2
      keyboards/yushakobo/helix/rev2/keymaps/yshrsmz/rules.mk
  19. +4
    -4
      keyboards/yushakobo/helix/rev2/local_features.mk
  20. +1
    -1
      keyboards/yushakobo/helix/rev2/readme.md
  21. +1
    -1
      keyboards/yushakobo/helix/rev3_4rows/config.h
  22. +1
    -1
      keyboards/yushakobo/helix/rev3_4rows/readme.md
  23. +1
    -1
      keyboards/yushakobo/helix/rev3_5rows/config.h
  24. +1
    -1
      keyboards/yushakobo/helix/rev3_5rows/readme.md
  25. +1
    -1
      keyboards/yushakobo/helix/rules.mk

+ 8
- 8
keyboards/yushakobo/helix/config.h View File

@ -20,18 +20,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
// GCC include 'config.h" sequence in qmk_firmware/keyboards/helix/
// -include keyboards/helix/config.h
// -include keyboards/helix/rev?/config.h
// -include keyboards/helix/rev?/keymaps/MAPNAME/config.h
// GCC include 'config.h" sequence in qmk_firmware/keyboards/yushakobo/helix/
// -include keyboards/yushakobo/helix/config.h
// -include keyboards/yushakobo/helix/rev?/config.h
// -include keyboards/yushakobo/helix/rev?/keymaps/MAPNAME/config.h
// XXXX.c
// GCC include search path in qmk_firmare/keyboards/helix/
// GCC include search path in qmk_firmare/keyboards/yushakobo/helix/
// #include "..." search starts here:
// #include <...> search starts here:
// keyboards/helix/rev?/keymaps/MAPNAME
// keyboards/helix
// keyboards/helix/rev?
// keyboards/yushakobo/helix/rev?/keymaps/MAPNAME
// keyboards/yushakobo/helix
// keyboards/yushakobo/helix/rev?
// .
// ./tmk_core
// ......

+ 5
- 5
keyboards/yushakobo/helix/helix.h View File

@ -2,18 +2,18 @@
#include "quantum.h"
#ifdef KEYBOARD_helix_rev1
#ifdef KEYBOARD_yushakobo_helix_rev1
#include "rev1.h"
#endif
#ifdef KEYBOARD_helix_rev2
#ifdef KEYBOARD_yushakobo_helix_rev2
#include "rev2.h"
#endif
#ifdef KEYBOARD_helix_rev3_5rows
#ifdef KEYBOARD_yushakobo_helix_rev3_5rows
#include "rev3_5rows.h"
#endif
#ifdef KEYBOARD_helix_rev3_4rows
#ifdef KEYBOARD_yushakobo_helix_rev3_4rows
#include "rev3_4rows.h"
#endif
#ifdef KEYBOARD_helix_pico
#ifdef KEYBOARD_yushakobo_helix_pico
#include "pico.h"
#endif

+ 1
- 1
keyboards/yushakobo/helix/pico/keymaps/biacco/rules.mk View File

@ -2,7 +2,7 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
# See TOP/keyboards/helix/rules.mk for a list of options that can be set.
# See TOP/keyboards/yushakobo/helix/rules.mk for a list of options that can be set.
# See TOP/docs/config_options.md for more information.
#
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)


+ 10
- 10
keyboards/yushakobo/helix/pico/keymaps/default/readme.md View File

@ -92,7 +92,7 @@
## Customize
see `qmk_firmware/keyboards/helix/pico/keymaps/default/rules.mk`
see `qmk_firmware/keyboards/yushakobo/helix/pico/keymaps/default/rules.mk`
```
# Helix Spacific Build Options
@ -112,23 +112,23 @@ $ cd qmk_firmware
build
```
$ make helix/pico:default
$ make helix/pico/back:default # with backlight
$ make HELIX=no-ani helix/pico/back:default # with backlight without animation
$ make helix/pico/under:default # with underglow
$ make yushakobo/helix/pico:default
$ make yushakobo/helix/pico/back:default # with backlight
$ make HELIX=no-ani yushakobo/helix/pico/back:default # with backlight without animation
$ make yushakobo/helix/pico/under:default # with underglow
```
build (experimental use of split_common with backlight)
```
$ make helix/pico/sc:default
$ make yushakobo/helix/pico/sc:default
```
flash to keyboard
```
$ make helix/pico:default:flash
$ make helix/pico/back:default:flash # with backlight
$ make HELIX=no_ani helix/pico/back:default:flash # with backlight without animation
$ make helix/pico/under:default:flash # with underglow
$ make yushakobo/helix/pico:default:flash
$ make yushakobo/helix/pico/back:default:flash # with backlight
$ make HELIX=no_ani yushakobo/helix/pico/back:default:flash # with backlight without animation
$ make yushakobo/helix/pico/under:default:flash # with underglow
```


+ 6
- 6
keyboards/yushakobo/helix/pico/keymaps/default/readme_jp.md View File

@ -59,7 +59,7 @@
## カスタマイズ
RGB バックライトまたは、RGB Underglow をつけた場合は、
`qmk_firmware/keyboards/helix/pico/keymaps/default/rules.mk` の以下の部分を編集して機能を有効化してください。
`qmk_firmware/keyboards/yushakobo/helix/pico/keymaps/default/rules.mk` の以下の部分を編集して機能を有効化してください。
```
# Helix Spacific Build Options
@ -105,31 +105,31 @@ $ cd qmk_firmware
qmk_firmwareでは各キーボードのコンパイルは、`<キーボード名>:<キーマップ名>`という指定で行います。
```
$ make helix/pico:default
$ make yushakobo/helix/pico:default
```
キーボードへの書き込みまで同時に行うには下記のように`:flash`を付けます。
```
$ make helix/pico:default:flash
$ make yushakobo/helix/pico:default:flash
```
コンパイル結果と中間生成物を消去したい場合は以下のようにします。
```
$ make helix/pico:default:clean
$ make yushakobo/helix/pico:default:clean
```
上記の、rules.mk によるカスタマイズ項目の一部は下記のようにコマンド上で直接指定することも可能です。
RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
```
$ make helix/pico/back:default:flash
$ make yushakobo/helix/pico/back:default:flash
```
RGB Underglow を有効にしてコンパイルしてキーボードへ書き込む。
```
$ make helix/pico/under:default:flash
$ make yushakobo/helix/pico/under:default:flash
```
## リンク


+ 1
- 1
keyboards/yushakobo/helix/pico/keymaps/mtei/rules.mk View File

@ -2,7 +2,7 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
# See TOP/keyboards/helix/rules.mk for a list of options that can be set.
# See TOP/keyboards/yushakobo/helix/rules.mk for a list of options that can be set.
# See TOP/docs/config_options.md for more information.
#
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)


+ 3
- 3
keyboards/yushakobo/helix/pico/post_rules.mk View File

@ -8,9 +8,9 @@
# Parse 'HELIX=xx,yy,zz' option
ifneq ($(strip $(HELIX)),)
# make HELIX=ios helix/pico:AKEYMAP
# make HELIX=no-ani helix/pico:AKEYMAP
# make HELIX=ios,no-ani helix/pico:AKEYMAP
# make HELIX=ios yushakobo/helix/pico:AKEYMAP
# make HELIX=no-ani yushakobo/helix/pico:AKEYMAP
# make HELIX=ios,no-ani yushakobo/helix/pico:AKEYMAP
define HELIX_OPTION_PARSE
# parce 'no-ani' 'ios'
$(if $(SHOW_PARCE),$(info parse .$1.)) #debug


+ 9
- 9
keyboards/yushakobo/helix/rev2/keymaps/default/readme_jp.md View File

@ -23,7 +23,7 @@
Helix キーボードを4行版として製作したり、オプションの OLED をつけたり、
RGB バックライトまたは、RGB Underglow をつけた場合は、
`qmk_firmware/keyboards/helix/rev2/keymaps/default/rules.mk` の以下の部分を編集して機能を有効化してください。
`qmk_firmware/keyboards/yushakobo/helix/rev2/keymaps/default/rules.mk` の以下の部分を編集して機能を有効化してください。
```
# Helix Spacific Build Options
@ -88,46 +88,46 @@ $ cd qmk_firmware
qmk_firmwareでは各キーボードのコンパイルは、`<キーボード名>:<キーマップ名>`という指定で行います。
```
$ make helix:default
$ make yushakobo/helix:default
```
キーボードへの書き込みまで同時に行うには下記のように`:flash`を付けます。
```
$ make helix:default:flash
$ make yushakobo/helix:default:flash
```
コンパイル結果と中間生成物を消去したい場合は以下のようにします。
```
$ make helix:default:clean
$ make yushakobo/helix:default:clean
```
上記の、rules.mk によるカスタマイズ項目の一部は下記のようにコマンド上で直接指定することも可能です。
OLED を無効にしてコンパイルしてキーボードへの書き込む。
```
$ make HELIX=no-oled helix/rev2:default:flash
$ make HELIX=no-oled yushakobo/helix/rev2:default:flash
```
RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
```
$ make helix/rev2/back:default:flash
$ make yushakobo/helix/rev2/back:default:flash
```
RGB Underglow を有効にしてコンパイルしてキーボードへ書き込む。
```
$ make helix/rev2/under:default:flash
$ make yushakobo/helix/rev2/under:default:flash
```
OLED を無効にして、RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
```
$ make HELIX=no-oled helix/rev2/back:default:flash
$ make HELIX=no-oled yushakobo/helix/rev2/back:default:flash
```
OLED を無効にして、RGB Underglowを有効にしてコンパイルしてキーボードへ書き込む。
```
$ make HELIX=no-oled helix/rev2/under:default:flash
$ make HELIX=no-oled yushakobo/helix/rev2/under:default:flash
```
## リンク


+ 2
- 2
keyboards/yushakobo/helix/rev2/keymaps/default/rules.mk View File

@ -15,10 +15,10 @@ LTO_ENABLE = yes # if firmware size over limit, try this option
# OLED_ENABLE が yes のとき
# OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
# OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
# OLED_SELECT が core 以外ならば従来どおり yushakobo/helix/local_drivers/ssd1306.c を使用します。
# If OLED_ENABLE is 'yes'
# If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
# If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
# If OLED_SELECT is other than 'core', use yushakobo/helix/local_drivers/ssd1306.c.
OLED_SELECT = core
ifeq ($(strip $(OLED_ENABLE)), yes)


+ 1
- 1
keyboards/yushakobo/helix/rev2/keymaps/edvorakjp/rules.mk View File

@ -2,7 +2,7 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
# See TOP/keyboards/helix/rules.mk for a list of options that can be set.
# See TOP/keyboards/yushakobo/helix/rules.mk for a list of options that can be set.
# See TOP/docs/config_options.md for more information.
#
SPLIT_KEYBOARD = yes


+ 2
- 2
keyboards/yushakobo/helix/rev2/keymaps/five_rows_jis/rules.mk View File

@ -14,8 +14,8 @@ HELIX_ROWS = 5 # Helix Rows is 4 or 5
# OLED_ENABLE が yes のとき
# OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
# OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
# OLED_SELECT が core 以外ならば従来どおり yushakobo/helix/local_drivers/ssd1306.c を使用します。
# If OLED_ENABLE is 'yes'
# If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
# If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
# If OLED_SELECT is other than 'core', use yushakobo/helix/local_drivers/ssd1306.c.
OLED_SELECT = core

+ 1
- 1
keyboards/yushakobo/helix/rev2/keymaps/fraanrosi/readme.md View File

@ -1,6 +1,6 @@
<!---Copyright 2021 Franco Rosi <fraanrosi@gmail.com> -->
## Fraanrosi
A **Latin American Spanish** keymap for Helix/rev2/under, 5 rows.
A **Latin American Spanish** keymap for yushakobo/Helix/rev2/under, 5 rows.
Designed to be as simple and more touch typing oriented as possible.
It was inspired by a DELL Latitude E5470.


+ 1
- 1
keyboards/yushakobo/helix/rev2/keymaps/fraanrosi/rules.mk View File

@ -2,7 +2,7 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
# See TOP/keyboards/helix/rules.mk for a list of options that can be set.
# See TOP/keyboards/yushakobo/helix/rules.mk for a list of options that can be set.
# See TOP/docs/config_options.md for more information.
#
SPLIT_KEYBOARD = yes


+ 3
- 3
keyboards/yushakobo/helix/rev2/keymaps/froggy/rules.mk View File

@ -2,7 +2,7 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
# See TOP/keyboards/helix/rules.mk for a list of options that can be set.
# See TOP/keyboards/yushakobo/helix/rules.mk for a list of options that can be set.
# See TOP/docs/config_options.md for more information.
#
LTO_ENABLE = no # if firmware size over limit, try this option
@ -21,8 +21,8 @@ LED_ANIMATIONS = yes # LED animations
# OLED_ENABLE が yes のとき
# OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
# OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
# OLED_SELECT が core 以外ならば従来どおり yushakobo/helix/local_drivers/ssd1306.c を使用します。
# If OLED_ENABLE is 'yes'
# If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
# If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
# If OLED_SELECT is other than 'core', use yushakobo/helix/local_drivers/ssd1306.c.
OLED_SELECT = core

+ 3
- 3
keyboards/yushakobo/helix/rev2/keymaps/froggy_106/rules.mk View File

@ -2,7 +2,7 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
# See TOP/keyboards/helix/rules.mk for a list of options that can be set.
# See TOP/keyboards/yushakobo/helix/rules.mk for a list of options that can be set.
# See TOP/docs/config_options.md for more information.
#
LTO_ENABLE = yes # if firmware size over limit, try this option
@ -21,8 +21,8 @@ LED_ANIMATIONS = yes # LED animations
# OLED_ENABLE が yes のとき
# OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
# OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
# OLED_SELECT が core 以外ならば従来どおり yushakobo/helix/local_drivers/ssd1306.c を使用します。
# If OLED_ENABLE is 'yes'
# If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
# If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
# If OLED_SELECT is other than 'core', use yushakobo/helix/local_drivers/ssd1306.c.
OLED_SELECT = core

+ 2
- 2
keyboards/yushakobo/helix/rev2/keymaps/led_test/README.md View File

@ -16,12 +16,12 @@ The user can check whether the LED is lit or not.
```
$ cd qmk_firmware
$ make helix:led_test
$ make yushakobo/helix:led_test
```
## Flash QMK Firmware
Execute the 'make' command and press the reset switch on the keyboard.
```
$ make helix:led_test:flash
$ make yushakobo/helix:led_test:flash
```

+ 1
- 1
keyboards/yushakobo/helix/rev2/keymaps/led_test/rules.mk View File

@ -2,7 +2,7 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
# See TOP/keyboards/helix/rules.mk for a list of options that can be set.
# See TOP/keyboards/yushakobo/helix/rules.mk for a list of options that can be set.
# See TOP/docs/config_options.md for more information.
#
SPLIT_KEYBOARD = yes


+ 2
- 2
keyboards/yushakobo/helix/rev2/keymaps/yshrsmz/rules.mk View File

@ -21,8 +21,8 @@ LED_ANIMATIONS = no # LED animations
# OLED_ENABLE が yes のとき
# OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
# OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
# OLED_SELECT が core 以外ならば従来どおり yushakobo/helix/local_drivers/ssd1306.c を使用します。
# If OLED_ENABLE is 'yes'
# If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
# If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
# If OLED_SELECT is other than 'core', use yushakobo/helix/local_drivers/ssd1306.c.
OLED_SELECT = core

+ 4
- 4
keyboards/yushakobo/helix/rev2/local_features.mk View File

@ -10,10 +10,10 @@ KEYBOARD_LOCAL_FEATURES_MK :=
# Parse 'HELIX=xx,yy,zz' option
ifneq ($(strip $(HELIX)),)
# make HELIX=ios helix/pico:AKEYMAP
# make HELIX=no-ani helix/pico:AKEYMAP
# make HELIX=no-oled helix/pico:AKEYMAP
# make HELIX=ios,no-ani,no-oled helix/pico:AKEYMAP
# make HELIX=ios yushakobo/helix/pico:AKEYMAP
# make HELIX=no-ani yushakobo/helix/pico:AKEYMAP
# make HELIX=no-oled yushakobo/helix/pico:AKEYMAP
# make HELIX=ios,no-ani,no-oled yushakobo/helix/pico:AKEYMAP
define HELIX_OPTION_PARSE
# parce 'no-ani' 'ios' 'no-oled'
$(if $(SHOW_PARCE),$(info parse .$1.)) #debug


+ 1
- 1
keyboards/yushakobo/helix/rev2/readme.md View File

@ -8,6 +8,6 @@ A compact split ortholinear keyboard.
Make example for this keyboard (after setting up your build environment):
make helix/rev2:default:flash
make yushakobo/helix/rev2:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

+ 1
- 1
keyboards/yushakobo/helix/rev3_4rows/config.h View File

@ -102,7 +102,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
/* Custom font */
#define OLED_FONT_H "keyboards/helix/common/glcdfont.c"
#define OLED_FONT_H "keyboards/yushakobo/helix/common/glcdfont.c"
/* Encorder */
#define ENCODERS_PAD_A { B6 }


+ 1
- 1
keyboards/yushakobo/helix/rev3_4rows/readme.md View File

@ -8,6 +8,6 @@ A compact split ortholinear keyboard.
Make example for this keyboard (after setting up your build environment):
make helix/rev3_4rows:default:flash
make yushakobo/helix/rev3_4rows:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

+ 1
- 1
keyboards/yushakobo/helix/rev3_5rows/config.h View File

@ -102,7 +102,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
/* Custom font */
#define OLED_FONT_H "keyboards/helix/common/glcdfont.c"
#define OLED_FONT_H "keyboards/yushakobo/helix/common/glcdfont.c"
/* Encorder */
#define ENCODERS_PAD_A { B6 }


+ 1
- 1
keyboards/yushakobo/helix/rev3_5rows/readme.md View File

@ -8,6 +8,6 @@ A compact split ortholinear keyboard.
Make example for this keyboard (after setting up your build environment):
make helix/rev3_5rows:default:flash
make yushakobo/helix/rev3_5rows:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

+ 1
- 1
keyboards/yushakobo/helix/rules.mk View File

@ -19,6 +19,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
DEFAULT_FOLDER = helix/rev2
DEFAULT_FOLDER = yushakobo/helix/rev2
HELIX_TOP_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))

Loading…
Cancel
Save