fix format, remove constexpr, and add coverage

Author: rayandrew

CMakeLists.txt

@@ -115,16 +115,12 @@ target_compile_options(modbuscpp PUBLIC "$<$<BOOL:${MSVC}>:/permissive->")
 target_link_libraries(modbuscpp PRIVATE Threads::Threads ${Boost_LIBRARIES} fmt struc asio2)
 
 target_include_directories(
-  modbuscpp
-  PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-         $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+  modbuscpp PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+                   $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
 )
 
-if (Boost_FOUND)
-target_include_directories(
-  modbuscpp
-  PUBLIC $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
-)
+if(Boost_FOUND)
+  target_include_directories(modbuscpp PUBLIC $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>)
 endif()
 
 # ---- Create an installable target ----

cmake/Asio2.cmake

@@ -10,13 +10,13 @@ CPMAddPackage(
   NAME asio2
   GITHUB_REPOSITORY zhllxt/asio2
   VERSION 1
-  GIT_TAG ce6ac7f6ba2a931a19b9abb7627d12cfaeed8ab1)
+  GIT_TAG ce6ac7f6ba2a931a19b9abb7627d12cfaeed8ab1
+)
 
 if(asio2_ADDED)
   add_library(asio2 INTERFACE)
 
-  target_include_directories(asio2
-    INTERFACE
-      $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
-      $<BUILD_INTERFACE:${asio2_SOURCE_DIR}>)
+  target_include_directories(
+    asio2 INTERFACE $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}> $<BUILD_INTERFACE:${asio2_SOURCE_DIR}>
+  )
 endif()

cmake/Boost.cmake

@@ -5,10 +5,9 @@ endif()
 
 option(BOOST_STATIC "Boost static library" OFF)
 
-set(Boost_USE_STATIC_LIBS        ${BOOST_STATIC})  # only find static libs
-set(Boost_USE_DEBUG_LIBS         OFF)  # ignore debug libs and
-set(Boost_USE_RELEASE_LIBS       ON)   # only find release libs
-set(Boost_USE_MULTITHREADED      ON)
-set(Boost_USE_STATIC_RUNTIME     OFF)
-find_package(Boost 1.70.0 REQUIRED COMPONENTS
-  system)
+set(Boost_USE_STATIC_LIBS ${BOOST_STATIC}) # only find static libs
+set(Boost_USE_DEBUG_LIBS OFF) # ignore debug libs and
+set(Boost_USE_RELEASE_LIBS ON) # only find release libs
+set(Boost_USE_MULTITHREADED ON)
+set(Boost_USE_STATIC_RUNTIME OFF)
+find_package(Boost 1.70.0 REQUIRED COMPONENTS system)

codecov.yaml

@@ -1,5 +1,8 @@
 ignore:
   - "test"
+  - "**/_deps/**"
+  - "**/usr/**"
+  - "*.yaml"
 
 comment:
-  require_changes: true
+  require_changes: true

include/modbuscpp/details/adu.hpp

@@ -37,7 +37,7 @@ namespace internal {
  * --- Rest of data... (N byte)
  */
 class adu {
- public:
+public:
   /**
    * Initializer
    */
@@ -114,7 +114,7 @@ class adu {
   explicit adu(constants::function_code function,
                const header_t&          m_header) noexcept;
 
- public:
+public:
   /**
    * Encode packet
    *
@@ -136,7 +136,7 @@ class adu {
    */
   virtual void decode(const packet_t& packet) = 0;
 
- public:
+public:
   /** Getter */
   /**
    * Get function code
@@ -279,7 +279,7 @@ class adu {
     return obj.dump(os);
   }
 
- protected:
+protected:
   /**
    * Decode packet header
    *
@@ -309,13 +309,13 @@ class adu {
     return header_length + 1 + data_length;
   }
 
- public:
+public:
   /**
    * Header length
    */
   static constexpr typename packet_t::size_type header_length = 7;
 
- protected:
+protected:
   /**
    * Protocol ID
    */
@@ -328,19 +328,19 @@ class adu {
   /**
    * Max length
    */
-  static constexpr typename packet_t::size_type max_length =
-      constants::max_adu_length;
+  static constexpr typename packet_t::size_type max_length
+      = constants::max_adu_length;
   /**
    * Max PDU length
    */
-  static constexpr typename packet_t::size_type max_pdu_size =
-      max_length - header_length;
+  static constexpr typename packet_t::size_type max_pdu_size
+      = max_length - header_length;
   /**
    * Header struct with function format
    */
   static constexpr std::string_view header_func_format = "HHHBB";
 
- protected:
+protected:
   /**
    * Function
    */

include/modbuscpp/details/asio2.hpp

@@ -7,4 +7,4 @@
 #include <asio2/base/timer.hpp>
 #include <asio2/tcp/tcp_server.hpp>
 
-#endif // LIB_MODBUS_ASIO2_HPP_
+#endif  // LIB_MODBUS_ASIO2_HPP_

include/modbuscpp/details/bit-read.hpp

@@ -35,18 +35,18 @@ namespace request {
  * [ Starting Address (2 bytes) ]
  * [ Quantity of bits (2 bytes) ]
  */
-template <constants::function_code function_code>
-class base_read_bits : public internal::request {
- public:
+template <constants::function_code function_code> class base_read_bits
+    : public internal::request {
+public:
   /**
    * request::base_read_bits constructor
    *
    * @param address address requested
    * @param count   count   requested
    */
-  explicit base_read_bits(
-      const address_t&       address = address_t{},
-      const read_num_bits_t& count = read_num_bits_t{}) noexcept;
+  explicit base_read_bits(const address_t&       address = address_t{},
+                          const read_num_bits_t& count
+                          = read_num_bits_t{}) noexcept;
 
   /**
    * Encode read bits packet from given data
@@ -109,7 +109,7 @@ class base_read_bits : public internal::request {
    */
   virtual std::ostream& dump(std::ostream& os) const override;
 
- private:
+private:
   /**
    * Data length (4 bytes)
    */
@@ -129,8 +129,8 @@ class base_read_bits : public internal::request {
 };
 
 using read_coils = base_read_bits<constants::function_code::read_coils>;
-using read_discrete_inputs =
-    base_read_bits<constants::function_code::read_discrete_inputs>;
+using read_discrete_inputs
+    = base_read_bits<constants::function_code::read_discrete_inputs>;
 }  // namespace request
 
 namespace response {
@@ -148,9 +148,9 @@ namespace response {
  * [ Byte count = N (1 byte)     ]
  * [ Bits (n = N or N + 1 bytes) ]
  */
-template <constants::function_code function_code>
-class base_read_bits : public internal::response {
- public:
+template <constants::function_code function_code> class base_read_bits
+    : public internal::response {
+public:
   /**
    * Create std::unique_ptr of response::read_bits
    *
@@ -202,7 +202,7 @@ class base_read_bits : public internal::response {
    */
   inline const block::bits::container_type& bits() const { return bits_; }
 
- private:
+private:
   /**
    * Request pointer
    */
@@ -222,9 +222,9 @@ class base_read_bits : public internal::response {
 };
 
 using read_coils = base_read_bits<constants::function_code::read_coils>;
-using read_discrete_inputs =
-    base_read_bits<constants::function_code::read_discrete_inputs>;
+using read_discrete_inputs
+    = base_read_bits<constants::function_code::read_discrete_inputs>;
 }  // namespace response
-}
+}  // namespace modbus
 
 #endif  // LIB_MODBUS_MODBUS_BIT_READ_HPP_

include/modbuscpp/details/bit-read.inline.hpp

@@ -83,15 +83,15 @@ void base_read_bits<function_code>::decode_passed(const packet_t& packet) {
       throw ex::bad_data();
     }
 
-    packet_t::size_type         byte_idx = header_length + 1;
+    packet_t::size_type byte_idx = header_length + 1;
     count_ = static_cast<std::uint16_t>(packet[byte_idx]);
 
     if (count_ != request_->count().get()) {
       throw ex::bad_data();
     }
 
-    block::bits::container_type buffer =
-        op::unpack_bits(packet.begin() + byte_idx + 1, packet.end());
+    block::bits::container_type buffer
+        = op::unpack_bits(packet.begin() + byte_idx + 1, packet.end());
 
     if (buffer.size() != request_->count().get()) {
       throw ex::bad_data();

include/modbuscpp/details/bit-write.hpp

@@ -47,7 +47,7 @@ namespace request {
  * [ Output Value (2 bytes)   ]
  */
 class write_single_coil : public internal::request {
- public:
+public:
   /**
    * request::write_single_coil constructor
    *
@@ -98,7 +98,7 @@ class write_single_coil : public internal::request {
    */
   virtual std::ostream& dump(std::ostream& os) const override;
 
- public:
+public:
   /**
    * Get address
    *
@@ -113,7 +113,7 @@ class write_single_coil : public internal::request {
    */
   inline value::bits value() const { return value_; }
 
- private:
+private:
   /**
    * Data length (4 bytes)
    */
@@ -149,7 +149,7 @@ class write_single_coil : public internal::request {
  * [ Output value (N x 1 bytes)    ]
  */
 class write_multiple_coils : public internal::request {
- public:
+public:
   /**
    * request::write_multiple_coils constructor
    *
@@ -210,7 +210,7 @@ class write_multiple_coils : public internal::request {
    */
   virtual std::ostream& dump(std::ostream& os) const override;
 
- public:
+public:
   /**
    * Get address
    *
@@ -232,7 +232,7 @@ class write_multiple_coils : public internal::request {
    */
   inline const block::bits::container_type& values() const { return values_; }
 
- private:
+private:
   /**
    * Get data length
    *
@@ -242,7 +242,7 @@ class write_multiple_coils : public internal::request {
    */
   inline std::uint16_t data_length() const { return 4 + 1 + byte_count_; }
 
- private:
+private:
   /**
    * Address
    */
@@ -280,7 +280,7 @@ namespace response {
  * [ Output Value (2 bytes)   ]
  */
 class write_single_coil : public internal::response {
- public:
+public:
   /**
    * Create std::unique_ptr of response::write_single_coil
    *
@@ -320,7 +320,7 @@ class write_single_coil : public internal::response {
    */
   virtual std::ostream& dump(std::ostream& os) const override;
 
- private:
+private:
   /**
    * Request pointer
    */
@@ -352,7 +352,7 @@ class write_single_coil : public internal::response {
  * [ Quantity of Outputs (2 bytes) ]
  */
 class write_multiple_coils : public internal::response {
- public:
+public:
   /**
    * Create std::unique_ptr of response::write_multiple_coils
    *
@@ -406,7 +406,7 @@ class write_multiple_coils : public internal::response {
    */
   inline const write_num_bits_t& count() const { return count_; }
 
- private:
+private:
   /**
    * Request pointer
    */
@@ -428,8 +428,7 @@ class write_multiple_coils : public internal::response {
    */
   static constexpr std::string_view format = "HH";
 };
-}
-}  // namespace request
-
-#endif // LIB_MODBUS_MODBUS_BIT_WRITE_HPP_
+}  // namespace response
+}  // namespace modbus
 
+#endif  // LIB_MODBUS_MODBUS_BIT_WRITE_HPP_