Reduce include path pollution

12 files changed, 27 insertions, 38 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 113b3a1..19748b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ set(nixie_clock_sources
     "third_party/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_adc.c"
     #"third_party/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_i2c.c"
     "third_party/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c"
-    "third_party/Time/time.c"
+    "app/time/time.c"
     "app/indicate/indicate_modes_task.c"
     "app/button/button_handler.c"
     "app/button/button_task.c"
@@ -95,15 +95,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE
     "third_party/FreeRTOS/include"
     "third_party/TouchSense"
     "third_party/STM32F0xx_StdPeriph_Driver/inc"
-    "third_party/Time"
+    "app/time"
     "app"
-    "app/nixie_driver"
-    "app/ltimers"
-    "app/head_task"
-    "app/indicate"
-    "app/light_sensor"
-    "app/button"
-    "app/led_driver"
     "app/platform/stm32f0-gcc/freertos"
     )
 
diff --git a/app/button/button_handler.c b/app/button/button_handler.c
index 7c3ea91..e989d2b 100644
--- a/app/button/button_handler.c
+++ b/app/button/button_handler.c
@@ -1,7 +1,6 @@
 #include "button_handler.h"
-#include "ltimers.h"
+#include "ltimers/ltimers.h"
 
-#include "nixie_driver_process.h"
 
 // FreeRTOS includes
 #include "FreeRTOS.h"
diff --git a/app/button/button_task.c b/app/button/button_task.c
index 7a2b9fc..589f43b 100644
--- a/app/button/button_task.c
+++ b/app/button/button_task.c
@@ -1,9 +1,8 @@
-#include "head_task.h"
 #include "tsl_user.h"
-#include "nixie_driver_process.h"
+#include "nixie_driver/nixie_driver_process.h"
 
 #include "button_handler.h"
-#include "ltimers.h"
+#include "ltimers/ltimers.h"
 
 #include "FreeRTOS.h"
 #include "task.h"
diff --git a/app/head_task/head_task.c b/app/head_task/head_task.c
index a01166a..bc9eb6e 100644
--- a/app/head_task/head_task.c
+++ b/app/head_task/head_task.c
@@ -6,11 +6,11 @@
 #include "queue.h"
 #include "semphr.h"
 
-#include "ltimers.h"
+#include "ltimers/ltimers.h"
 
-#include "indicate_modes_task.h"
-#include "nixie_driver_process.h"
-#include "button_handler.h"
+#include "indicate/indicate_modes_task.h"
+#include "nixie_driver/nixie_driver_process.h"
+#include "button/button_handler.h"
 #include "stm32f0xx_rtc.h"
 
 
diff --git a/app/indicate/indicate_modes_task.c b/app/indicate/indicate_modes_task.c
index 10a8c26..aba6107 100644
--- a/app/indicate/indicate_modes_task.c
+++ b/app/indicate/indicate_modes_task.c
@@ -1,6 +1,5 @@
 #include "indicate_modes_task.h"
-#include "nixie_driver_process.h"
-#include "ltimers.h"
+#include "ltimers/ltimers.h"
 
 // FreeRTOS includes
 #include "FreeRTOS.h"
diff --git a/app/indicate/indicate_modes_task.h b/app/indicate/indicate_modes_task.h
index e37406f..31ecba1 100644
--- a/app/indicate/indicate_modes_task.h
+++ b/app/indicate/indicate_modes_task.h
@@ -2,7 +2,7 @@
 #define INDICATE_MODES_TASK_INCLUDED
 
 #include <stdint.h>
-#include "nixie_driver_process.h"
+#include "nixie_driver/nixie_driver_process.h"
 
 // Номера режимов индикации
 typedef enum {
diff --git a/app/light_sensor/light_sensor_task.c b/app/light_sensor/light_sensor_task.c
index 642d9e9..140a93a 100644
--- a/app/light_sensor/light_sensor_task.c
+++ b/app/light_sensor/light_sensor_task.c
@@ -1,5 +1,5 @@
 #include "light_sensor_task.h"
-#include "ltimers.h"
+#include "ltimers/ltimers.h"
 
 // FreeRTOS includes
 #include "FreeRTOS.h"
diff --git a/app/main.c b/app/main.c
index 4c0881f..e857a38 100644
--- a/app/main.c
+++ b/app/main.c
@@ -46,18 +46,18 @@
 #include "queue.h"
 #include "semphr.h"
 
-#include "ltimers.h"
-#include "head_task.h"
-#include "button_task.h"
-#include "button_handler.h"
-#include "nixie_driver_task.h"
-#include "light_sensor_task.h"
+#include "ltimers/ltimers.h"
+#include "head_task/head_task.h"
+#include "button/button_task.h"
+#include "button/button_handler.h"
+#include "nixie_driver/nixie_driver_task.h"
+#include "light_sensor/light_sensor_task.h"
 
 #ifdef LED_DRIVER
-#include "led_driver_task.h"
+#include "led_driver/led_driver_task.h"
 #endif
 
-#include "indicate_modes_task.h"
+#include "indicate/indicate_modes_task.h"
 #include "tsl_user.h"
 #include "time.h"
 #include "stm32f0xx_usart.h"
diff --git a/app/nixie_driver/nixie_driver_process.c b/app/nixie_driver/nixie_driver_process.c
index d2c96f4..ed70c85 100644
--- a/app/nixie_driver/nixie_driver_process.c
+++ b/app/nixie_driver/nixie_driver_process.c
@@ -1,7 +1,6 @@
 #include "nixie_driver_process.h"
 #include "nixie_driver_config.h"
-#include "indicate_modes_task.h"
-#include "light_sensor_task.h"
+#include "light_sensor/light_sensor_task.h"
 
 #include <stdint.h>
 
diff --git a/app/stm32f0xx_it.c b/app/stm32f0xx_it.c
index 9327bed..46cb8dd 100644
--- a/app/stm32f0xx_it.c
+++ b/app/stm32f0xx_it.c
@@ -31,13 +31,13 @@
 #include "stm32f0xx_it.h"
 #include "stm32f0xx_conf.h"
 
-#include "ltimers.h"
-#include "ltimers_config.h"
+#include "ltimers/ltimers.h"
+#include "ltimers/ltimers_config.h"
 
-#include "nixie_driver_config.h"
-#include "nixie_driver_process.h"
-#include "led_driver_process.h"
-#include "led_driver_config.h"
+#include "nixie_driver/nixie_driver_config.h"
+#include "nixie_driver/nixie_driver_process.h"
+#include "led_driver/led_driver_process.h"
+#include "led_driver/led_driver_config.h"
 
 #include "tsl_types.h"
 #include "tsl_user.h"
diff --git a/third_party/Time/time.c b/app/time/time.c
index 4159f44..4159f44 100644
--- a/third_party/Time/time.c
+++ b/app/time/time.c
diff --git a/third_party/Time/time.h b/app/time/time.h
index ea1f265..ea1f265 100644
--- a/third_party/Time/time.h
+++ b/app/time/time.h