Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows #12259

Merged
merged 3 commits into from
Apr 3, 2021
Merged

[Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows #12259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db7621c
cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows
mtei Mar 12, 2021
2158e06
update keyboards/helix/rev2/keymaps/five_rows/rules.mk
mtei Mar 13, 2021
c4cd2ca
add '#define DISABLE_SYNC_TIMER' into helix/rev3_5rows/keymaps/five_r…
mtei Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions keyboards/helix/rev2/keymaps/five_rows/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.

// If you need more program area, try select and reduce rgblight modes to use.

#define DISABLE_SYNC_TIMER

// Selection of RGBLIGHT MODE to use.
#undef RGBLIGHT_ANIMATIONS
#undef RGBLIGHT_EFFECT_BREATHING
Expand Down
325 changes: 159 additions & 166 deletions keyboards/helix/rev2/keymaps/five_rows/keymap.c
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 18 additions & 4 deletions keyboards/helix/rev2/keymaps/five_rows/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,20 @@ ifneq ($(strip $(HELIX)),)
LED_BACK_ENABLE = no
LED_UNDERGLOW_ENABLE = no
endif
ifneq ($(filter nooled no-oled,$(strip $1)),)
OLED_ENABLE = no
endif
ifeq ($(strip $1),oled)
OLED_ENABLE = yes
endif
ifneq ($(filter core-oled core_oled newoled new-oled olednew oled-new,$(strip $1)),)
OLED_ENABLE = yes
OLED_SELECT = core
endif
ifneq ($(filter local-oled local_oled oldoled old-oled oledold oled-old,$(strip $1)),)
OLED_ENABLE = yes
OLED_SELECT = local
endif
ifeq ($(strip $1),console)
CONSOLE_ENABLE = yes
endif
Expand Down Expand Up @@ -79,10 +93,10 @@ ifeq ($(strip $(DEBUG_CONFIG)), yes)
OPT_DEFS += -DDEBUG_CONFIG
endif

# convert Helix-specific options (that represent combinations of standard options)
# into QMK standard options.
include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))

ifeq ($(strip $(OLED_ENABLE)), yes)
SRC += oled_display.c
endif

# convert Helix-specific options (that represent combinations of standard options)
# into QMK standard options.
include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
8 changes: 5 additions & 3 deletions keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,21 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#ifndef CONFIG_USER_H
#define CONFIG_USER_H

#undef OLED_UPDATE_INTERVAL
#define OLED_UPDATE_INTERVAL 50

#undef TAPPING_TERM
#define TAPPING_TERM 300
#define PERMISSIVE_HOLD
/* when TAPPING_TERM >= 500 same effect PERMISSIVE_HOLD.
see tmk_core/common/action_tapping.c */

#undef OLED_UPDATE_INTERVAL
#define OLED_UPDATE_INTERVAL 50
drashna marked this conversation as resolved.
Show resolved Hide resolved

// place overrides here

// If you need more program area, try select and reduce rgblight modes to use.

#define DISABLE_SYNC_TIMER

// Selection of RGBLIGHT MODE to use.
#undef RGBLIGHT_ANIMATIONS
#undef RGBLIGHT_EFFECT_BREATHING
Expand Down
Loading