Merge branch 'feature/20' into develop

suikan4github · suikan4github · commit 9f360affeda8 · 2024-10-17T12:44:45.000+09:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ The issue #16 changes its public member function. But it is referred internally
 ### Removed
 ### Fixed
 - [Issue #11](https://github.com/suikan4github/rpp_driver/issues/11) Fails to compile in MSVC. 
+- [Issue #14](https://github.com/suikan4github/rpp_driver/issues/14)  Clean up Internal include directive.   
 - [Issue #17](https://github.com/suikan4github/rpp_driver/issues/17) The mock of the GpioBasic has the wrong definition. 
 - [Issue #18](https://github.com/suikan4github/rpp_driver/issues/18) The constructor of the MockI2sSlaveDuplex.hpp is missing.
 - [Issue #19](https://github.com/suikan4github/rpp_driver/issues/19) The Mock of the rpp_driver::Adau1361 is missing.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,6 +4,8 @@ cmake_minimum_required(VERSION 3.13)
 # These declaration works for both UNIX/Win and bare metal. 
 
 add_library(rpp_driver INTERFACE)
+        target_include_directories(rpp_driver INTERFACE .)
+
 
 # Win/Unix specific option. 
 if((${WIN32}) OR (${UNIX}))    
diff --git a/src/codec/CMakeLists.txt b/src/codec/CMakeLists.txt
@@ -5,4 +5,3 @@ target_sources(rpp_driver INTERFACE
                 adau1361.cpp
                 adau1361lower.cpp
                 umbadau1361lower.cpp)
-target_include_directories(rpp_driver INTERFACE .)
diff --git a/src/codec/adau1361.cpp b/src/codec/adau1361.cpp
@@ -13,7 +13,7 @@
 
 #include <assert.h>
 
-#include "i2cmasterinterface.hpp"
+#include "i2c/i2cmasterinterface.hpp"
 
 // Macro for easy-to-read
 #define CODEC_SYSLOG(fmt, ...) \
diff --git a/src/codec/adau1361.hpp b/src/codec/adau1361.hpp
@@ -10,7 +10,7 @@
 #ifndef PICO_DRIVER_SRC_CODEC_ADAU1361_HPP_
 #define PICO_DRIVER_SRC_CODEC_ADAU1361_HPP_
 
-#include <i2cmasterinterface.hpp>
+#include <i2c/i2cmasterinterface.hpp>
 
 #include "adau1361lower.hpp"
 namespace rpp_driver {
diff --git a/src/codec/adau1361lower.hpp b/src/codec/adau1361lower.hpp
@@ -10,7 +10,7 @@
 #ifndef PICO_DRIVER_SRC_CODEC_ADAU1361LOWER_HPP_
 #define PICO_DRIVER_SRC_CODEC_ADAU1361LOWER_HPP_
 
-#include "i2cmaster.hpp"
+#include "i2c/i2cmaster.hpp"
 
 #if __has_include(<gmock/gmock.h>)
 #include <gmock/gmock.h>
diff --git a/src/codec/umbadau1361lower.hpp b/src/codec/umbadau1361lower.hpp
@@ -10,8 +10,8 @@
 #ifndef PICO_DRIVER_SRC_CODEC_UMBADAU1361LOWER_HPP_
 #define PICO_DRIVER_SRC_CODEC_UMBADAU1361LOWER_HPP_
 
-#include "adau1361lower.hpp"
-#include "i2cmaster.hpp"
+#include "codec/adau1361lower.hpp"
+#include "i2c/i2cmaster.hpp"
 
 namespace rpp_driver {
 
diff --git a/src/gpio/CMakeLists.txt b/src/gpio/CMakeLists.txt
@@ -3,4 +3,3 @@ cmake_minimum_required(VERSION 3.13)
 # These declaration works for both UNIX/Win and bare metal. 
 target_sources(rpp_driver INTERFACE 
                 gpiobasic.cpp)
-target_include_directories(rpp_driver INTERFACE .)
diff --git a/src/gpio/gpiobasic.hpp b/src/gpio/gpiobasic.hpp
@@ -19,7 +19,7 @@
 // Alternate definition for unit test.
 #endif  // __has_include(<hardware/i2c.h>)
 
-#include "sdkwrapper.hpp"
+#include "sdk/sdkwrapper.hpp"
 
 namespace rpp_driver {
 /**
diff --git a/src/i2c/CMakeLists.txt b/src/i2c/CMakeLists.txt
@@ -3,4 +3,3 @@ cmake_minimum_required(VERSION 3.13)
 # These declaration works for both UNIX/Win and bare metal. 
 target_sources(rpp_driver INTERFACE 
                 i2cmaster.cpp)
-target_include_directories(rpp_driver INTERFACE .)
diff --git a/src/i2c/i2cmaster.hpp b/src/i2c/i2cmaster.hpp
@@ -25,8 +25,8 @@ typedef int i2c_inst_t;
 #define GPIO_FUNC_I2C 11
 #endif  // __has_include(<hardware/i2c.h>)
 
-#include "i2cmasterinterface.hpp"
-#include "sdkwrapper.hpp"
+#include "i2c/i2cmasterinterface.hpp"
+#include "sdk/sdkwrapper.hpp"
 
 namespace rpp_driver {
 /**
diff --git a/src/i2s/CMakeLists.txt b/src/i2s/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.13)
 # Common declaration for both UNIX/Win and bare metal.
 target_sources(rpp_driver INTERFACE 
                 i2sslaveduplex.cpp)
-target_include_directories(rpp_driver INTERFACE .)
 
 # Bare metal specific declaration. 
 if(NOT (${WIN32}) AND NOT(${UNIX})) # Is Target bare metal? 
diff --git a/src/i2s/i2sslaveduplex.cpp b/src/i2s/i2sslaveduplex.cpp
@@ -1,6 +1,6 @@
-#include "i2sslaveduplex.hpp"
+#include "i2s/i2sslaveduplex.hpp"
 
-#include "sdkwrapper.hpp"
+#include "sdk/sdkwrapper.hpp"
 
 #if __has_include(<hardware/pio.h>)  // Is build in Pico Environment?
 extern "C" {
diff --git a/src/i2s/i2sslaveduplex.hpp b/src/i2s/i2sslaveduplex.hpp
@@ -18,7 +18,7 @@
 #include <gmock/gmock.h>
 #endif
 
-#include "sdkwrapper.hpp"
+#include "sdk/sdkwrapper.hpp"
 
 namespace rpp_driver {
 /**
diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.13)
 
 # Common declaration for both UNIX/Win and bare metal.
-target_include_directories(rpp_driver INTERFACE .)
 target_sources(rpp_driver INTERFACE 
                        pico_sdk_apistub.cpp
         )
diff --git a/test/test_adau1361.cpp b/test/test_adau1361.cpp
@@ -1,9 +1,9 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "adau1361.hpp"
-#include "i2cmasterinterface.hpp"
-#include "umbadau1361lower.hpp"
+#include "codec/adau1361.hpp"
+#include "codec/umbadau1361lower.hpp"
+#include "i2c/i2cmasterinterface.hpp"
 
 class Adau1361Test : public ::testing::Test {
  protected:
diff --git a/test/test_adau1361lower.cpp b/test/test_adau1361lower.cpp
@@ -1,8 +1,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "adau1361lower.hpp"
-#include "i2cmasterinterface.hpp"
+#include "codec/adau1361lower.hpp"
+#include "i2c/i2cmasterinterface.hpp"
 
 // Class under test. Provide a dummy member function for test.
 class CutAdau1361Lower : public ::rpp_driver::Adau1361Lower {
diff --git a/test/test_gpiobasic.cpp b/test/test_gpiobasic.cpp
@@ -3,8 +3,8 @@
 
 #include <random>
 
-#include "gpiobasic.hpp"
-#include "sdkwrapper.hpp"
+#include "gpio/gpiobasic.hpp"
+#include "sdk/sdkwrapper.hpp"
 
 class GpioBasicTest : public ::testing::Test {
  protected:
diff --git a/test/test_i2cmaster.cpp b/test/test_i2cmaster.cpp
@@ -1,7 +1,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "i2cmaster.hpp"
+#include "i2c/i2cmaster.hpp"
 
 using testing::Return;
 
diff --git a/test/test_i2sslaveduplex.cpp b/test/test_i2sslaveduplex.cpp
@@ -3,8 +3,8 @@
 
 #include <random>
 
-#include "i2sslaveduplex.hpp"
-#include "sdkwrapper.hpp"
+#include "i2s/i2sslaveduplex.hpp"
+#include "sdk/sdkwrapper.hpp"
 
 class I2sSlaveDuplexTest : public ::testing::Test {
  protected:
diff --git a/test/test_mockadau1361.cpp b/test/test_mockadau1361.cpp
@@ -6,8 +6,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "adau1361.hpp"
-#include "sdkwrapper.hpp"
+#include "codec/adau1361.hpp"
+#include "sdk/sdkwrapper.hpp"
 
 using ::testing::_;
 class MockAdau1361Test : public ::testing::Test {
diff --git a/test/test_mockgpiobasic.cpp b/test/test_mockgpiobasic.cpp
@@ -6,8 +6,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "gpiobasic.hpp"
-#include "sdkwrapper.hpp"
+#include "gpio/gpiobasic.hpp"
+#include "sdk/sdkwrapper.hpp"
 
 using ::testing::_;
 class MockGpioBasicTest : public ::testing::Test {
diff --git a/test/test_mocki2sslaveduplex.cpp b/test/test_mocki2sslaveduplex.cpp
@@ -6,8 +6,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "i2sslaveduplex.hpp"
-#include "sdkwrapper.hpp"
+#include "i2s/i2sslaveduplex.hpp"
+#include "sdk/sdkwrapper.hpp"
 
 using ::testing::_;
 class MockI2sSlaveDuplexTest : public ::testing::Test {
diff --git a/test/test_umbadau1361lower.cpp b/test/test_umbadau1361lower.cpp
@@ -1,8 +1,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "i2cmasterinterface.hpp"
-#include "umbadau1361lower.hpp"
+#include "codec/umbadau1361lower.hpp"
+#include "i2c/i2cmasterinterface.hpp"
 
 class UmbAdau1361LowerTest : public ::testing::Test {
  protected:
