Merge pull request #19 from Serial-IO/upgrade/cpp-core-v2-linux

Implement serial communication functions and refactor existing code

Author: Katze719

.github/workflows/build_binary.yml

@@ -27,7 +27,7 @@ jobs:
       - name: 'Setup GCC'
         uses: egor-tensin/setup-gcc@v2
         with:
-          version: '14'
+          version: '16'
           platform: 'x64'
 
       - name: 'Setup CMake'
@@ -36,11 +36,10 @@ jobs:
           cmake-version: '3.31.x'
 
       - name: 'Configure CMake'
-        env:
-          CXX: g++
-
         run: |
-          cmake --preset linux-gcc-release
+          cmake --preset linux-gcc-release \
+            -DCMAKE_C_COMPILER=gcc-16 \
+            -DCMAKE_CXX_COMPILER=g++-16
 
       - name: 'Build'
         run: |
@@ -91,7 +90,7 @@ jobs:
     needs: ['build-binary']
     uses: './.github/workflows/test_unit_cpp.yml'
     with:
-      artifact-name: cpp_bindings_linux_tests
+      artifact-name: libcpp_bindings_linux
 
     permissions:
       contents: read

.github/workflows/code_coverage_cpp.yml

@@ -14,23 +14,32 @@ jobs:
       matrix:
         deno: ["2.6.0", "2.5.0"]
 
-    container:
-      image: denoland/deno:${{ matrix.deno }}
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Setup Deno
+        uses: denoland/setup-deno@v2
+        with:
+          deno-version: v${{ matrix.deno }}
+
+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v2
+        with:
+          version: '16'
+          platform: 'x64'
+
       - name: Install build dependencies
         run: |
-          apt-get update
-          apt-get install -y cmake ninja-build g++ socat git
+          sudo apt-get update
+          sudo apt-get install -y cmake ninja-build socat git
 
       - name: Configure CMake
-        env:
-          CXX: g++
         run: |
-          cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
+          cmake -S . -B build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_C_COMPILER=gcc-16 \
+            -DCMAKE_CXX_COMPILER=g++-16
 
       - name: Build
         run: |
@@ -49,5 +58,3 @@ jobs:
           SERIAL_TEST_PORT: /tmp/ttyCI_A
         run: |
           deno task test
-
-

.github/workflows/deno_tests.yml .github/workflows/test_deno.yml.github/workflows/deno_tests.yml renamed to .github/workflows/test_deno.yml

@@ -26,13 +26,13 @@ jobs:
       - name: 'Download artifact'
         uses: actions/download-artifact@v4
         with:
-          name: ${{ github.event.inputs.artifact-name }}
+          name: ${{ inputs.artifact-name }}
           path: 'artifacts'
 
       - name: 'Setup GCC'
         uses: egor-tensin/setup-gcc@v2
         with:
-          version: '14'
+          version: '16'
           platform: 'x64'
 
       - name: 'Setup CMake'
@@ -42,7 +42,9 @@ jobs:
 
       - name: 'Configure CMake'
         run: |
-          cmake --preset linux-gcc-release
+          cmake --preset linux-gcc-release \
+            -DCMAKE_C_COMPILER=gcc-16 \
+            -DCMAKE_CXX_COMPILER=g++-16
       
       - name: 'Build'
         id: 'build'
@@ -92,5 +94,3 @@ jobs:
           transformers: '[{"searchValue": "${{ github.workspace }}", "replaceValue": ""}]'
           check_title_template: '{{FILE_NAME}} | {{TEST_NAME}}'
 
-
-

.github/workflows/test_unit_cpp.yml

@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 3.30)
 
-# Export compile commands to root directory
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 include(cmake/CPM.cmake)
@@ -11,9 +10,7 @@ CPMAddPackage(
     GIT_TAG v1.1.0
 )
 
-# Include cmake-git-versioning module
 include(${cmake_git_versioning_SOURCE_DIR}/cmake/cmake-git-versioning.cmake)
-
 get_git_version_info()
 
 project(
@@ -23,29 +20,27 @@ project(
     LANGUAGES CXX
 )
 
+include(CTest)
+
 file(WRITE "${CMAKE_BINARY_DIR}/env.sh" "PACKAGE_VERSION=${GIT_DESCRIBE_NO_V}")
+generate_git_version(
+    OUTPUT_DIR ${CMAKE_BINARY_DIR}/generated
+    OUTPUT_FILE version.hpp
+)
 
-# Set C++ standard
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 26)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-
-# Enable C++23 module support
-set(CMAKE_CXX_MODULE_STD 23)
+set(CMAKE_CXX_MODULE_STD 26)
 set(CMAKE_CXX_MODULE_EXTENSIONS OFF)
 
 CPMAddPackage(
     NAME cpp_core
     GITHUB_REPOSITORY Serial-IO/cpp-core
-    GIT_TAG main
+    GIT_TAG v2.0.0
     OPTIONS
     "CMAKE_EXPORT_COMPILE_COMMANDS OFF"
-)
-
-# Generate version information
-generate_git_version(
-    OUTPUT_DIR ${CMAKE_BINARY_DIR}/generated
-    OUTPUT_FILE version.hpp
+    "CPP_CORE_ENABLE_AST_EXPORT ON"
 )
 
 CPMAddPackage(
@@ -57,7 +52,6 @@ CPMAddPackage(
     "gtest_force_shared_crt ON"
 )
 
-# Library sources: src/*.cpp only, exclude *.test.cpp and test_helpers/
 file(GLOB_RECURSE LIB_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 list(FILTER LIB_SOURCES EXCLUDE REGEX ".*\\.test\\.cpp$")
 list(FILTER LIB_SOURCES EXCLUDE REGEX ".*/test_helpers/.*")
@@ -86,9 +80,8 @@ target_link_libraries(
     cpp_core::cpp_core
 )
 
-target_compile_features(cpp_bindings_linux PUBLIC cxx_std_23)
+target_compile_features(cpp_bindings_linux PUBLIC cxx_std_26)
 
-# Test sources: src/*.test.cpp, tests/*.test.cpp, src/test_helpers/*.cpp (helpers excluded from lib)
 file(GLOB SRC_UNIT_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.test.cpp")
 file(GLOB TESTS_INTEGRATION "${CMAKE_CURRENT_SOURCE_DIR}/tests/*.test.cpp")
 file(GLOB TEST_HELPER_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/test_helpers/*.cpp")
@@ -114,7 +107,10 @@ if(TEST_SOURCES)
         GTest::gmock
     )
 
-    target_compile_features(cpp_bindings_linux_tests PRIVATE cxx_std_23)
+    target_compile_features(cpp_bindings_linux_tests PRIVATE cxx_std_26)
+
+    include(GoogleTest)
+    gtest_discover_tests(cpp_bindings_linux_tests)
 endif()
 
 include(GNUInstallDirs)
@@ -133,7 +129,6 @@ install(
     FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
 )
 
-# Copy generated version header
 install(
     FILES ${CMAKE_BINARY_DIR}/generated/version.hpp
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

CMakeLists.txt

@@ -19,12 +19,15 @@ BINARY_FILE_NAME=$(basename "$BINARY_FILE_PATH")
 
 mkdir -p "$(dirname "$JSON_FILE_PATH")"
 
-BASE64_DATA=$(base64 "$BINARY_FILE_PATH" | tr -d '\n')
+BASE64_TMP=$(mktemp)
+trap 'rm -f "$BASE64_TMP"' EXIT
+
+base64 "$BINARY_FILE_PATH" | tr -d '\n' > "$BASE64_TMP"
 
 jq -n \
   --arg target "$TARGET" \
   --arg filename "$BINARY_FILE_NAME" \
-  --arg data "$BASE64_DATA" \
+  --rawfile data "$BASE64_TMP" \
   '{
     target: $target,
     filename: $filename,

jsr/scripts/binary_to_json.sh

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "ensure_handle_state.hpp"
+#include "validate_file_descriptor.hpp"
+
+namespace cpp_bindings_linux::detail
+{
+template <typename ReturnType>
+inline auto acquireHandleContext(int64_t handle, ErrorCallbackT error_callback, HandleContext *out_handle_context)
+    -> ReturnType
+{
+    int file_descriptor = -1;
+    const auto validation_status = validatePosixFileDescriptor<ReturnType>(handle, error_callback, &file_descriptor);
+    if (validation_status < 0)
+    {
+        return validation_status;
+    }
+
+    out_handle_context->file_descriptor = file_descriptor;
+    out_handle_context->state = ensureHandleState(file_descriptor);
+    return static_cast<ReturnType>(StatusCode::kSuccess);
+}
+} // namespace cpp_bindings_linux::detail

src/detail/acquire_handle_context.hpp

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "termios2.hpp"
+
+#include <termios.h>
+
+namespace cpp_bindings_linux::detail
+{
+inline auto applyBaudrate(termios2 *serial_settings, int baudrate) -> void
+{
+    serial_settings->c_cflag &= ~CBAUD;
+    serial_settings->c_cflag |= BOTHER;
+    serial_settings->c_ispeed = static_cast<speed_t>(baudrate);
+    serial_settings->c_ospeed = static_cast<speed_t>(baudrate);
+}
+} // namespace cpp_bindings_linux::detail

src/detail/apply_baudrate.hpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include "termios2.hpp"
+
+#include <termios.h>
+
+namespace cpp_bindings_linux::detail
+{
+inline auto applyDataBits(termios2 *serial_settings, int data_bits) -> void
+{
+    serial_settings->c_cflag &= ~CSIZE;
+    switch (data_bits)
+    {
+    case 5:
+        serial_settings->c_cflag |= CS5;
+        break;
+    case 6:
+        serial_settings->c_cflag |= CS6;
+        break;
+    case 7:
+        serial_settings->c_cflag |= CS7;
+        break;
+    case 8:
+    default:
+        serial_settings->c_cflag |= CS8;
+        break;
+    }
+}
+} // namespace cpp_bindings_linux::detail