From 47dca73834d4db4a5728ff09015f6cc5a6007e2a Mon Sep 17 00:00:00 2001 From: anschrammh Date: Mon, 2 Jan 2023 21:07:40 +0100 Subject: [PATCH] Renamed the drivers folder to app_drivers because of a library name conflict. Moved bad makefile lib linkage --- src/W800 SDK v1.00.08/Makefile | 3 ++- src/W800 SDK v1.00.08/app/app_drivers/Makefile | 18 ++++++++++++++++++ .../app/{drivers => app_drivers}/i2c/BMP280.c | 0 .../app/{drivers => app_drivers}/i2c/BMP280.h | 0 .../{drivers => app_drivers}/i2c/CST816D.c.bck | 0 .../{drivers => app_drivers}/i2c/CST816D.h.bck | 0 .../app/{drivers => app_drivers}/i2c/Makefile | 2 +- .../{drivers => app_drivers}/i2c/QMC5883L.c | 0 .../{drivers => app_drivers}/i2c/QMC5883L.h | 0 .../app/{drivers => app_drivers}/i2c/bma4.c | 0 .../app/{drivers => app_drivers}/i2c/bma4.h | 0 .../app/{drivers => app_drivers}/i2c/bma456w.c | 0 .../app/{drivers => app_drivers}/i2c/bma456w.h | 0 .../{drivers => app_drivers}/i2c/bma4_defs.h | 0 .../app/{drivers => app_drivers}/i2c/i2c.c | 0 .../app/{drivers => app_drivers}/i2c/i2c.h | 0 .../app/{drivers => app_drivers}/lcd/Makefile | 2 +- .../app/{drivers => app_drivers}/lcd/lcd.c | 0 .../app/{drivers => app_drivers}/lcd/lcd.h | 0 .../{drivers => app_drivers}/mmc_sdio/Makefile | 2 +- .../mmc_sdio/mmc_sdio.c | 0 .../mmc_sdio/mmc_sdio.h | 0 src/W800 SDK v1.00.08/app/drivers/Makefile | 18 ------------------ src/W800 SDK v1.00.08/app/gfx/Makefile | 3 +-- src/W800 SDK v1.00.08/tools/w800/inc.mk | 6 +++--- 25 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 src/W800 SDK v1.00.08/app/app_drivers/Makefile rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/BMP280.c (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/BMP280.h (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/CST816D.c.bck (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/CST816D.h.bck (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/Makefile (75%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/QMC5883L.c (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/QMC5883L.h (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/bma4.c (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/bma4.h (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/bma456w.c (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/bma456w.h (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/bma4_defs.h (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/i2c.c (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/i2c/i2c.h (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/lcd/Makefile (75%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/lcd/lcd.c (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/lcd/lcd.h (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/mmc_sdio/Makefile (74%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/mmc_sdio/mmc_sdio.c (100%) rename src/W800 SDK v1.00.08/app/{drivers => app_drivers}/mmc_sdio/mmc_sdio.h (100%) delete mode 100644 src/W800 SDK v1.00.08/app/drivers/Makefile diff --git a/src/W800 SDK v1.00.08/Makefile b/src/W800 SDK v1.00.08/Makefile index 16dc8b2..a838461 100644 --- a/src/W800 SDK v1.00.08/Makefile +++ b/src/W800 SDK v1.00.08/Makefile @@ -31,7 +31,8 @@ endif COMPONENTS_$(TARGET) = \ $(TOP_DIR)/app/libuser$(LIB_EXT) \ - $(TOP_DIR)/lvgl/liblvgl$(LIB_EXT) + $(TOP_DIR)/app/app_drivers/libappdrivers$(LIB_EXT) \ + $(TOP_DIR)/lvgl/liblvgl$(LIB_EXT) ifeq ($(USE_LIB), 0) COMPONENTS_$(TARGET) += \ diff --git a/src/W800 SDK v1.00.08/app/app_drivers/Makefile b/src/W800 SDK v1.00.08/app/app_drivers/Makefile new file mode 100644 index 0000000..7977da3 --- /dev/null +++ b/src/W800 SDK v1.00.08/app/app_drivers/Makefile @@ -0,0 +1,18 @@ +TOP_DIR = ../.. +sinclude $(TOP_DIR)/tools/w800/conf.mk + +ifndef PDIR +GEN_LIBS = libappdrivers$(LIB_EXT) +COMPONENTS_libappdrivers = lcd/libappdriverslcd$(LIB_EXT) \ + mmc_sdio/libappdriversmmc_sdio$(LIB_EXT) \ + i2c/libappdriversi2c$(LIB_EXT) +endif + +#DEFINES += + +sinclude $(TOP_DIR)/tools/w800/rules.mk + +INCLUDES := $(INCLUDES) -I $(PDIR)include + +PDIR := ../$(PDIR) +sinclude $(PDIR)Makefile \ No newline at end of file diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/BMP280.c b/src/W800 SDK v1.00.08/app/app_drivers/i2c/BMP280.c similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/BMP280.c rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/BMP280.c diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/BMP280.h b/src/W800 SDK v1.00.08/app/app_drivers/i2c/BMP280.h similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/BMP280.h rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/BMP280.h diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/CST816D.c.bck b/src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.c.bck similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/CST816D.c.bck rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.c.bck diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/CST816D.h.bck b/src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.h.bck similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/CST816D.h.bck rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.h.bck diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/Makefile b/src/W800 SDK v1.00.08/app/app_drivers/i2c/Makefile similarity index 75% rename from src/W800 SDK v1.00.08/app/drivers/i2c/Makefile rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/Makefile index a50ac38..b85c6d4 100644 --- a/src/W800 SDK v1.00.08/app/drivers/i2c/Makefile +++ b/src/W800 SDK v1.00.08/app/app_drivers/i2c/Makefile @@ -2,7 +2,7 @@ TOP_DIR = ../../.. sinclude $(TOP_DIR)/tools/w800/conf.mk ifndef PDIR -GEN_LIBS = libdriversi2c$(LIB_EXT) +GEN_LIBS = libappdriversi2c$(LIB_EXT) endif #DEFINES += diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/QMC5883L.c b/src/W800 SDK v1.00.08/app/app_drivers/i2c/QMC5883L.c similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/QMC5883L.c rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/QMC5883L.c diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/QMC5883L.h b/src/W800 SDK v1.00.08/app/app_drivers/i2c/QMC5883L.h similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/QMC5883L.h rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/QMC5883L.h diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/bma4.c b/src/W800 SDK v1.00.08/app/app_drivers/i2c/bma4.c similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/bma4.c rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/bma4.c diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/bma4.h b/src/W800 SDK v1.00.08/app/app_drivers/i2c/bma4.h similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/bma4.h rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/bma4.h diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/bma456w.c b/src/W800 SDK v1.00.08/app/app_drivers/i2c/bma456w.c similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/bma456w.c rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/bma456w.c diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/bma456w.h b/src/W800 SDK v1.00.08/app/app_drivers/i2c/bma456w.h similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/bma456w.h rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/bma456w.h diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/bma4_defs.h b/src/W800 SDK v1.00.08/app/app_drivers/i2c/bma4_defs.h similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/bma4_defs.h rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/bma4_defs.h diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/i2c.c b/src/W800 SDK v1.00.08/app/app_drivers/i2c/i2c.c similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/i2c.c rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/i2c.c diff --git a/src/W800 SDK v1.00.08/app/drivers/i2c/i2c.h b/src/W800 SDK v1.00.08/app/app_drivers/i2c/i2c.h similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/i2c/i2c.h rename to src/W800 SDK v1.00.08/app/app_drivers/i2c/i2c.h diff --git a/src/W800 SDK v1.00.08/app/drivers/lcd/Makefile b/src/W800 SDK v1.00.08/app/app_drivers/lcd/Makefile similarity index 75% rename from src/W800 SDK v1.00.08/app/drivers/lcd/Makefile rename to src/W800 SDK v1.00.08/app/app_drivers/lcd/Makefile index a61dd1b..abc4e3c 100644 --- a/src/W800 SDK v1.00.08/app/drivers/lcd/Makefile +++ b/src/W800 SDK v1.00.08/app/app_drivers/lcd/Makefile @@ -2,7 +2,7 @@ TOP_DIR = ../../.. sinclude $(TOP_DIR)/tools/w800/conf.mk ifndef PDIR -GEN_LIBS = libdriverslcd$(LIB_EXT) +GEN_LIBS = libappdriverslcd$(LIB_EXT) endif #DEFINES += diff --git a/src/W800 SDK v1.00.08/app/drivers/lcd/lcd.c b/src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.c similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/lcd/lcd.c rename to src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.c diff --git a/src/W800 SDK v1.00.08/app/drivers/lcd/lcd.h b/src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.h similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/lcd/lcd.h rename to src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.h diff --git a/src/W800 SDK v1.00.08/app/drivers/mmc_sdio/Makefile b/src/W800 SDK v1.00.08/app/app_drivers/mmc_sdio/Makefile similarity index 74% rename from src/W800 SDK v1.00.08/app/drivers/mmc_sdio/Makefile rename to src/W800 SDK v1.00.08/app/app_drivers/mmc_sdio/Makefile index aef7f66..02bfd94 100644 --- a/src/W800 SDK v1.00.08/app/drivers/mmc_sdio/Makefile +++ b/src/W800 SDK v1.00.08/app/app_drivers/mmc_sdio/Makefile @@ -2,7 +2,7 @@ TOP_DIR = ../../.. sinclude $(TOP_DIR)/tools/w800/conf.mk ifndef PDIR -GEN_LIBS = libdriversmmc_sdio$(LIB_EXT) +GEN_LIBS = libappdriversmmc_sdio$(LIB_EXT) endif #DEFINES += diff --git a/src/W800 SDK v1.00.08/app/drivers/mmc_sdio/mmc_sdio.c b/src/W800 SDK v1.00.08/app/app_drivers/mmc_sdio/mmc_sdio.c similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/mmc_sdio/mmc_sdio.c rename to src/W800 SDK v1.00.08/app/app_drivers/mmc_sdio/mmc_sdio.c diff --git a/src/W800 SDK v1.00.08/app/drivers/mmc_sdio/mmc_sdio.h b/src/W800 SDK v1.00.08/app/app_drivers/mmc_sdio/mmc_sdio.h similarity index 100% rename from src/W800 SDK v1.00.08/app/drivers/mmc_sdio/mmc_sdio.h rename to src/W800 SDK v1.00.08/app/app_drivers/mmc_sdio/mmc_sdio.h diff --git a/src/W800 SDK v1.00.08/app/drivers/Makefile b/src/W800 SDK v1.00.08/app/drivers/Makefile deleted file mode 100644 index acbb660..0000000 --- a/src/W800 SDK v1.00.08/app/drivers/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -TOP_DIR = ../.. -sinclude $(TOP_DIR)/tools/w800/conf.mk - -ifndef PDIR -GEN_LIBS = libdrivers$(LIB_EXT) -COMPONENTS_libdrivers = lcd/libdriverslcd$(LIB_EXT) \ - mmc_sdio/libdriversmmc_sdio$(LIB_EXT) \ - i2c/libdriversi2c$(LIB_EXT) -endif - -#DEFINES += - -sinclude $(TOP_DIR)/tools/w800/rules.mk - -INCLUDES := $(INCLUDES) -I $(PDIR)include - -PDIR := ../$(PDIR) -sinclude $(PDIR)Makefile \ No newline at end of file diff --git a/src/W800 SDK v1.00.08/app/gfx/Makefile b/src/W800 SDK v1.00.08/app/gfx/Makefile index bbdd69e..9d16f45 100644 --- a/src/W800 SDK v1.00.08/app/gfx/Makefile +++ b/src/W800 SDK v1.00.08/app/gfx/Makefile @@ -3,8 +3,7 @@ sinclude $(TOP_DIR)/tools/w800/conf.mk ifndef PDIR GEN_LIBS = libusergfx$(LIB_EXT) -COMPONENTS_libusergfx = assets/libusergfxassets$(LIB_EXT) \ - ../drivers/libdrivers$(LIB_EXT) +COMPONENTS_libusergfx = assets/libusergfxassets$(LIB_EXT) endif #DEFINES += diff --git a/src/W800 SDK v1.00.08/tools/w800/inc.mk b/src/W800 SDK v1.00.08/tools/w800/inc.mk index bec1066..c5f8901 100644 --- a/src/W800 SDK v1.00.08/tools/w800/inc.mk +++ b/src/W800 SDK v1.00.08/tools/w800/inc.mk @@ -44,9 +44,9 @@ INCLUDES += -I $(TOP_DIR)/src/os/rtos/include INCLUDES += -I $(TOP_DIR)/src/app/factorycmd INCLUDES += -I $(TOP_DIR)/src/app/bleapp INCLUDES += -I $(TOP_DIR)/app/app_include -INCLUDES += -I $(TOP_DIR)/app/drivers/lcd -INCLUDES += -I $(TOP_DIR)/app/drivers/mmc_sdio -INCLUDES += -I $(TOP_DIR)/app/drivers/i2c +INCLUDES += -I $(TOP_DIR)/app/app_drivers/lcd +INCLUDES += -I $(TOP_DIR)/app/app_drivers/mmc_sdio +INCLUDES += -I $(TOP_DIR)/app/app_drivers/i2c INCLUDES += -I $(TOP_DIR)/app/gfx INCLUDES += -I $(TOP_DIR)/app