diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6220283..4096bf7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh sudo ./llvm.sh $LLVM_VERSION - sudo apt-get update -y && sudo apt-get upgrade -y + sudo apt-get update -y sudo apt-get -y install gcc-multilib g++-multilib clang-tidy-$LLVM_VERSION clang-format-$LLVM_VERSION cppcheck sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-$LLVM_VERSION 50 sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-$LLVM_VERSION 50 @@ -70,7 +70,7 @@ jobs: with: submodules: true - run: | - sudo apt-get update -y && sudo apt-get upgrade -y + sudo apt-get update -y sudo apt-get install gcc-multilib g++-multilib - run: > cmake @@ -100,7 +100,7 @@ jobs: with: submodules: true - run: | - sudo apt-get update -y && sudo apt-get upgrade -y + sudo apt-get update -y sudo apt-get install -y gcc-multilib g++-multilib lcov pip install --break-system-packages gcovr - run: > @@ -153,7 +153,7 @@ jobs: with: submodules: true - run: | - sudo apt-get update -y && sudo apt-get upgrade -y + sudo apt-get update -y sudo apt-get install -y gcc-arm-none-eabi - run: arm-none-eabi-gcc libcanard/*.c -isystem lib/cavl2 -c -std=c99 ${{ env.flags }} - run: arm-none-eabi-gcc libcanard/*.c -isystem lib/cavl2 -c -std=c11 ${{ env.flags }} diff --git a/README.md b/README.md index 152668f..83a5a0a 100644 --- a/README.md +++ b/README.md @@ -77,15 +77,11 @@ int main(void) const canard_vtable_t vtable = { .now = app_now, .tx = app_tx }; static const canard_subscription_vtable_t sub_vtable = { .on_message = app_on_message }; - // Set up the local node. The node-ID will be allocated automatically. + // Set up the local node. The node-ID will be allocated automatically; for manual see canard_set_node_id(). canard_t node; if (!canard_new(&node, &vtable, mem_set, /*iface_bitmap=*/1, /*txq_cap=*/100, UID_OR_TRUE_RANDOM_NUMBER, 0U)) { return -1; } - if (!canard_set_node_id(&node, 42U)) { - canard_destroy(&node); - return -1; - } // Subscribe for messages. canard_subscription_t sub; @@ -127,7 +123,7 @@ int main(void) To release a new version, simply publish a new release on GitHub. -### v5.0.alpha +### v5.0 v5 is a major rework based on the experience gained from extensive production use of the previous revisions. The main intended use case is with [**Cy**](https://github.com/OpenCyphal-Garage/cy) rather than standalone. diff --git a/esp_metadata/CMakeLists.txt b/esp_metadata/CMakeLists.txt index 1593ec9..8b3de94 100644 --- a/esp_metadata/CMakeLists.txt +++ b/esp_metadata/CMakeLists.txt @@ -10,9 +10,3 @@ idf_component_register(SRCS "canard.c" if(NOT CONFIG_CANARD_ASSERTIONS) target_compile_definitions(${COMPONENT_LIB} PRIVATE "CANARD_ASSERT=(void)") endif() - -if(CONFIG_CANARD_CRC_TABLE) - target_compile_definitions(${COMPONENT_LIB} PRIVATE CANARD_CRC_TABLE=1) -else() - target_compile_definitions(${COMPONENT_LIB} PRIVATE CANARD_CRC_TABLE=0) -endif() diff --git a/esp_metadata/Kconfig b/esp_metadata/Kconfig index 8e89e7f..9e6aade 100644 --- a/esp_metadata/Kconfig +++ b/esp_metadata/Kconfig @@ -13,12 +13,4 @@ config CANARD_ASSERTIONS help Set to 'n' to disable libcanard assertions. -config CANARD_CRC_TABLE - bool "Enable libcanard CRC table" - default y - help - Set to 'n' to use slow but ROM-efficient transfer-CRC computation algorithm. - Doing so is expected to save ca. 500 bytes of ROM and - increase the cost of RX/TX transfer processing by ~half. - endmenu diff --git a/esp_metadata/package_esp_component.sh b/esp_metadata/package_esp_component.sh index a04d87d..80ef77f 100644 --- a/esp_metadata/package_esp_component.sh +++ b/esp_metadata/package_esp_component.sh @@ -6,7 +6,6 @@ set -e mkdir -p package/libcanard/include -cp CONTRIBUTING.md package/libcanard/CONTRIBUTING.md cp LICENSE package/libcanard/LICENSE cp README.md package/libcanard/README.md