Change common/ folder structure

34 files changed, 17 insertions, 18 deletions

diff --git a/src/common/src/Audio/audio.c b/src/common/Audio/audio.c
index f68f867..f68f867 100644
--- a/src/common/src/Audio/audio.c
+++ b/src/common/Audio/audio.c
diff --git a/src/common/includes/Audio/audio.h b/src/common/Audio/audio.h
index d48cbe5..d48cbe5 100644
--- a/src/common/includes/Audio/audio.h
+++ b/src/common/Audio/audio.h
diff --git a/src/common/src/Audio/audio_in.c b/src/common/Audio/audio_in.c
index dd1994e..dd1994e 100644
--- a/src/common/src/Audio/audio_in.c
+++ b/src/common/Audio/audio_in.c
diff --git a/src/common/includes/Audio/audio_in.h b/src/common/Audio/audio_in.h
index 97a0f29..97a0f29 100644
--- a/src/common/includes/Audio/audio_in.h
+++ b/src/common/Audio/audio_in.h
diff --git a/src/common/src/Audio/cw.c b/src/common/Audio/cw.c
index 667d459..667d459 100644
--- a/src/common/src/Audio/cw.c
+++ b/src/common/Audio/cw.c
diff --git a/src/common/includes/Audio/cw.h b/src/common/Audio/cw.h
index 39be9c5..39be9c5 100644
--- a/src/common/includes/Audio/cw.h
+++ b/src/common/Audio/cw.h
diff --git a/src/common/src/Audio/tone.c b/src/common/Audio/tone.c
index 90a8394..90a8394 100644
--- a/src/common/src/Audio/tone.c
+++ b/src/common/Audio/tone.c
diff --git a/src/common/includes/Audio/tone.h b/src/common/Audio/tone.h
index ba05304..ba05304 100644
--- a/src/common/includes/Audio/tone.h
+++ b/src/common/Audio/tone.h
diff --git a/src/common/src/Core/FreeRTOSConfig.h b/src/common/Core/FreeRTOSConfig.h
index b58e2a2..b58e2a2 100644
--- a/src/common/src/Core/FreeRTOSConfig.h
+++ b/src/common/Core/FreeRTOSConfig.h
diff --git a/src/common/src/Core/common.c b/src/common/Core/common.c
index 7e19eaf..7e19eaf 100644
--- a/src/common/src/Core/common.c
+++ b/src/common/Core/common.c
diff --git a/src/common/includes/Core/common.h b/src/common/Core/common.h
index 4918a5b..4918a5b 100644
--- a/src/common/includes/Core/common.h
+++ b/src/common/Core/common.h
diff --git a/src/common/includes/Core/delay.h b/src/common/Core/delay.h
index 4cc3f07..4cc3f07 100644
--- a/src/common/includes/Core/delay.h
+++ b/src/common/Core/delay.h
diff --git a/src/common/src/Core/fsm.c b/src/common/Core/fsm.c
index 9fe2c4c..9fe2c4c 100644
--- a/src/common/src/Core/fsm.c
+++ b/src/common/Core/fsm.c
diff --git a/src/common/includes/Core/fsm.h b/src/common/Core/fsm.h
index 37ca386..37ca386 100644
--- a/src/common/includes/Core/fsm.h
+++ b/src/common/Core/fsm.h
diff --git a/src/common/src/Core/main.c b/src/common/Core/main.c
index 07657fa..07657fa 100644
--- a/src/common/src/Core/main.c
+++ b/src/common/Core/main.c
diff --git a/src/common/src/GPIO/analog.c b/src/common/GPIO/analog.c
index b6f75a6..b6f75a6 100644
--- a/src/common/src/GPIO/analog.c
+++ b/src/common/GPIO/analog.c
diff --git a/src/common/includes/GPIO/analog.h b/src/common/GPIO/analog.h
index ddc19ac..ddc19ac 100644
--- a/src/common/includes/GPIO/analog.h
+++ b/src/common/GPIO/analog.h
diff --git a/src/common/includes/GPIO/i2c.h b/src/common/GPIO/i2c.h
index 69a4ad2..69a4ad2 100644
--- a/src/common/includes/GPIO/i2c.h
+++ b/src/common/GPIO/i2c.h
diff --git a/src/common/includes/GPIO/leds.h b/src/common/GPIO/leds.h
index 70c57d2..70c57d2 100644
--- a/src/common/includes/GPIO/leds.h
+++ b/src/common/GPIO/leds.h
diff --git a/src/common/includes/GPIO/pio.h b/src/common/GPIO/pio.h
index e118fc8..e118fc8 100644
--- a/src/common/includes/GPIO/pio.h
+++ b/src/common/GPIO/pio.h
diff --git a/src/common/src/GPIO/temperature.c b/src/common/GPIO/temperature.c
index f9e43cb..f9e43cb 100644
--- a/src/common/src/GPIO/temperature.c
+++ b/src/common/GPIO/temperature.c
diff --git a/src/common/includes/GPIO/temperature.h b/src/common/GPIO/temperature.h
index f49cc26..f49cc26 100644
--- a/src/common/includes/GPIO/temperature.h
+++ b/src/common/GPIO/temperature.h
diff --git a/src/common/src/GPIO/usart.c b/src/common/GPIO/usart.c
index 8bcd80a..8bcd80a 100644
--- a/src/common/src/GPIO/usart.c
+++ b/src/common/GPIO/usart.c
diff --git a/src/common/includes/GPIO/usart.h b/src/common/GPIO/usart.h
index 681d86f..681d86f 100644
--- a/src/common/includes/GPIO/usart.h
+++ b/src/common/GPIO/usart.h
diff --git a/src/common/src/GPS/gps.c b/src/common/GPS/gps.c
index bfdc1c1..bfdc1c1 100644
--- a/src/common/src/GPS/gps.c
+++ b/src/common/GPS/gps.c
diff --git a/src/common/includes/GPS/gps.h b/src/common/GPS/gps.h
index 8a2118f..8a2118f 100644
--- a/src/common/includes/GPS/gps.h
+++ b/src/common/GPS/gps.h
diff --git a/src/common/src/GPS/minmea.c b/src/common/GPS/minmea.c
index 4d4aeb8..4d4aeb8 100644
--- a/src/common/src/GPS/minmea.c
+++ b/src/common/GPS/minmea.c
diff --git a/src/common/includes/GPS/minmea.h b/src/common/GPS/minmea.h
index ab770a6..ab770a6 100644
--- a/src/common/includes/GPS/minmea.h
+++ b/src/common/GPS/minmea.h
diff --git a/src/common/sourcelist.txt b/src/common/sourcelist.txt
index 9d6ec78..b0010be 100644
--- a/src/common/sourcelist.txt
+++ b/src/common/sourcelist.txt
@@ -1,12 +1,12 @@
-src/GPIO/analog.c
-src/GPIO/usart.c
-src/GPIO/temperature.c
-src/GPS/gps.c
-src/GPS/minmea.c
-src/Core/common.c
-src/Core/fsm.c
-src/Core/main.c
-src/Audio/cw.c
-src/Audio/audio.c
-src/Audio/audio_in.c
-src/Audio/tone.c
+GPIO/analog.c
+GPIO/usart.c
+GPIO/temperature.c
+GPS/gps.c
+GPS/minmea.c
+Core/common.c
+Core/fsm.c
+Core/main.c
+Audio/cw.c
+Audio/audio.c
+Audio/audio_in.c
+Audio/tone.c
diff --git a/src/glutt-o-logique/FreeRTOSConfig.h b/src/glutt-o-logique/FreeRTOSConfig.h
index 5a799e9..fdbb2e4 100644
--- a/src/glutt-o-logique/FreeRTOSConfig.h
+++ b/src/glutt-o-logique/FreeRTOSConfig.h
@@ -1,4 +1,4 @@
-#include "../common/src/Core/FreeRTOSConfig.h"
+#include "../common/Core/FreeRTOSConfig.h"
 
 #define configCHECK_FOR_STACK_OVERFLOW	2 // Default: 2
 
diff --git a/src/glutt-o-logique/Makefile b/src/glutt-o-logique/Makefile
index 0febb9c..3794856 100644
--- a/src/glutt-o-logique/Makefile
+++ b/src/glutt-o-logique/Makefile
@@ -22,7 +22,7 @@ COMMON_SOURCE_LIST=$(shell cat ../common/sourcelist.txt)
 CSOURCES+=$(COMMON_SOURCE_LIST:%.c=../common/%.c)
 
 INC=$(shell find -L $(SRCDIR) -name '*.h' -exec dirname {} \; | uniq)
-INC+=$(COMMON_DIR)/includes
+INC+=$(COMMON_DIR)
 INCLUDES=$(INC:%=-I%)
 
 # Create object list
diff --git a/src/glutt-o-logique/usart.c b/src/glutt-o-logique/usart.c
index 806505b..9ec5553 100644
--- a/src/glutt-o-logique/usart.c
+++ b/src/glutt-o-logique/usart.c
@@ -37,7 +37,7 @@ const uint16_t GPIOD_PIN_GPS_RESET_N = GPIO_Pin_10;
 const uint16_t GPIOA_PIN_USART2_RX = GPIO_Pin_3;
 const uint16_t GPIOA_PIN_USART2_TX = GPIO_Pin_2;
 
-#include "../common/includes/GPIO/usart.h"
+#include "GPIO/usart.h"
 
 #define USART2_RECEIVE_ENABLE 0 // TODO something is not working
 
diff --git a/src/simulator/Makefile b/src/simulator/Makefile
index 615765b..a93e741 100644
--- a/src/simulator/Makefile
+++ b/src/simulator/Makefile
@@ -43,7 +43,7 @@ C_FILES			+= $(SRC_SOURCES)
 INCLUDES        += -I$(SRCROOT)/Source/include
 INCLUDES        += -I$(SRCROOT)/Source/portable/GCC/POSIX/
 INCLUDES        += -I$(SRCROOT)/src/Core
-INCLUDES        += -I$(SRCROOT)/../common/includes/
+INCLUDES        += -I$(SRCROOT)/../common/
 INCLUDES        += -I$(SRCROOT)
 
 # Generate OBJS names
diff --git a/src/simulator/src/Core/FreeRTOSConfig.h b/src/simulator/src/Core/FreeRTOSConfig.h
index 19086b7..a262c24 100644
--- a/src/simulator/src/Core/FreeRTOSConfig.h
+++ b/src/simulator/src/Core/FreeRTOSConfig.h
@@ -1,4 +1,3 @@
-#include "../../../common/src/Core/FreeRTOSConfig.h"
-
+#include "Core/FreeRTOSConfig.h"
 
 #define configCHECK_FOR_STACK_OVERFLOW	0 /* Do not use this option on the PC port. */