build: update to CMakeModules 0.8.0

ZIMO-Elektronik · Apr 17, 2024 · 5e63dc0 · 5e63dc0
1 parent 19c57e2
commit 5e63dc0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 FetchContent_Declare(
   CMakeModules
   GIT_REPOSITORY https://github.com/ZIMO-Elektronik/CMakeModules
-  GIT_TAG v0.7.0
+  GIT_TAG v0.8.0
   SOURCE_DIR ${CMAKE_BINARY_DIR}/CMakeModules)
 FetchContent_MakeAvailable(CMakeModules)
 
@@ -57,7 +57,7 @@ target_compile_definitions(
             DCC_TX_MIN_PREAMBLE_BITS=${DCC_TX_MIN_PREAMBLE_BITS}
             DCC_TX_DEQUE_SIZE=${DCC_TX_DEQUE_SIZE})
 
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+if(PROJECT_IS_TOP_LEVEL)
   target_include_directories(DCC INTERFACE include)
   target_compile_options(DCC
                          INTERFACE -Werror;-Wno-error=deprecated-declarations)

diff --git a/examples/repl/CMakeLists.txt b/examples/repl/CMakeLists.txt
@@ -3,6 +3,6 @@ add_executable(DCCReplExample ${SRC})
 
 target_common_warnings(DCCReplExample PRIVATE)
 
-cpmaddpackage(gh:daniele77/cli@2.1.0)
+cpmaddpackage("gh:daniele77/cli@2.1.0")
 
 target_link_libraries(DCCReplExample PRIVATE cli::cli DCC::DCC)
diff --git a/include/dcc/rx/crtp_base.hpp b/include/dcc/rx/crtp_base.hpp
@@ -454,7 +454,7 @@ struct CrtpBase : bidi::CrtpBase<T> {
     if (!(bytes[0uz] & 0b0000'1111u)) speed = 0;
     // Emergency stop
     else if (!(bytes[0uz] & 0b0000'1110u)) return impl().emergencyStop(addr);
-    else speed = (bytes[0uz] & 0b0000'1111) - 1;
+    else speed = static_cast<int32_t>(bytes[0uz] & 0b0000'1111u) - 1;
 
     // 14 speed steps and F0
     if (_f0_exception) {
@@ -464,7 +464,7 @@ struct CrtpBase : bidi::CrtpBase<T> {
                                                        : 0u};
       impl().function(addr, mask, state);
     }
-    // 28 speed steps
+    // 28 speed steps with intermediate
     else {
       speed <<= 1u;
       if (speed && !(bytes[0uz] & ztl::make_mask(4u))) --speed;