masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common_features.mk
View File

@ -588,7 +588,7 @@ ifneq ($(filter SOLENOID, $(HAPTIC_ENABLE)), )
endif endif
ifeq ($(strip $(HD44780_ENABLE)), yes) ifeq ($(strip $(HD44780_ENABLE)), yes)
SRC += drivers/avr/hd44780.c SRC += platforms/avr/drivers/hd44780.c
OPT_DEFS += -DHD44780_ENABLE OPT_DEFS += -DHD44780_ENABLE
endif endif

1
doxygen-todo
View File

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

2
keyboards/hs60/v2/ansi/rules.mk
View File

@ -33,4 +33,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \ drivers/led/issi/is31fl3733.c \
quantum/color.c \ quantum/color.c \
drivers/chibios/i2c_master.c i2c_master.c

2
keyboards/hs60/v2/hhkb/rules.mk
View File

@ -31,4 +31,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \ drivers/led/issi/is31fl3733.c \
quantum/color.c \ quantum/color.c \
drivers/chibios/i2c_master.c i2c_master.c

2
keyboards/hs60/v2/iso/rules.mk
View File

@ -33,4 +33,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \ drivers/led/issi/is31fl3733.c \
quantum/color.c \ quantum/color.c \
drivers/chibios/i2c_master.c i2c_master.c

2
keyboards/keebwerk/mega/ansi/rules.mk
View File

@ -36,4 +36,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \ drivers/led/issi/is31fl3733.c \
quantum/color.c quantum/color.c
QUANTUM_LIB_SRC += drivers/chibios/i2c_master.c QUANTUM_LIB_SRC += i2c_master.c

2
keyboards/mxss/mxss.c
View File

@ -18,7 +18,7 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "tmk_core/common/eeprom.h" #include "tmk_core/common/eeprom.h"
#include "tmk_core/common/action_layer.h" #include "action_layer.h"
#include "rgblight.h" #include "rgblight.h"
#include "via.h" #include "via.h"
#include "version.h" // for QMK_BUILDDATE used in EEPROM magic #include "version.h" // for QMK_BUILDDATE used in EEPROM magic

2
keyboards/nebula12/rules.mk
View File

@ -33,4 +33,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
quantum/color.c quantum/color.c
QUANTUM_LIB_SRC += drivers/chibios/i2c_master.c QUANTUM_LIB_SRC += i2c_master.c

2
keyboards/nebula68/rules.mk
View File

@ -35,4 +35,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \ drivers/led/issi/is31fl3733.c \
quantum/color.c quantum/color.c
QUANTUM_LIB_SRC += drivers/chibios/i2c_master.c QUANTUM_LIB_SRC += i2c_master.c

2
keyboards/nk65/rules.mk
View File

@ -33,4 +33,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \ drivers/led/issi/is31fl3733.c \
quantum/color.c \ quantum/color.c \
drivers/chibios/i2c_master.c i2c_master.c

2
keyboards/nk87/rules.mk
View File

@ -34,4 +34,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \ drivers/led/issi/is31fl3733.c \
quantum/color.c \ quantum/color.c \
drivers/chibios/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/rama_works_kara/rules.mk
View File

@ -35,4 +35,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/rama_works_koyu/rules.mk
View File

@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/rama_works_m10_c/rules.mk
View File

@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/rama_works_m50_a/rules.mk
View File

@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/rama_works_m60_a/rules.mk
View File

@ -44,4 +44,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/rama_works_m65_b/rules.mk
View File

@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/rama_works_m65_bx/rules.mk
View File

@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/rama_works_m6_b/rules.mk
View File

@ -41,4 +41,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3218.c \ drivers/led/issi/is31fl3218.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/rama_works_u80_a/rules.mk
View File

@ -34,4 +34,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/wt60_a/rules.mk
View File

@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
# project specific files # project specific files
SRC = drivers/led/issi/is31fl3736.c \ SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \ i2c_master.c \
quantum/color.c \ quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c keyboards/wilba_tech/wt_main.c

2
keyboards/wilba_tech/wt60_b/rules.mk
View File

@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/wt60_bx/rules.mk
View File

@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/wt60_c/rules.mk
View File

@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/wt65_a/rules.mk
View File

@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
# project specific files # project specific files
SRC = drivers/led/issi/is31fl3736.c \ SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \ i2c_master.c \
quantum/color.c \ quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c keyboards/wilba_tech/wt_main.c

2
keyboards/wilba_tech/wt65_b/rules.mk
View File

@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
# project specific files # project specific files
SRC = drivers/led/issi/is31fl3736.c \ SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \ i2c_master.c \
quantum/color.c \ quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c keyboards/wilba_tech/wt_main.c

2
keyboards/wilba_tech/wt75_a/rules.mk
View File

@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
# project specific files # project specific files
SRC = drivers/led/issi/is31fl3736.c \ SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \ i2c_master.c \
quantum/color.c \ quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c keyboards/wilba_tech/wt_main.c

2
keyboards/wilba_tech/wt75_b/rules.mk
View File

@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
# project specific files # project specific files
SRC = drivers/led/issi/is31fl3736.c \ SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \ i2c_master.c \
quantum/color.c \ quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c keyboards/wilba_tech/wt_main.c

2
keyboards/wilba_tech/wt75_c/rules.mk
View File

@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
# project specific files # project specific files
SRC = drivers/led/issi/is31fl3736.c \ SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \ i2c_master.c \
quantum/color.c \ quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c keyboards/wilba_tech/wt_main.c

2
keyboards/wilba_tech/wt80_a/rules.mk
View File

@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
# project specific files # project specific files
SRC = drivers/led/issi/is31fl3736.c \ SRC = drivers/led/issi/is31fl3736.c \
drivers/avr/i2c_master.c \ i2c_master.c \
quantum/color.c \ quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c keyboards/wilba_tech/wt_main.c

2
keyboards/wilba_tech/wt_mono_backlight.c
View File

@ -20,7 +20,7 @@
#include "wt_rgb_backlight_keycodes.h" // reuse these for now #include "wt_rgb_backlight_keycodes.h" // reuse these for now
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include "drivers/avr/i2c_master.h" #include "i2c_master.h"
#include "progmem.h" #include "progmem.h"
#include "quantum/color.h" #include "quantum/color.h"

4
keyboards/wilba_tech/wt_rgb_backlight.c
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) #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 <avr/interrupt.h>
#include "drivers/avr/i2c_master.h" #include "i2c_master.h"
#else #else
#include <ch.h> #include <ch.h>
#include <hal.h> #include <hal.h>
#include "drivers/chibios/i2c_master.h" #include "i2c_master.h"
#endif #endif
#if defined(RGB_BACKLIGHT_DAWN60) #if defined(RGB_BACKLIGHT_DAWN60)

2
keyboards/wilba_tech/zeal60/rules.mk
View File

@ -44,4 +44,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c

2
keyboards/wilba_tech/zeal65/rules.mk
View File

@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \ keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \ quantum/color.c \
drivers/led/issi/is31fl3731.c \ drivers/led/issi/is31fl3731.c \
drivers/avr/i2c_master.c i2c_master.c