Various fixes from reorg of files (#14051)

This commit is contained in:
Joel Challis 2021-08-18 00:54:41 +01:00 committed by GitHub
parent 703f027717
commit 58cd8c366c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 34 additions and 35 deletions

View file

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

View file

@ -21,7 +21,6 @@ quantum/tools
quantum/visualizer
quantum/visualizer/resources
drivers
drivers/avr
drivers/ugfx
drivers/ugfx/gdisp
drivers/ugfx/gdisp/is31fl3731c

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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"

View file

@ -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)

View file

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

View file

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