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

Various fixes from reorg of files #14051

Merged
merged 1 commit into from Aug 17, 2021
Merged

Various fixes from reorg of files #14051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion common_features.mk
View file
Open in desktop
Expand Up @@ -588,7 +588,7 @@ ifneq ($(filter SOLENOID, $(HAPTIC_ENABLE)), )
endif

ifeq ($(strip $(HD44780_ENABLE)), yes)
SRC += drivers/avr/hd44780.c
SRC += platforms/avr/drivers/hd44780.c
OPT_DEFS += -DHD44780_ENABLE
endif

Expand Down
1 change: 0 additions & 1 deletion doxygen-todo
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@ quantum/tools
quantum/visualizer
quantum/visualizer/resources
drivers
drivers/avr
drivers/ugfx
drivers/ugfx/gdisp
drivers/ugfx/gdisp/is31fl3731c
Expand Down
2 changes: 1 addition & 1 deletion keyboards/hs60/v2/ansi/rules.mk
View file
Open in desktop
Expand Up @@ -33,4 +33,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c \
drivers/chibios/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/hs60/v2/hhkb/rules.mk
View file
Open in desktop
Expand Up @@ -31,4 +31,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c \
drivers/chibios/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/hs60/v2/iso/rules.mk
View file
Open in desktop
Expand Up @@ -33,4 +33,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c \
drivers/chibios/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/keebwerk/mega/ansi/rules.mk
View file
Open in desktop
Expand Up @@ -36,4 +36,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c
QUANTUM_LIB_SRC += drivers/chibios/i2c_master.c
QUANTUM_LIB_SRC += i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/mxss/mxss.c
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@

#include QMK_KEYBOARD_H
#include "tmk_core/common/eeprom.h"
#include "tmk_core/common/action_layer.h"
#include "action_layer.h"
#include "rgblight.h"
#include "via.h"
#include "version.h" // for QMK_BUILDDATE used in EEPROM magic
Expand Down
2 changes: 1 addition & 1 deletion keyboards/nebula12/rules.mk
View file
Open in desktop
Expand Up @@ -33,4 +33,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3731.c \
quantum/color.c
QUANTUM_LIB_SRC += drivers/chibios/i2c_master.c
QUANTUM_LIB_SRC += i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/nebula68/rules.mk
View file
Open in desktop
Expand Up @@ -35,4 +35,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c
QUANTUM_LIB_SRC += drivers/chibios/i2c_master.c
QUANTUM_LIB_SRC += i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/nk65/rules.mk
View file
Open in desktop
Expand Up @@ -33,4 +33,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c \
drivers/chibios/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/nk87/rules.mk
View file
Open in desktop
Expand Up @@ -34,4 +34,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c \
drivers/chibios/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/rama_works_kara/rules.mk
View file
Open in desktop
Expand Up @@ -35,4 +35,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/rama_works_koyu/rules.mk
View file
Open in desktop
Expand Up @@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/rama_works_m10_c/rules.mk
View file
Open in desktop
Expand Up @@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/rama_works_m50_a/rules.mk
View file
Open in desktop
Expand Up @@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/rama_works_m60_a/rules.mk
View file
Open in desktop
Expand Up @@ -44,4 +44,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/rama_works_m65_b/rules.mk
View file
Open in desktop
Expand Up @@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/rama_works_m65_bx/rules.mk
View file
Open in desktop
Expand Up @@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/rama_works_m6_b/rules.mk
View file
Open in desktop
Expand Up @@ -41,4 +41,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3218.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/rama_works_u80_a/rules.mk
View file
Open in desktop
Expand Up @@ -34,4 +34,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/wt60_a/rules.mk
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6

# project specific files
SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \
i2c_master.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/wt60_b/rules.mk
View file
Open in desktop
Expand Up @@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/wt60_bx/rules.mk
View file
Open in desktop
Expand Up @@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/wt60_c/rules.mk
View file
Open in desktop
Expand Up @@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/wt65_a/rules.mk
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6

# project specific files
SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \
i2c_master.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/wt65_b/rules.mk
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6

# project specific files
SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \
i2c_master.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/wt75_a/rules.mk
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6

# project specific files
SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \
i2c_master.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/wt75_b/rules.mk
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6

# project specific files
SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \
i2c_master.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/wt75_c/rules.mk
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6

# project specific files
SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \
i2c_master.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/wt80_a/rules.mk
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6

# project specific files
SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \
i2c_master.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/wt_mono_backlight.c
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@
#include "wt_rgb_backlight_keycodes.h" // reuse these for now

#include <avr/interrupt.h>
#include "drivers/avr/i2c_master.h"
#include "i2c_master.h"

#include "progmem.h"
#include "quantum/color.h"
Expand Down
4 changes: 2 additions & 2 deletions keyboards/wilba_tech/wt_rgb_backlight.c
View file
Open in desktop
Expand Up @@ -54,11 +54,11 @@

#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined (RGB_BACKLIGHT_KW_MEGA)
#include <avr/interrupt.h>
#include "drivers/avr/i2c_master.h"
#include "i2c_master.h"
#else
#include <ch.h>
#include <hal.h>
#include "drivers/chibios/i2c_master.h"
#include "i2c_master.h"
#endif

#if defined(RGB_BACKLIGHT_DAWN60)
Expand Down
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/zeal60/rules.mk
View file
Open in desktop
Expand Up @@ -44,4 +44,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c
2 changes: 1 addition & 1 deletion keyboards/wilba_tech/zeal65/rules.mk
View file
Open in desktop
Expand Up @@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c
i2c_master.c