From 7b8792d3d538e9fbb369b7315cdc3b250e1abfda Mon Sep 17 00:00:00 2001 From: PonomarevDA Date: Sat, 17 May 2025 23:39:50 +0300 Subject: [PATCH 1/2] clean up --- CMakeLists.txt | 4 ++-- examples/ubuntu/main.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 546f176..7d5d9b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,13 @@ set(DRONECAN_LIB_DIR ${CMAKE_CURRENT_LIST_DIR}) set(SUPPORTED_PLATFORMS "bxcan;fdcan;socketcan") if(NOT CAN_PLATFORM IN_LIST SUPPORTED_PLATFORMS) - message(SEND_ERROR "CAN_PLATFORM is not specified or unsupported! Options: bxcan, fdcan, socketcan.") + message(SEND_ERROR "CAN_PLATFORM is not specified or unsupported! Options: bxcan, fdcan, socketcan.") endif() include(${CMAKE_CURRENT_LIST_DIR}/platform_specific/${CAN_PLATFORM}/config.cmake) if(NOT DEFINED LIBPARAMS_PATH) - message(SEND_ERROR "LIBPARAMS_PATH is not specified!") + message(SEND_ERROR "LIBPARAMS_PATH is not specified!") endif() include(${LIBPARAMS_PATH}/CMakeLists.txt) diff --git a/examples/ubuntu/main.cpp b/examples/ubuntu/main.cpp index bde9afb..99124db 100644 --- a/examples/ubuntu/main.cpp +++ b/examples/ubuntu/main.cpp @@ -11,7 +11,6 @@ #include #include "storage.h" #include "dronecan.h" -#include "storage.h" #include "subscriber.hpp" #include "publisher.hpp" From 7796d1b0dc9c3f674d995c2491723bc7223dab0a Mon Sep 17 00:00:00 2001 From: PonomarevDA Date: Sat, 17 May 2025 23:40:07 +0300 Subject: [PATCH 2/2] add ice status and fuel tank publishers --- include/serialization/publisher.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/serialization/publisher.hpp b/include/serialization/publisher.hpp index a24f033..d69d104 100644 --- a/include/serialization/publisher.hpp +++ b/include/serialization/publisher.hpp @@ -23,6 +23,8 @@ #include "uavcan/equipment/esc/Status.h" #include "uavcan/equipment/gnss/Fix2.h" #include "uavcan/equipment/hardpoint/Status.h" +#include "uavcan/equipment/ice/FuelTankStatus.h" +#include "uavcan/equipment/ice/Status.h" #include "uavcan/equipment/power/CircuitStatus.h" #include "uavcan/equipment/power/BatteryInfo.h" #include "uavcan/equipment/device/Temperature.h" @@ -53,6 +55,8 @@ DEFINE_PUBLISHER_TRAITS(TrueAirspeed, dronecan_equipment_air_data_true_air DEFINE_PUBLISHER_TRAITS(EscStatus_t, dronecan_equipment_esc_status_publish) DEFINE_PUBLISHER_TRAITS(GnssFix2, dronecan_equipment_gnss_fix2_publish) DEFINE_PUBLISHER_TRAITS(HardpointStatus, dronecan_equipment_hardpoint_status_publish) +DEFINE_PUBLISHER_TRAITS(FuelTankStatus_t, dronecan_equipment_ice_fuel_tank_status_publish) +DEFINE_PUBLISHER_TRAITS(IceReciprocatingStatus, dronecan_equipment_ice_status_publish) DEFINE_PUBLISHER_TRAITS(CircuitStatus_t, dronecan_equipment_circuit_status_publish) DEFINE_PUBLISHER_TRAITS(Temperature_t, dronecan_equipment_temperature_publish) DEFINE_PUBLISHER_TRAITS(BatteryInfo_t, dronecan_equipment_battery_info_publish)