[Keyboard] Cleanup helix rules options (#6952)
* add temporary test shell-spript
* Use LINK_TIME_OPTIMIZATION_ENABLE instead of Link_Time_Optimization
No change in build result.
* Helix config.h use '#pragma once'
No change in build result.
* Helix helix.h,rev?/rev?.h,pico/pico.h use '#pragma once'
No change in build result.
* Use drivers/avr/pro_micro.h instead of keyboards/helix/pro_micro.h
No change in build result.
* remove keyboards/helix/{rev2|pico}/serial_config.h
No change in build result.
* 'HELIX_ROWS' macro is now referenced only in rev1/config.h and rev2/config.h.
No change in build result.
* The contents of helix/rules.mk were distributed to subdirectories.
This is a preparation to create a new subdirectory for helix code using split_common.
No change in build result.
remove 'USE_I2C = yes', 'SUBPROJECT_rev1 = no' from keyboards/helix/rules.mk.
follow code move from keyboards/helix/rules.mk to keyboards/helix/{rev1,rev2,pico}/rules.mk.
----
SRC += i2c.c
SRC += serial.c
SRC += ssd1306.c
CUSTOM_MATRIX = yes
---
* helix/{i2c.[ch], serial.[ch], ssd1306.[ch]} move into helix/local_drivers/
No change in build result.
* Simplified 'helix/pico/keymap/*/rules.mk' using KEYBOARD_LOCAL_FEATURES_MK.
No change in build result.
* add keyboards/helix/pico/local_features.mk
* add 'KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk' into keyboards/helix/pico/rules.mk
* remove HELIX_CUSTOMISE_MSG from keyboards/helix/pico/keymaps/*/rules.mk
* remove HELIX= process from keyboards/helix/pico/keymaps/*/rules.mk
* remove convert code(helix to standaerd) from keyboards/helix/pico/keymaps/*/rules.mk
* add 'include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))' into keyboards/helix/pico/keymaps/*/rules.mk
* Simplified 'helix/rev2/keymap/*/rules.mk' using KEYBOARD_LOCAL_FEATURES_MK.
No change in build result.
* add keyboards/helix/rev2/local_features.mk
* add 'KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk' into keyboards/helix/rev2/rules.mk
* remove HELIX_CUSTOMISE_MSG from keyboards/helix/rev2/keymaps/*/rules.mk
* remove HELIX= process from keyboards/helix/rev2/keymaps/*/rules.mk
* remove convert code(helix to standaerd) from keyboards/helix/rev2/keymaps/*/rules.mk
* add 'include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))' into keyboards/helix/rev2/keymaps/*/rules.mk
* Added helix keyboard build NEW method.
No change in build result.
## Helix build
$ make helix:default ## no oled, no backlight, no underglow
$ make helix/rev2/back:default ## no oled, with backlight, no underglow
$ make helix/rev2/under:default ## no oled, no backlight, with underglow
$ make helix/rev2/oled:default ## with oled, no backlight, not underglow
$ make helix/rev2/oled/back:default ## with oled, with backlight, no underglow
$ make helix/rev2/back/oled:default ## with oled, with backlight, no underglow
$ make helix/rev2/oled/under:default ## with oled, no backlight, with underglow
$ make helix/rev2/under/oled:default ## with oled, no backlight, with underglow
## Helix pico build
$ make helix/pico:default ## no oled, no backlight, no underglow
$ make helix/pico/back:default ## no oled, with backlight, no underglow
$ make helix/pico/under:default ## no oled, no backlight, with underglow
$ make helix/pico/oled:default ## with oled, no backlight, not underglow
* add temporary test shell-spript
* test end remove test script. Revert "add temporary test shell-spript"
This reverts commit 5dac20cd0f8b4bc192edb2313652c1635f829657.
* test end remove test script. Revert "add temporary test shell-spript"
This reverts commit ec49f63b2dc0f2b3fe8c1c36ffa615cee2f7e3ed.
* Extended the 'HELIX=' option. add keyword 'verbose', 'no_ani'.
No change in build result.
* update keyboards/helix/{rev2,pico}/keymaps/default/readme.md
* rename KEYBOARD_TOP_DIR to HELIX_TOP_DIR in rules.mk
* update keyboards/helix/{rev2,pico}/keymaps/default/readme_jp.md
* rm keyboards/helix/pico/oled/rules.mk
* update helix's readmes. All the ':avrdude' was replaced with ':flash'.
* remove F_CPU, ARCH, F_USB, INTERRUPT_CONTROL_ENDPOINT from helix/rules.mk
No change in build result.
2019-10-16 18:01:49 +00:00
|
|
|
#pragma once
|
2018-01-28 17:14:12 +00:00
|
|
|
|
2020-06-25 21:11:39 +00:00
|
|
|
#include "helix.h"
|
2018-01-28 17:14:12 +00:00
|
|
|
|
2020-12-15 11:14:14 +00:00
|
|
|
bool is_mac_mode(void);
|
|
|
|
void set_mac_mode_kb(bool macmode);
|
|
|
|
|
2020-03-10 08:33:46 +00:00
|
|
|
#ifndef SPLIT_KEYBOARD
|
2020-06-25 21:11:39 +00:00
|
|
|
extern bool is_helix_master(void);
|
|
|
|
#define is_keyboard_master() is_helix_master()
|
2018-01-28 17:14:12 +00:00
|
|
|
#endif
|
|
|
|
|
2020-03-10 08:33:46 +00:00
|
|
|
// Each keymap.c should use is_keyboard_master() instead of 'is_master', 'has_usb()'.
|
|
|
|
// But keep 'is_master' for a while for backwards compatibility
|
|
|
|
// for the old keymap.c.
|
|
|
|
extern uint8_t is_master; // 'is_master' will be obsolete, it is recommended to use 'is_keyboard_master ()' instead.
|
|
|
|
#define has_usb() is_keyboard_master()
|
2018-01-28 17:14:12 +00:00
|
|
|
|
[Keyboard] Cleanup helix rules options (#6952)
* add temporary test shell-spript
* Use LINK_TIME_OPTIMIZATION_ENABLE instead of Link_Time_Optimization
No change in build result.
* Helix config.h use '#pragma once'
No change in build result.
* Helix helix.h,rev?/rev?.h,pico/pico.h use '#pragma once'
No change in build result.
* Use drivers/avr/pro_micro.h instead of keyboards/helix/pro_micro.h
No change in build result.
* remove keyboards/helix/{rev2|pico}/serial_config.h
No change in build result.
* 'HELIX_ROWS' macro is now referenced only in rev1/config.h and rev2/config.h.
No change in build result.
* The contents of helix/rules.mk were distributed to subdirectories.
This is a preparation to create a new subdirectory for helix code using split_common.
No change in build result.
remove 'USE_I2C = yes', 'SUBPROJECT_rev1 = no' from keyboards/helix/rules.mk.
follow code move from keyboards/helix/rules.mk to keyboards/helix/{rev1,rev2,pico}/rules.mk.
----
SRC += i2c.c
SRC += serial.c
SRC += ssd1306.c
CUSTOM_MATRIX = yes
---
* helix/{i2c.[ch], serial.[ch], ssd1306.[ch]} move into helix/local_drivers/
No change in build result.
* Simplified 'helix/pico/keymap/*/rules.mk' using KEYBOARD_LOCAL_FEATURES_MK.
No change in build result.
* add keyboards/helix/pico/local_features.mk
* add 'KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk' into keyboards/helix/pico/rules.mk
* remove HELIX_CUSTOMISE_MSG from keyboards/helix/pico/keymaps/*/rules.mk
* remove HELIX= process from keyboards/helix/pico/keymaps/*/rules.mk
* remove convert code(helix to standaerd) from keyboards/helix/pico/keymaps/*/rules.mk
* add 'include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))' into keyboards/helix/pico/keymaps/*/rules.mk
* Simplified 'helix/rev2/keymap/*/rules.mk' using KEYBOARD_LOCAL_FEATURES_MK.
No change in build result.
* add keyboards/helix/rev2/local_features.mk
* add 'KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk' into keyboards/helix/rev2/rules.mk
* remove HELIX_CUSTOMISE_MSG from keyboards/helix/rev2/keymaps/*/rules.mk
* remove HELIX= process from keyboards/helix/rev2/keymaps/*/rules.mk
* remove convert code(helix to standaerd) from keyboards/helix/rev2/keymaps/*/rules.mk
* add 'include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))' into keyboards/helix/rev2/keymaps/*/rules.mk
* Added helix keyboard build NEW method.
No change in build result.
## Helix build
$ make helix:default ## no oled, no backlight, no underglow
$ make helix/rev2/back:default ## no oled, with backlight, no underglow
$ make helix/rev2/under:default ## no oled, no backlight, with underglow
$ make helix/rev2/oled:default ## with oled, no backlight, not underglow
$ make helix/rev2/oled/back:default ## with oled, with backlight, no underglow
$ make helix/rev2/back/oled:default ## with oled, with backlight, no underglow
$ make helix/rev2/oled/under:default ## with oled, no backlight, with underglow
$ make helix/rev2/under/oled:default ## with oled, no backlight, with underglow
## Helix pico build
$ make helix/pico:default ## no oled, no backlight, no underglow
$ make helix/pico/back:default ## no oled, with backlight, no underglow
$ make helix/pico/under:default ## no oled, no backlight, with underglow
$ make helix/pico/oled:default ## with oled, no backlight, not underglow
* add temporary test shell-spript
* test end remove test script. Revert "add temporary test shell-spript"
This reverts commit 5dac20cd0f8b4bc192edb2313652c1635f829657.
* test end remove test script. Revert "add temporary test shell-spript"
This reverts commit ec49f63b2dc0f2b3fe8c1c36ffa615cee2f7e3ed.
* Extended the 'HELIX=' option. add keyword 'verbose', 'no_ani'.
No change in build result.
* update keyboards/helix/{rev2,pico}/keymaps/default/readme.md
* rename KEYBOARD_TOP_DIR to HELIX_TOP_DIR in rules.mk
* update keyboards/helix/{rev2,pico}/keymaps/default/readme_jp.md
* rm keyboards/helix/pico/oled/rules.mk
* update helix's readmes. All the ':avrdude' was replaced with ':flash'.
* remove F_CPU, ARCH, F_USB, INTERRUPT_CONTROL_ENDPOINT from helix/rules.mk
No change in build result.
2019-10-16 18:01:49 +00:00
|
|
|
#if MATRIX_ROWS == 8 // HELIX_ROWS == 4
|
2020-06-25 21:11:39 +00:00
|
|
|
#ifndef FLIP_HALF
|
|
|
|
// Standard Keymap
|
|
|
|
// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
|
|
|
|
#define LAYOUT( \
|
|
|
|
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
|
|
|
|
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
|
|
|
|
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
|
|
|
|
L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
|
|
|
|
) { \
|
|
|
|
{ L00, L01, L02, L03, L04, L05, KC_NO }, \
|
|
|
|
{ L10, L11, L12, L13, L14, L15, KC_NO }, \
|
|
|
|
{ L20, L21, L22, L23, L24, L25, KC_NO }, \
|
|
|
|
{ L30, L31, L32, L33, L34, L35, L36 }, \
|
|
|
|
{ R05, R04, R03, R02, R01, R00, KC_NO }, \
|
|
|
|
{ R15, R14, R13, R12, R11, R10, KC_NO }, \
|
|
|
|
{ R25, R24, R23, R22, R21, R20, KC_NO }, \
|
|
|
|
{ R35, R34, R33, R32, R31, R30, R36 } \
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
// Keymap with right side flipped
|
|
|
|
// (TRRS jack on both halves are to the right)
|
|
|
|
#define LAYOUT( \
|
|
|
|
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
|
|
|
|
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
|
|
|
|
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
|
|
|
|
L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
|
|
|
|
) { \
|
|
|
|
{ L00, L01, L02, L03, L04, L05, KC_NO }, \
|
|
|
|
{ L10, L11, L12, L13, L14, L15, KC_NO }, \
|
|
|
|
{ L20, L21, L22, L23, L24, L25, KC_NO }, \
|
|
|
|
{ L30, L31, L32, L33, L34, L35, L36 }, \
|
|
|
|
{ KC_NO, R00, R01, R02, R03, R04, R05 }, \
|
|
|
|
{ KC_NO, R10, R11, R12, R13, R14, R15 }, \
|
|
|
|
{ KC_NO, R20, R21, R22, R23, R24, R25 }, \
|
|
|
|
{ R36, R30, R31, R32, R33, R34, R35 } \
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#else // HELIX_ROWS == 5
|
|
|
|
#ifndef FLIP_HALF
|
|
|
|
// Standard Keymap
|
|
|
|
// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
|
2018-06-27 14:37:27 +00:00
|
|
|
#define LAYOUT( \
|
2020-06-25 21:11:39 +00:00
|
|
|
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
|
|
|
|
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
|
|
|
|
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
|
|
|
|
L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
|
|
|
|
L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
|
|
|
|
) { \
|
2018-07-08 04:15:00 +00:00
|
|
|
{ L00, L01, L02, L03, L04, L05, KC_NO }, \
|
|
|
|
{ L10, L11, L12, L13, L14, L15, KC_NO }, \
|
|
|
|
{ L20, L21, L22, L23, L24, L25, KC_NO }, \
|
|
|
|
{ L30, L31, L32, L33, L34, L35, L36 }, \
|
2020-06-25 21:11:39 +00:00
|
|
|
{ L40, L41, L42, L43, L44, L45, L46 }, \
|
2018-07-08 04:15:00 +00:00
|
|
|
{ R05, R04, R03, R02, R01, R00, KC_NO }, \
|
|
|
|
{ R15, R14, R13, R12, R11, R10, KC_NO }, \
|
|
|
|
{ R25, R24, R23, R22, R21, R20, KC_NO }, \
|
|
|
|
{ R35, R34, R33, R32, R31, R30, R36 }, \
|
2020-06-25 21:11:39 +00:00
|
|
|
{ R45, R44, R43, R42, R41, R40, R46 } \
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
// Keymap with right side flipped
|
|
|
|
// (TRRS jack on both halves are to the right)
|
|
|
|
#define LAYOUT( \
|
|
|
|
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
|
|
|
|
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
|
|
|
|
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
|
|
|
|
L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
|
|
|
|
L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
|
|
|
|
) { \
|
|
|
|
{ L00, L01, L02, L03, L04, L05, KC_NO }, \
|
|
|
|
{ L10, L11, L12, L13, L14, L15, KC_NO }, \
|
|
|
|
{ L20, L21, L22, L23, L24, L25, KC_NO }, \
|
|
|
|
{ L30, L31, L32, L33, L34, L35, L36 }, \
|
|
|
|
{ L40, L41, L42, L43, L44, L45, L46 }, \
|
|
|
|
{ KC_NO, R00, R01, R02, R03, R04, R05 }, \
|
|
|
|
{ KC_NO, R10, R11, R12, R13, R14, R15 }, \
|
|
|
|
{ KC_NO, R20, R21, R22, R23, R24, R25 }, \
|
|
|
|
{ R36, R30, R31, R32, R33, R34, R35 }, \
|
|
|
|
{ R46, R40, R41, R42, R43, R44, R45 } \
|
|
|
|
}
|
|
|
|
#endif
|
2018-01-28 17:14:12 +00:00
|
|
|
#endif
|