feat: CONFIG_DISABLE_MODULE を廃止し、has_include を使うようにした (#26)

sya-ri · Dec 10, 2023 · c3446de · c3446de
1 parent 33c6026
commit c3446de
Show file tree

Hide file tree

Showing 66 changed files with 70 additions and 269 deletions.
diff --git a/README.md b/README.md
@@ -25,8 +25,6 @@ IncludePath: HAL_Extension/ # フォルダ直下
     - [BinaryArray](util/class/BinaryArray.md)
     - [BinaryArrayRef](util/class/BinaryArrayRef.md)
 - [GPIO](gpio/README.md)
-  - [コンフィグ](gpio/README.md#コンフィグ)
-    - [CONFIG_DISABLE_MODULE_GPIO](gpio/README.md#CONFIG_DISABLE_MODULE_GPIO)
   - [関数](gpio/README.md#関数)
     - [GPIO](gpio/function/README.md#gpio)
   - [クラス](gpio/README.md#クラス)
@@ -36,8 +34,6 @@ IncludePath: HAL_Extension/ # フォルダ直下
     - [FixedSevenSegment](gpio/class/FixedSevenSegment.md)
     - [DynamicSevenSegment](gpio/class/DynamicSevenSegment.md)
 - [UART](uart/README.md)
-  - [コンフィグ](uart/README.md#コンフィグ)
-    - [CONFIG_DISABLE_MODULE_UART](uart/README.md#CONFIG_DISABLE_MODULE_UART)
   - [関数](uart/README.md#関数)
     - [Transmit](uart/function/README.md#transmit)
     - [Receive](uart/function/README.md#receive)
@@ -49,8 +45,6 @@ IncludePath: HAL_Extension/ # フォルダ直下
     - [UART_Logger](uart/class/UART_Logger.md)
     - [UART_Logger_IT](uart/class/UART_Logger_IT.md)
 - [I2C](i2c/README.md)
-  - [コンフィグ](i2c/README.md#コンフィグ)
-    - [CONFIG_DISABLE_MODULE_I2C](i2c/README.md#config_disable_module_i2c)
   - [関数](i2c/README.md#関数)
     - [MasterTransmit](i2c/function/README.md#mastertransmit)
     - [MasterReceive](i2c/function/README.md#masterreceive)
@@ -65,8 +59,6 @@ IncludePath: HAL_Extension/ # フォルダ直下
     - [I2C_Slave_IT](i2c/class/I2C_Slave_IT.md)
     - [I2C_Slave_DMA](i2c/class/I2C_Slave_DMA.md)
 - [TIM](tim/README.md)
-  - [コンフィグ](tim/README.md#コンフィグ)
-    - [CONFIG_DISABLE_MODULE_TIM](tim/README.md#config_disable_module_tim)
   - [関数](tim/README.md#関数)
     - [Callback](tim/function/README.md#callback)
   - [クラス](tim/README.md#クラス)
@@ -75,15 +67,10 @@ IncludePath: HAL_Extension/ # フォルダ直下
     - [Encoder](tim/class/Encoder.md)
     - [TimerInterrupt](tim/class/TimerInterrupt.md)
 - [ADC](adc/README.md)
-  - [コンフィグ](adc/README.md#コンフィグ)
-    - [CONFIG_DISABLE_MODULE_ADC](adc/README.md#config_disable_module_adc)
   - [関数](adc/README.md#関数)
     - [setADCCallback](adc/function/README.md#setadccallback)
   - [クラス](adc/README.md#クラス)
     - [ADC_DMA](adc/class/ADC_DMA.md)
 - [IWDG](iwdg/README.md)
-  - [コンフィグ](iwdg/README.md#コンフィグ)
-    - [CONFIG_DISABLE_MODULE_IWDG](iwdg/README.md#config_disable_module_iwdg)
-    - [CONFIG_DISABLE_IWDG_CONSTEXPR](iwdg/README.md#config_disable_iwdg_constexpr)
   - [クラス](iwdg/README.md#クラス)
     - [IWDG_Manager](iwdg/class/IWDG_Manager.md)
diff --git a/adc/README.md b/adc/README.md
@@ -1,11 +1,5 @@
 # ADC
 
-## コンフィグ
-
-##### CONFIG_DISABLE_MODULE_ADC
-> ADC モジュールの無効化  
-> 定義することでコンパイルされなくなります
-
 ## 関数
 - [setADCCallback](function/README.md#setadccallback)
 

diff --git a/adc/adc_dma.cpp b/adc/adc_dma.cpp
@@ -1,5 +1,3 @@
-#ifndef CONFIG_DISABLE_MODULE_ADC
-
 #include "adc/adc_dma.hpp"
 #include "adc/callback.hpp"
 #include "util/function.hpp"
@@ -39,5 +37,3 @@ void ADC_DMA::setCallback(std::function<void()> function) noexcept {
 }
 
 } // namespace halex
-
-#endif // CONFIG_DISABLE_MODULE_ADC
diff --git a/adc/adc_dma.hpp b/adc/adc_dma.hpp
@@ -1,7 +1,7 @@
 #ifndef HAL_EXTENSION_ADC_DMA_HPP
 #define HAL_EXTENSION_ADC_DMA_HPP
 
-#ifndef CONFIG_DISABLE_MODULE_ADC
+#if __has_include("adc.h")
 
 #include "adc.h"
 #include <functional>
@@ -27,6 +27,6 @@ class ADC_DMA {
 
 } // namespace halex
 
-#endif // CONFIG_DISABLE_MODULE_ADC
+#endif // __has_include
 
 #endif // HAL_EXTENSION_ADC_DMA_HPP
diff --git a/adc/all.hpp b/adc/all.hpp
@@ -1,11 +1,7 @@
 #ifndef HAL_EXTENSION_ADC_ALL_HPP
 #define HAL_EXTENSION_ADC_ALL_HPP
 
-#ifndef CONFIG_DISABLE_MODULE_ADC
-
 #include "callback.hpp"
 #include "adc_dma.hpp"
 
-#endif // CONFIG_DISABLE_MODULE_ADC
-
 #endif // HAL_EXTENSION_ADC_ALL_HPP
diff --git a/adc/callback.cpp b/adc/callback.cpp
@@ -1,5 +1,3 @@
-#ifndef CONFIG_DISABLE_MODULE_ADC
-
 #include "adc/callback.hpp"
 #include <map>
 #include "util/function.hpp"
@@ -29,5 +27,3 @@ void runADCCallback(ADC_HandleTypeDef &hadc) noexcept {
 }
 
 } // namespace halex
-
-#endif // CONFIG_DISABLE_MODULE_ADC
diff --git a/adc/callback.hpp b/adc/callback.hpp
@@ -1,7 +1,7 @@
 #ifndef HAL_EXTENSION_ADC_CALLBACK_HPP
 #define HAL_EXTENSION_ADC_CALLBACK_HPP
 
-#ifndef CONFIG_DISABLE_MODULE_ADC
+#if __has_include("adc.h")
 
 #include <functional>
 #include "adc.h"
@@ -15,6 +15,6 @@ void runADCCallback(ADC_HandleTypeDef &hadc) noexcept;
 
 } // namespace halex
 
-#endif // CONFIG_DISABLE_MODULE_ADC
+#endif // __has_include
 
 #endif // HAL_EXTENSION_ADC_CALLBACK_HPP
diff --git a/gpio/README.md b/gpio/README.md
@@ -1,11 +1,5 @@
 # GPIO
 
-## コンフィグ
-
-> #### CONFIG_DISABLE_MODULE_GPIO
-> GPIO モジュールの無効化  
-> 定義することでコンパイルされなくなります
-
 ## 関数
 - [GPIO](function/README.md#gpio)
   - [gpioRead](function/README.md#gpioread)

diff --git a/gpio/all.hpp b/gpio/all.hpp
@@ -1,15 +1,11 @@
 #ifndef HAL_EXTENSION_GPIO_ALL_HPP
 #define HAL_EXTENSION_GPIO_ALL_HPP
 
-#ifndef CONFIG_DISABLE_MODULE_GPIO
-
 #include "function.hpp"
 #include "gpio.hpp"
 #include "dip_switch.hpp"
 #include "seven_segment.hpp"
 #include "fixed_seven_segment.hpp"
 #include "dynamic_seven_segment.hpp"
 
-#endif // CONFIG_DISABLE_MODULE_GPIO
-
 #endif // HAL_EXTENSION_GPIO_ALL_HPP
diff --git a/gpio/dip_switch.cpp b/gpio/dip_switch.cpp
@@ -1,5 +1,3 @@
-#ifndef CONFIG_DISABLE_MODULE_GPIO
-
 #include "gpio/dip_switch.hpp"
 
 namespace halex {
@@ -32,5 +30,3 @@ uint8_t DIPSwitch::getAddress() const noexcept {
 }
 
 } // namespace halex
-
-#endif // CONFIG_DISABLE_MODULE_GPIO
diff --git a/gpio/dip_switch.hpp b/gpio/dip_switch.hpp
@@ -1,7 +1,7 @@
 #ifndef HAL_EXTENSION_GPIO_DIP_SWITCH_HPP
 #define HAL_EXTENSION_GPIO_DIP_SWITCH_HPP
 
-#ifndef CONFIG_DISABLE_MODULE_GPIO
+#if __has_include("gpio.h")
 
 #include <vector>
 #include "gpio.hpp"
@@ -22,6 +22,6 @@ class DIPSwitch {
 
 } // namespace halex
 
-#endif // CONFIG_DISABLE_MODULE_GPIO
+#endif // __has_include
 
 #endif // HAL_EXTENSION_GPIO_DIP_SWITCH_HPP
diff --git a/gpio/dynamic_seven_segment.cpp b/gpio/dynamic_seven_segment.cpp
@@ -1,5 +1,3 @@
-#ifndef CONFIG_DISABLE_MODULE_GPIO
-
 #include "gpio/dynamic_seven_segment.hpp"
 
 namespace halex {
@@ -186,5 +184,3 @@ void DynamicSevenSegment::clear() const noexcept {
 }
 
 } // namespace halex
-
-#endif // CONFIG_DISABLE_MODULE_GPIO
diff --git a/gpio/dynamic_seven_segment.hpp b/gpio/dynamic_seven_segment.hpp
@@ -1,7 +1,7 @@
 #ifndef HAL_EXTENSION_GPIO_DYNAMIC_SEVEN_SEGMENT_HPP
 #define HAL_EXTENSION_GPIO_DYNAMIC_SEVEN_SEGMENT_HPP
 
-#ifndef CONFIG_DISABLE_MODULE_GPIO
+#if __has_include("gpio.h")
 
 #include <vector>
 #include "seven_segment.hpp"
@@ -51,6 +51,6 @@ class DynamicSevenSegment {
 
 } // namespace halex
 
-#endif // CONFIG_DISABLE_MODULE_GPIO
+#endif // __has_include
 
 #endif // HAL_EXTENSION_GPIO_DYNAMIC_SEVEN_SEGMENT_HPP
diff --git a/gpio/fixed_seven_segment.cpp b/gpio/fixed_seven_segment.cpp
@@ -1,5 +1,3 @@
-#ifndef CONFIG_DISABLE_MODULE_GPIO
-
 #include "gpio/fixed_seven_segment.hpp"
 
 namespace halex {
@@ -51,5 +49,3 @@ bool FixedSevenSegment::isAvailable() const noexcept {
 }
 
 } // namespace halex
-
-#endif // CONFIG_DISABLE_MODULE_GPIO
diff --git a/gpio/fixed_seven_segment.hpp b/gpio/fixed_seven_segment.hpp
@@ -1,7 +1,7 @@
 #ifndef HAL_EXTENSION_GPIO_FIXED_SEVEN_SEGMENT_HPP
 #define HAL_EXTENSION_GPIO_FIXED_SEVEN_SEGMENT_HPP
 
-#ifndef CONFIG_DISABLE_MODULE_GPIO
+#if __has_include("gpio.h")
 
 #include <vector>
 #include "seven_segment.hpp"
@@ -26,6 +26,6 @@ class FixedSevenSegment: public SevenSegment {
 
 } // namespace halex
 
-#endif // CONFIG_DISABLE_MODULE_GPIO
+#endif // __has_include
 
 #endif // HAL_EXTENSION_GPIO_FIXED_SEVEN_SEGMENT_HPP
diff --git a/gpio/function.hpp b/gpio/function.hpp
@@ -1,7 +1,7 @@
 #ifndef HAL_EXTENSION_GPIO_FUNCTION_HPP
 #define HAL_EXTENSION_GPIO_FUNCTION_HPP
 
-#ifndef CONFIG_DISABLE_MODULE_GPIO
+#if __has_include("gpio.h")
 
 #include "gpio.h"
 
@@ -21,6 +21,6 @@ inline void gpioToggle(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin) noexcept {
 
 } // namespace halex
 
-#endif // CONFIG_DISABLE_MODULE_GPIO
+#endif // __has_include
 
 #endif // HAL_EXTENSION_GPIO_FUNCTION_HPP
diff --git a/gpio/gpio.cpp b/gpio/gpio.cpp
@@ -1,5 +1,3 @@
-#ifndef CONFIG_DISABLE_MODULE_GPIO
-
 #include "gpio/gpio.hpp"
 #include "gpio/function.hpp"
 #include "util/function.hpp"
@@ -53,5 +51,3 @@ void GPIO::toggle() const noexcept {
 }
 
 } // namespace halex
-
-#endif // CONFIG_DISABLE_MODULE_GPIO
diff --git a/gpio/gpio.hpp b/gpio/gpio.hpp
@@ -1,7 +1,7 @@
 #ifndef HAL_EXTENSION_GPIO_HPP
 #define HAL_EXTENSION_GPIO_HPP
 
-#ifndef CONFIG_DISABLE_MODULE_GPIO
+#if __has_include("gpio.h")
 
 #include "gpio.h"
 
@@ -27,6 +27,6 @@ class GPIO {
 
 } // namespace halex
 
-#endif // CONFIG_DISABLE_MODULE_GPIO
+#endif // __has_include
 
 #endif // HAL_EXTENSION_GPIO_HPP
diff --git a/gpio/seven_segment.cpp b/gpio/seven_segment.cpp
@@ -1,5 +1,3 @@
-#ifndef CONFIG_DISABLE_MODULE_GPIO
-
 #include "gpio/seven_segment.hpp"
 #include <array>
 
@@ -82,5 +80,3 @@ bool SevenSegment::isAvailable() const noexcept {
 }
 
 } // namespace halex
-
-#endif // CONFIG_DISABLE_MODULE_GPIO
diff --git a/gpio/seven_segment.hpp b/gpio/seven_segment.hpp
@@ -1,7 +1,7 @@
 #ifndef HAL_EXTENSION_GPIO_SEVEN_SEGMENT_HPP
 #define HAL_EXTENSION_GPIO_SEVEN_SEGMENT_HPP
 
-#ifndef CONFIG_DISABLE_MODULE_GPIO
+#if __has_include("gpio.h")
 
 #include <vector>
 #include "gpio.hpp"
@@ -26,6 +26,6 @@ class SevenSegment {
 
 } // namespace halex
 
-#endif // CONFIG_DISABLE_MODULE_GPIO
+#endif // __has_include
 
 #endif // HAL_EXTENSION_GPIO_SEVEN_SEGMENT_HPP
diff --git a/i2c/README.md b/i2c/README.md
@@ -1,11 +1,5 @@
 # I2C
 
-## コンフィグ
-
-> #### CONFIG_DISABLE_MODULE_I2C
-> I2C モジュールの無効化  
-> 定義することでコンパイルされなくなります
-
 ## 関数
 - [MasterTransmit](function/README.md#mastertransmit)
   - [i2cMasterTransmit](function/README.md#i2cmastertransmit)
@@ -69,7 +63,6 @@
   - [関数](class/I2C_Slave.md#関数)
     - [init()](class/I2C_Slave.md#i2c_slaveinit)
     - [init(uint8_t)](class/I2C_Slave.md#i2c_slaveinituint8_t)
-    - [init(DIPSwitch)](class/I2C_Slave.md#i2c_slaveinitdipswitch)
     - [transmit(T, uint32_t)](class/I2C_Slave.md#i2c_slavetransmitt-uint32_t)
     - [receive(T, uint32_t)](class/I2C_Slave.md#i2c_slavereceivet-uint32_t)
 - [I2C_Slave_IT](class/I2C_Slave_IT.md)
@@ -80,7 +73,6 @@
   - [関数](class/I2C_Slave_IT.md#関数)
     - [init()](class/I2C_Slave_IT.md#i2c_slave_itinit)
     - [init(uint8_t)](class/I2C_Slave_IT.md#i2c_slave_itinituint8_t)
-    - [init(DIPSwitch)](class/I2C_Slave_IT.md#i2c_slave_itinitdipswitch)
     - [transmit(T)](class/I2C_Slave_IT.md#i2c_slave_ittransmitt)
     - [receive(T)](class/I2C_Slave_IT.md#i2c_slave_itreceivet)
     - [setTxCallback(std::function<void()>)](class/I2C_Slave_IT.md#i2c_slave_itsettxcallbackstdfunctionvoid)
@@ -94,7 +86,6 @@
   - [関数](class/I2C_Slave_DMA.md#関数)
     - [init()](class/I2C_Slave_DMA.md#i2c_slave_dmainit)
     - [init(uint8_t)](class/I2C_Slave_DMA.md#i2c_slave_dmainituint8_t)
-    - [init(DIPSwitch)](class/I2C_Slave_DMA.md#i2c_slave_dmainitdipswitch)
     - [startTransmit()](class/I2C_Slave_DMA.md#i2c_slave_dmastarttransmit)
     - [startReceive()](class/I2C_Slave_DMA.md#i2c_slave_dmastartreceive)
     - [setTxCallback(std::function<void()>)](class/I2C_Slave_DMA.md#i2c_slave_dmasettxcallbackstdfunctionvoid)

diff --git a/i2c/all.hpp b/i2c/all.hpp
@@ -1,8 +1,6 @@
 #ifndef HAL_EXTENSION_I2C_ALL_HPP
 #define HAL_EXTENSION_I2C_ALL_HPP
 
-#ifndef CONFIG_DISABLE_MODULE_I2C
-
 #include "callback.hpp"
 #include "function.hpp"
 #include "i2c_master.hpp"
@@ -12,6 +10,4 @@
 #include "i2c_slave_it.hpp"
 #include "i2c_slave_dma.hpp"
 
-#endif // CONFIG_DISABLE_MODULE_I2C
-
 #endif // HAL_EXTENSION_I2C_ALL_HPP
diff --git a/i2c/callback.cpp b/i2c/callback.cpp
@@ -1,5 +1,3 @@
-#ifndef CONFIG_DISABLE_MODULE_I2C
-
 #include "i2c/callback.hpp"
 #include <map>
 #include "util/function.hpp"
@@ -105,5 +103,3 @@ void runI2CErrorCallback(I2C_HandleTypeDef &hi2c) noexcept {
 }
 
 } // namespace halex
-
-#endif // CONFIG_DISABLE_MODULE_I2C