diff options
| -rw-r--r-- | CAN-binder/etc/macros.cmake | 10 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/binding/configuration-generated.cpp | 1 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/can/can-signals.cpp | 2 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/can/can-signals.hpp | 3 |
4 files changed, 7 insertions, 9 deletions
diff --git a/CAN-binder/etc/macros.cmake b/CAN-binder/etc/macros.cmake index ef6d5da..7646c4a 100644 --- a/CAN-binder/etc/macros.cmake +++ b/CAN-binder/etc/macros.cmake @@ -28,7 +28,7 @@ # Generic useful macro # ----------------------- macro(PROJECT_TARGET_ADD TARGET_NAME) - set_property( GLOBAL APPEND PROPERTY PROJECT_TARGETS ${TARGET_NAME}) + set_property( GLOBAL APPEND PROPERTY PROJECT_TARGETS ${TARGET_NAME}) set(TARGET_NAME ${TARGET_NAME}) endmacro(PROJECT_TARGET_ADD) @@ -72,7 +72,7 @@ macro(project_targets_populate) COMMAND cp ${BD}/${P}${OUT}.so ${WIDGET_LIBDIR} ) add_custom_target(${POPULE_WIDGET_TARGET} DEPENDS ${WIDGET_LIBDIR}/${P}${TARGET}.so) - add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET}) + add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET}) elseif(${T} STREQUAL "EXECUTABLE") add_custom_command(OUTPUT ${WIDGET_BINDIR}/${P}${TARGET} DEPENDS ${TARGET} @@ -80,21 +80,21 @@ macro(project_targets_populate) COMMAND cp ${BD}/${P}${OUT} ${WIDGET_BINDIR} ) add_custom_target(${POPULE_WIDGET_TARGET} DEPENDS ${WIDGET_BINDIR}/${P}${TARGET}) - add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET}) + add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET}) elseif(${T} STREQUAL "HTDOCS") add_custom_command(OUTPUT ${WIDGET_HTTPDIR} DEPENDS ${TARGET} COMMAND cp -r ${BD}/${P}${OUT} ${WIDGET_HTTPDIR} ) add_custom_target(${POPULE_WIDGET_TARGET} DEPENDS ${WIDGET_HTTPDIR}) - add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET}) + add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET}) elseif(${T} STREQUAL "DATA") add_custom_command(OUTPUT ${WIDGET_DATADIR} DEPENDS ${TARGET} COMMAND cp -r ${BD}/${P}${OUT} ${WIDGET_DATADIR} ) add_custom_target(${POPULE_WIDGET_TARGET} DEPENDS ${WIDGET_HTTPDIR}) - add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET}) + add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET}) endif(${T} STREQUAL "BINDING") # elseif(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]") # MESSAGE(WARNING "This target, ${TARGET}, will be not be included in the package.") diff --git a/CAN-binder/low-can-binding/binding/configuration-generated.cpp b/CAN-binder/low-can-binding/binding/configuration-generated.cpp index 42b9132..24f89ec 100644 --- a/CAN-binder/low-can-binding/binding/configuration-generated.cpp +++ b/CAN-binder/low-can-binding/binding/configuration-generated.cpp @@ -454,7 +454,6 @@ configuration_t::configuration_t() nullptr, true })} - } // end diagnostic_messages_ vector } // end can_message_set entry } // end can_message_set vector diff --git a/CAN-binder/low-can-binding/can/can-signals.cpp b/CAN-binder/low-can-binding/can/can-signals.cpp index d196c07..bc33e06 100644 --- a/CAN-binder/low-can-binding/can/can-signals.cpp +++ b/CAN-binder/low-can-binding/can/can-signals.cpp @@ -215,7 +215,7 @@ void can_signal_t::set_last_value(float val) last_value_ = val; } -/// @brief Create a RX_SETUP receive job using the BCM socket. +/// @brief Create a RX_SETUP receive job used by the BCM socket. /// /// @return 0 if ok else -1 int can_signal_t::create_rx_filter() diff --git a/CAN-binder/low-can-binding/can/can-signals.hpp b/CAN-binder/low-can-binding/can/can-signals.hpp index addca1d..f30d6b3 100644 --- a/CAN-binder/low-can-binding/can/can-signals.hpp +++ b/CAN-binder/low-can-binding/can/can-signals.hpp @@ -110,7 +110,6 @@ private: * this value is undefined. */ public: - //can_signal_t(const can_signal_t& b); can_signal_t( std::string generic_name, uint8_t bit_position, @@ -157,4 +156,4 @@ public: void set_last_value(float val); int create_rx_filter(); -};
\ No newline at end of file +}; |