~ruther/qmk_firmware

58cd8c366c49ae6134f274b074c5e72f67a359ad — Joel Challis 4 years ago 703f027 
Various fixes from reorg of files (#14051)
patch browse .tar.gz 
34 files changed, 34 insertions(+), 35 deletions(-)

M common_features.mk
M doxygen-todo
M keyboards/hs60/v2/ansi/rules.mk
M keyboards/hs60/v2/hhkb/rules.mk
M keyboards/hs60/v2/iso/rules.mk
M keyboards/keebwerk/mega/ansi/rules.mk
M keyboards/mxss/mxss.c
M keyboards/nebula12/rules.mk
M keyboards/nebula68/rules.mk
M keyboards/nk65/rules.mk
M keyboards/nk87/rules.mk
M keyboards/wilba_tech/rama_works_kara/rules.mk
M keyboards/wilba_tech/rama_works_koyu/rules.mk
M keyboards/wilba_tech/rama_works_m10_c/rules.mk
M keyboards/wilba_tech/rama_works_m50_a/rules.mk
M keyboards/wilba_tech/rama_works_m60_a/rules.mk
M keyboards/wilba_tech/rama_works_m65_b/rules.mk
M keyboards/wilba_tech/rama_works_m65_bx/rules.mk
M keyboards/wilba_tech/rama_works_m6_b/rules.mk
M keyboards/wilba_tech/rama_works_u80_a/rules.mk
M keyboards/wilba_tech/wt60_a/rules.mk
M keyboards/wilba_tech/wt60_b/rules.mk
M keyboards/wilba_tech/wt60_bx/rules.mk
M keyboards/wilba_tech/wt60_c/rules.mk
M keyboards/wilba_tech/wt65_a/rules.mk
M keyboards/wilba_tech/wt65_b/rules.mk
M keyboards/wilba_tech/wt75_a/rules.mk
M keyboards/wilba_tech/wt75_b/rules.mk
M keyboards/wilba_tech/wt75_c/rules.mk
M keyboards/wilba_tech/wt80_a/rules.mk
M keyboards/wilba_tech/wt_mono_backlight.c
M keyboards/wilba_tech/wt_rgb_backlight.c
M keyboards/wilba_tech/zeal60/rules.mk
M keyboards/wilba_tech/zeal65/rules.mk

M common_features.mk => common_features.mk +1 -1
@@ 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



M doxygen-todo => doxygen-todo +0 -1
@@ 21,7 21,6 @@ quantum/tools
quantum/visualizer
quantum/visualizer/resources
drivers
drivers/avr
drivers/ugfx
drivers/ugfx/gdisp
drivers/ugfx/gdisp/is31fl3731c


M keyboards/hs60/v2/ansi/rules.mk => keyboards/hs60/v2/ansi/rules.mk +1 -1
@@ 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


M keyboards/hs60/v2/hhkb/rules.mk => keyboards/hs60/v2/hhkb/rules.mk +1 -1
@@ 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


M keyboards/hs60/v2/iso/rules.mk => keyboards/hs60/v2/iso/rules.mk +1 -1
@@ 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


M keyboards/keebwerk/mega/ansi/rules.mk => keyboards/keebwerk/mega/ansi/rules.mk +1 -1
@@ 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


M keyboards/mxss/mxss.c => keyboards/mxss/mxss.c +1 -1
@@ 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


M keyboards/nebula12/rules.mk => keyboards/nebula12/rules.mk +1 -1
@@ 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


M keyboards/nebula68/rules.mk => keyboards/nebula68/rules.mk +1 -1
@@ 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


M keyboards/nk65/rules.mk => keyboards/nk65/rules.mk +1 -1
@@ 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


M keyboards/nk87/rules.mk => keyboards/nk87/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/rama_works_kara/rules.mk => keyboards/wilba_tech/rama_works_kara/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/rama_works_koyu/rules.mk => keyboards/wilba_tech/rama_works_koyu/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/rama_works_m10_c/rules.mk => keyboards/wilba_tech/rama_works_m10_c/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/rama_works_m50_a/rules.mk => keyboards/wilba_tech/rama_works_m50_a/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/rama_works_m60_a/rules.mk => keyboards/wilba_tech/rama_works_m60_a/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/rama_works_m65_b/rules.mk => keyboards/wilba_tech/rama_works_m65_b/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/rama_works_m65_bx/rules.mk => keyboards/wilba_tech/rama_works_m65_bx/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/rama_works_m6_b/rules.mk => keyboards/wilba_tech/rama_works_m6_b/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/rama_works_u80_a/rules.mk => keyboards/wilba_tech/rama_works_u80_a/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/wt60_a/rules.mk => keyboards/wilba_tech/wt60_a/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/wt60_b/rules.mk => keyboards/wilba_tech/wt60_b/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/wt60_bx/rules.mk => keyboards/wilba_tech/wt60_bx/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/wt60_c/rules.mk => keyboards/wilba_tech/wt60_c/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/wt65_a/rules.mk => keyboards/wilba_tech/wt65_a/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/wt65_b/rules.mk => keyboards/wilba_tech/wt65_b/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/wt75_a/rules.mk => keyboards/wilba_tech/wt75_a/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/wt75_b/rules.mk => keyboards/wilba_tech/wt75_b/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/wt75_c/rules.mk => keyboards/wilba_tech/wt75_c/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/wt80_a/rules.mk => keyboards/wilba_tech/wt80_a/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/wt_mono_backlight.c => keyboards/wilba_tech/wt_mono_backlight.c +1 -1
@@ 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"


M keyboards/wilba_tech/wt_rgb_backlight.c => keyboards/wilba_tech/wt_rgb_backlight.c +2 -2
@@ 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)


M keyboards/wilba_tech/zeal60/rules.mk => keyboards/wilba_tech/zeal60/rules.mk +1 -1
@@ 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


M keyboards/wilba_tech/zeal65/rules.mk => keyboards/wilba_tech/zeal65/rules.mk +1 -1
@@ 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