Skip to content

Commit

Permalink
[Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows (q…
Browse files Browse the repository at this point in the history
…mk#12259)

* cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows

* Made the layout data easier to read.
  * helix/rev2/keymaps/five_rows/keymap.c
  * helix/rev3_5rows/keymaps/five_rows/keymap.c

* The following two were made the same.
  * keymaps/five_rows/config.h
  * keymaps/five_rows/oled_display.c

The binary of the compilation result has not changed.

* update keyboards/helix/rev2/keymaps/five_rows/rules.mk

KEYBOARD_LOCAL_FEATURES_MK was moved to the end.

* add '#define DISABLE_SYNC_TIMER' into helix/rev3_5rows/keymaps/five_rows/config.h

The sync timer features worsen the matrix scan rate of the Helix keyboard. I'm not sure if it makes sense to have sync timer features enabled on the Helix keyboard. So in my keymap I disable this.
  • Loading branch information
mtei authored Apr 3, 2021
1 parent 60e1910 commit 49dc332
Show file tree
Hide file tree
Showing 6 changed files with 353 additions and 339 deletions.
2 changes: 2 additions & 0 deletions keyboards/helix/rev2/keymaps/five_rows/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ along with this program. If not, see <http://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

Large diffs are not rendered by default.

22 changes: 18 additions & 4 deletions keyboards/helix/rev2/keymaps/five_rows/rules.mk
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,21 @@ along with this program. If not, see <http://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

// 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

0 comments on commit 49dc332

Please sign in to comment.