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.

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

Fixes for failures during 'make lets_split' #4489

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions keyboards/40percentclub/4x4/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,4 @@ FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)

LAYOUTS = ortho_4x4 ortho_4x8 ortho_4x12 ortho_4x16
LAYOUTS_HAS_BACKLIGHT = no
1 change: 0 additions & 1 deletion keyboards/lets_split/keymaps/OLED_sample/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,6 @@ void matrix_update(struct CharacterMatrix *dest,
#define L_NUMLAY 128
#define L_NLOWER 136
#define L_NFNLAYER 192
#define L_MOUSECURSOR 256
#define L_ADJUST 65560

void iota_gfx_task_user(void) {
Expand Down
4 changes: 2 additions & 2 deletions keyboards/lets_split/keymaps/OLED_sample/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# the appropriate keymap folder that will get included automatically
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = no # Commands for debug and configuration
Expand All @@ -22,4 +22,4 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend

ifndef QUANTUM_DIR
include ../../../../Makefile
endif
endif
1 change: 1 addition & 0 deletions keyboards/lets_split/keymaps/adam/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TAP_DANCE_ENABLE = yes
4 changes: 1 addition & 3 deletions keyboards/lets_split/keymaps/pyrol/keymap.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#include QMK_KEYBOARD_h

extern keymap_config_t keymap_config;
#include QMK_KEYBOARD_H

// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
Expand Down
5 changes: 3 additions & 2 deletions keyboards/lets_split/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ F_USB = $(F_CPU)

# Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of
# different sizes, comment this out, and the correct address will be loaded
# different sizes, comment this out, and the correct address will be loaded
# automatically (+60). See bootloader.mk for all options.
BOOTLOADER = caterina

Expand All @@ -64,7 +64,7 @@ MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SUBPROJECT_rev1 = yes
USE_I2C = yes
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
Expand All @@ -73,5 +73,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
CUSTOM_MATRIX = yes

LAYOUTS = ortho_4x12
LAYOUTS_HAS_BACKLIGHT = no

DEFAULT_FOLDER = lets_split/rev2
1 change: 1 addition & 0 deletions keyboards/zlant/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,4 @@ AUDIO_ENABLE = no
RGBLIGHT_ENABLE = yes

LAYOUTS = ortho_4x12 planck_mit
LAYOUTS_HAS_BACKLIGHT = no
4 changes: 1 addition & 3 deletions layouts/community/ortho_4x12/bakingpy/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ ifeq ($(LAYOUTS_HAS_RGB),yes)
RGBLIGHT_ENABLE = yes
endif
AUDIO_ENABLE = no
ifeq ($(strip $(KEYBOARD)), zlant)
ifeq ($(LAYOUTS_HAS_BACKLIGHT),no)
BACKLIGHT_ENABLE = no
else ifeq ($(strip $(KEYBOARD)), 40percentclub/4x4)
BACKLIGHT_ENABLE = no
else
BACKLIGHT_ENABLE = yes
endif
2 changes: 2 additions & 0 deletions users/talljoe/talljoe.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
extern backlight_config g_config;
#endif
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef ZEAL_RGB
static uint8_t last_effect;
#endif

#ifdef RGBLIGHT_ENABLE
static uint32_t savedRgbMode;
Expand Down