Move screen drv in subfolder

TiboDevC · Dec 8, 2022 · 6621de1 · 6621de1
1 parent ad3978e
commit 6621de1
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -37,6 +37,7 @@ LIBRARIES_CXX_SRC += $(foreach dir,$(LIBRARIES_DIRS), $(wildcard $(dir)*/*.cpp))
 
 TARGET_CC_SRC  := $(wildcard $(SKETCH)/*.c)
 TARGET_CC_SRC  += $(wildcard $(SKETCH)/font/*.c)
+TARGET_CC_SRC  += $(wildcard $(SKETCH)/drv/screen/*.c)
 TARGET_CXX_SRC := $(wildcard $(SKETCH)/*.cpp)
 
 VARIANT_DIR := lib/ArduinoCore-samd/variants/mkrwifi1010

diff --git a/alarm_clock/GUI_Paint.c b/alarm_clock/GUI_Paint.c
@@ -81,9 +81,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "DEV_Config.h"
 #include "GUI_Paint.h"
 #include "debug.h"
+#include "drv/screen/DEV_Config.h"
 
 static PAINT Paint;
 

diff --git a/alarm_clock/GUI_Paint.h b/alarm_clock/GUI_Paint.h
@@ -78,9 +78,9 @@
 #ifndef __GUI_PAINT_H
 #define __GUI_PAINT_H
 
-#include "DEV_Config.h"
 #include "debug.h"
-#include "fonts.h"
+#include "drv/screen/DEV_Config.h"
+#include "font/fonts.h"
 #include "paint.hpp"
 
 /**

diff --git a/alarm_clock/DEV_Config.c → alarm_clock/drv/screen/DEV_Config.c b/alarm_clock/DEV_Config.c → alarm_clock/drv/screen/DEV_Config.c
diff --git a/alarm_clock/DEV_Config.h → alarm_clock/drv/screen/DEV_Config.h b/alarm_clock/DEV_Config.h → alarm_clock/drv/screen/DEV_Config.h
diff --git a/alarm_clock/EPD.h → alarm_clock/drv/screen/EPD.h b/alarm_clock/EPD.h → alarm_clock/drv/screen/EPD.h
diff --git a/alarm_clock/EPD_3in7.c → alarm_clock/drv/screen/EPD_3in7.c b/alarm_clock/EPD_3in7.c → alarm_clock/drv/screen/EPD_3in7.c
diff --git a/alarm_clock/EPD_3in7.h → alarm_clock/drv/screen/EPD_3in7.h b/alarm_clock/EPD_3in7.h → alarm_clock/drv/screen/EPD_3in7.h
diff --git a/alarm_clock/screen.cpp b/alarm_clock/screen.cpp
@@ -3,11 +3,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
-#include "DEV_Config.h"
-#include "EPD.h"
 #include "GUI_Paint.h"
 #include "alarm_flash_storage.h"
 #include "button.h"
+#include "drv/screen/DEV_Config.h"
+#include "drv/screen/EPD.h"
 #include "rtc_tool.h"
 #include "screen.h"
 

diff --git a/alarm_clock/state_init.c b/alarm_clock/state_init.c
@@ -1,9 +1,9 @@
 #include "alarm_clock_fsm.h"
 
-#include "DEV_Config.h"
 #include "alarm_flash_storage.h"
 #include "button.h"
 #include "debug.h"
+#include "drv/screen/DEV_Config.h"
 #include "rtc_tool.h"
 #include "screen.h"
 #include "timer.h"

diff --git a/alarm_clock/state_settings.c b/alarm_clock/state_settings.c
@@ -1,8 +1,8 @@
 #include "alarm_clock_fsm.h"
 
-#include "EPD_3in7.h"
 #include "button.h"
 #include "debug.h"
+#include "drv/screen/EPD_3in7.h"
 #include "rtc_tool.h"
 #include "screen.h"