From 881f27b461189e6a02ecbaee0b5bcb3d85fc2b76 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Thu, 17 Oct 2019 03:01:49 +0900 Subject: [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. --- keyboards/helix/rev1/config.h | 11 ++++------- keyboards/helix/rev1/keymaps/OLED_sample/keymap.c | 4 ++-- keyboards/helix/rev1/keymaps/default/keymap.c | 4 ++-- keyboards/helix/rev1/rev1.h | 14 ++++++-------- keyboards/helix/rev1/rules.mk | 7 +++++++ 5 files changed, 21 insertions(+), 19 deletions(-) (limited to 'keyboards/helix/rev1') diff --git a/keyboards/helix/rev1/config.h b/keyboards/helix/rev1/config.h index 61fe744728..1a5a266641 100644 --- a/keyboards/helix/rev1/config.h +++ b/keyboards/helix/rev1/config.h @@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef REV1_CONFIG_H -#define REV1_CONFIG_H +#pragma once /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED @@ -27,25 +26,25 @@ along with this program. If not, see . #define PRODUCT Helix Alpha #define DESCRIPTION A split keyboard for the cheap makers +#include + #define HELIX_ROWS 5 /* key matrix size */ // Rows are doubled-up #if HELIX_ROWS == 3 #define MATRIX_ROWS 6 - #define MATRIX_COLS 6 #define MATRIX_ROW_PINS { D7, E6, B4 } #elif HELIX_ROWS == 4 #define MATRIX_ROWS 8 - #define MATRIX_COLS 6 #define MATRIX_ROW_PINS { D7, E6, B4, B5 } #elif HELIX_ROWS == 5 #define MATRIX_ROWS 10 - #define MATRIX_COLS 6 #define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 } #else #error "expected HELIX_ROWS 3 or 4 or 5" #endif +#define MATRIX_COLS 6 // wiring of each half #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } @@ -86,5 +85,3 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c b/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c index 6bee91786c..cc73e36fb6 100644 --- a/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c +++ b/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c @@ -44,7 +44,7 @@ enum custom_keycodes { M_SAMPLE }; -#if HELIX_ROWS == 5 +#if MATRIX_ROWS == 10 // HELIX_ROWS == 5 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty @@ -174,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -#elif HELIX_ROWS == 4 +#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/helix/rev1/keymaps/default/keymap.c b/keyboards/helix/rev1/keymaps/default/keymap.c index 43928a4185..299840e3db 100644 --- a/keyboards/helix/rev1/keymaps/default/keymap.c +++ b/keyboards/helix/rev1/keymaps/default/keymap.c @@ -22,7 +22,7 @@ enum custom_keycodes { ADJUST, }; -#if HELIX_ROWS == 5 +#if MATRIX_ROWS == 10 // HELIX_ROWS == 5 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty @@ -152,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -#elif HELIX_ROWS == 4 +#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/helix/rev1/rev1.h b/keyboards/helix/rev1/rev1.h index a8d6ff0507..b505845ada 100644 --- a/keyboards/helix/rev1/rev1.h +++ b/keyboards/helix/rev1/rev1.h @@ -1,5 +1,4 @@ -#ifndef REV1_H -#define REV1_CONFIG_H +#pragma once #include "../helix.h" @@ -13,7 +12,7 @@ #endif #endif -#if HELIX_ROWS == 3 +#if MATRIX_ROWS == 6 // HELIX_ROWS == 3 #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) @@ -47,7 +46,7 @@ { R20, R21, R22, R23, R24, R25 }, \ } #endif -#elif HELIX_ROWS == 4 +#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4 #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) @@ -87,7 +86,7 @@ { R30, R31, R32, R33, R34, R35 } \ } #endif -#elif HELIX_ROWS == 5 +#elif MATRIX_ROWS == 10 // 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) @@ -138,7 +137,7 @@ #endif // Used to create a keymap using only KC_ prefixed keys -#if HELIX_ROWS == 3 +#if MATRIX_ROWS == 6 // HELIX_ROWS == 3 #define LAYOUT_kc( \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ @@ -149,7 +148,7 @@ KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \ KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25 \ ) -#elif HELIX_ROWS == 4 +#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4 #define LAYOUT_kc( \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ @@ -179,4 +178,3 @@ ) #endif -#endif diff --git a/keyboards/helix/rev1/rules.mk b/keyboards/helix/rev1/rules.mk index 13834f5da1..1418f01786 100644 --- a/keyboards/helix/rev1/rules.mk +++ b/keyboards/helix/rev1/rules.mk @@ -1,3 +1,10 @@ +SRC += local_drivers/i2c.c +SRC += local_drivers/serial.c +SRC += local_drivers/ssd1306.c +KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers + +CUSTOM_MATRIX = yes + SRC += rev1/matrix.c SRC += rev1/split_util.c -- cgit v1.2.3