X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fbinding%2Flow-can-subscription.cpp;h=99f209beeacdde75159b90f4a895f3ad8acb59be;hb=HEAD;hp=54cd314c0b1c229ae66240e5a2f9e9a763950129;hpb=c88f115014d9e75e4d1cc0db9762f11ca8532afb;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp index 54cd314c..99f209be 100644 --- a/low-can-binding/binding/low-can-subscription.cpp +++ b/low-can-binding/binding/low-can-subscription.cpp @@ -20,9 +20,14 @@ #include "application.hpp" #include "canutil/write.h" #include "../utils/socketcan-bcm.hpp" +#include "../can/can-encoder.hpp" + +#ifdef USE_FEATURE_ISOTP +#include "../utils/socketcan-isotp.hpp" +#endif #ifdef USE_FEATURE_J1939 - #include "../utils/socketcan-j1939.hpp" +#include "../utils/socketcan-j1939/socketcan-j1939-data.hpp" #endif low_can_subscription_t::low_can_subscription_t() @@ -96,8 +101,10 @@ int low_can_subscription_t::set_event() */ int low_can_subscription_t::subscribe(afb_req_t request) { - if(set_event() < 0) - return -1; + if(! afb_event_is_valid(event_)) + if(set_event() < 0) + return -1; + return afb_req_subscribe(request, event_); } @@ -114,22 +121,45 @@ int low_can_subscription_t::unsubscribe(afb_req_t request) return afb_req_unsubscribe(request, event_); } +/** + * @brief Getter of index of subscription + * + * @return int Index + */ int low_can_subscription_t::get_index() const { return index_; } +/** + * @brief Getter of signal of subscription + * + * @return const std::shared_ptr A shared pointer of the signal + */ const std::shared_ptr low_can_subscription_t::get_signal() const { return signal_; } +/** + * @brief Check if the signal and event are the same that the subscription + * + * @param signal the signal compared + * @param event_filter the event_filter compared + * @return true if they are equal + * @return false if they are not equal + */ bool low_can_subscription_t::is_signal_subscription_corresponding(const std::shared_ptr signal, const struct event_filter_t& event_filter) const { return signal_ == signal && event_filter_ == event_filter; } -const std::vector > low_can_subscription_t::get_diagnostic_message() const +/** + * @brief Getter for diagnostic messages of subscription + * + * @return const vector_ptr_diag_msg_t Vector of pointer of diagnostic message + */ +const vect_ptr_diag_msg_t low_can_subscription_t::get_diagnostic_message() const { return diagnostic_message_; } @@ -142,12 +172,9 @@ const std::vector > low_can_subscription_t const std::shared_ptr low_can_subscription_t::get_diagnostic_message(uint32_t pid) const { for(const auto& diag: diagnostic_message_) - { if(diag->get_pid() == pid) - { return diag; - } - } + return nullptr; } @@ -157,12 +184,9 @@ const std::shared_ptr low_can_subscription_t::get_diagnost const std::shared_ptr low_can_subscription_t::get_diagnostic_message(const std::string& name) const { for(const auto& diag: diagnostic_message_) - { if(diag->get_name() == name) - { return diag; - } - } + return nullptr; } @@ -191,98 +215,250 @@ const std::string low_can_subscription_t::get_name(uint32_t pid) const return ""; } +/** + * @brief Getter of the frequency of the event_filter + * + * @return float The frequency + */ float low_can_subscription_t::get_frequency() const { return event_filter_.frequency; } +/** + * @brief Getter of the min of the event_filter + * + * @return float The min value filtered + */ float low_can_subscription_t::get_min() const { return event_filter_.min; } +/** + * @brief Getter of the max of the event_filter + * + * @return float The max value filtered + */ float low_can_subscription_t::get_max() const { return event_filter_.max; } +bool low_can_subscription_t::get_promisc() const +{ + return event_filter_.promisc; +} + +/** + * @brief Getter of the rx_id of the event_filter + * + * @return canid_t The rx_id value + */ +canid_t low_can_subscription_t::get_rx_id() const +{ + return event_filter_.rx_id; +} + +/** + * @brief Getter of the tx_id of the event_filter + * + * @return canid_t The tx_id value + */ +canid_t low_can_subscription_t::get_tx_id() const +{ + return event_filter_.tx_id; +} + +/** + * @brief Getter of the socket of the subscription + * + * @return std::shared_ptr Pointer of the socket object + */ std::shared_ptr low_can_subscription_t::get_socket() { return socket_; } +std::shared_ptr low_can_subscription_t::get_message_definition() +{ + return message_; +} + +/** + * @brief Setter for the frequency of the event_filter + * + * @param freq The new frequency + */ void low_can_subscription_t::set_frequency(float freq) { event_filter_.frequency = freq; } +/** + * @brief Setter for the min of the event_filter + * + * @param min The new min + */ void low_can_subscription_t::set_min(float min) { event_filter_.min = min; } +/** + * @brief Setter for the max of the event_filter + * + * @param max The new max + */ void low_can_subscription_t::set_max(float max) { event_filter_.max = max; } +void low_can_subscription_t::set_promisc(bool promisc) +{ + event_filter_.promisc = promisc; +} + +/** + * @brief Setter for the rx_id of the event_filter + * + * @param rx_id The new rx_id + */ +void low_can_subscription_t::set_rx_id(canid_t rx_id) +{ + event_filter_.rx_id = rx_id; +} + +/** + * @brief Setter for the tx_id of the event_filter + * + * @param tx_id The new tx_id + */ +void low_can_subscription_t::set_tx_id(canid_t tx_id) +{ + event_filter_.tx_id = tx_id; +} + +/** + * @brief Setter for the index of the subscription + * + * @param index The new index + */ +void low_can_subscription_t::set_index(int index) +{ + index_ = index; +} + +/** + * @brief Setter for the signal of the subscription + * + * @param signal The new signal + */ +void low_can_subscription_t::set_signal(std::shared_ptr signal) +{ + signal_ = signal; +} + +void low_can_subscription_t::set_message_definition(std::shared_ptr message) +{ + message_ = message; +} + /// @brief Based upon which object is a subscribed CAN signal or diagnostic message /// it will open the socket with the required CAN bus device name. /// /// @return INVALID_SOCKET on failure, else positive integer -int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, const std::string& bus_name) +int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, const std::string& bus_name, uint32_t flags) { - int ret = 0; + int ret = -1; if(! subscription.socket_) { + if(flags & CAN_PROTOCOL) + { + subscription.socket_ = std::make_shared(); + if( subscription.signal_ ) + ret = subscription.socket_->open(subscription.signal_->get_message()->get_bus_device_name()); + else if(! subscription.diagnostic_message_.empty()) + ret = subscription.socket_->open(application_t::instance().get_diagnostic_manager().get_bus_device_name()); + else if(! bus_name.empty()) + ret = subscription.socket_->open(bus_name); - #ifdef USE_FEATURE_J1939 - if((subscription.signal_ != nullptr || !bus_name.empty()) && subscription.signal_->get_message()->is_j1939()) + subscription.index_ = (int)subscription.socket_->socket(); + } +#ifdef USE_FEATURE_ISOTP + else if(flags & ISOTP_PROTOCOL) { - name_t name = J1939_NO_NAME; - pgn_t pgn = J1939_NO_PGN; - uint8_t addr = J1939_NO_ADDR; - pgn = subscription.signal_->get_message()->get_id(); - if( subscription.signal_ != nullptr) + std::shared_ptr socket = std::make_shared(); + if(subscription.signal_ ) { - std::shared_ptr socket = std::make_shared(); - ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(), name, pgn, addr); + canid_t rx = NO_CAN_ID; + canid_t tx = NO_CAN_ID; + if(flags & ISOTP_SEND) + { + rx = subscription.get_rx_id(); + tx = subscription.signal_->get_message()->get_id(); + } + else if(flags & ISOTP_RECEIVE) + { + rx = subscription.signal_->get_message()->get_id(); + tx = subscription.get_tx_id(); + } + ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(), rx, tx); subscription.socket_ = socket; - } - else if ( !bus_name.empty()) - { - std::shared_ptr socket = std::make_shared(); - ret = socket->open(bus_name, name, pgn, addr); + } + else if(! bus_name.empty()) + { + ret = socket->open(bus_name, subscription.get_rx_id(), subscription.get_tx_id()); subscription.socket_ = socket; - } - subscription.index_ = (int)subscription.socket_->socket(); + } + subscription.index_ = (int)subscription.socket_->socket(); } - else +#endif +#ifdef USE_FEATURE_J1939 + else if(flags & J1939_ADDR_CLAIM_PROTOCOL) { - #endif - if( subscription.signal_ != nullptr) - { - subscription.socket_ = std::make_shared(); - ret = subscription.socket_->open(subscription.signal_->get_message()->get_bus_device_name()); - } - else if (! subscription.diagnostic_message_ .empty()) + pgn_t pgn = J1939_NO_PGN; + std::shared_ptr socket = std::make_shared(); + if(!bus_name.empty()) + ret = socket->open(bus_name, pgn); + subscription.socket_ = socket; + subscription.index_ = (int)subscription.socket_->socket(); + } + else if(flags & J1939_PROTOCOL) + { + pgn_t pgn = J1939_NO_PGN; + std::shared_ptr socket = std::make_shared(); + if(subscription.signal_) { - subscription.socket_ = std::make_shared(); - ret = subscription.socket_->open(application_t::instance().get_diagnostic_manager().get_bus_device_name()); + pgn = subscription.signal_->get_message()->get_id(); + ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(), pgn); } - else if ( !bus_name.empty()) + else if(!bus_name.empty()) { - subscription.socket_ = std::make_shared(); - ret = subscription.socket_->open(bus_name); + ret = socket->open(bus_name, pgn); } + + if(ret) + socket->define_opt(!j1939_pgn_is_pdu1(pgn),subscription.event_filter_.promisc); + + subscription.socket_ = socket; subscription.index_ = (int)subscription.socket_->socket(); - #ifdef USE_FEATURE_J1939 } - #endif +#endif + else + { + AFB_ERROR("Socket format not supported"); + return INVALID_SOCKET; + } + } + else{ + ret = subscription.socket_->socket(); } return ret; } + /// @brief Builds a BCM message head but doesn't set can_frame. /// /// @returns a bcm_msg with the msg_head parts set and can_frame @@ -300,6 +476,7 @@ struct bcm_msg low_can_subscription_t::make_bcm_head(uint32_t opcode, uint32_t c bcm_msg.msg_head.ival2.tv_sec = frequency_thinning.tv_sec ; bcm_msg.msg_head.ival2.tv_usec = frequency_thinning.tv_usec; + return bcm_msg; } @@ -322,75 +499,173 @@ void low_can_subscription_t::add_one_bcm_frame(struct canfd_frame& cfd, struct b bcm_msg.msg_head.nframes++; } +/// @brief Take an existing bcm_msg struct and add a can_frame. +/// Currently only 1 uniq can_frame can be added, it's not possible to build +/// a multiplexed message with several can_frame. +void low_can_subscription_t::remove_last_bcm_frame(struct bcm_msg& bcm_msg) +{ + struct canfd_frame cf; + memset(&cf, 0, sizeof(cf)); + bcm_msg.fd_frames[bcm_msg.msg_head.nframes] = cf; + bcm_msg.msg_head.nframes--; +} + #ifdef USE_FEATURE_J1939 +/** + * @brief Create a j1939 socket to read message + * + * @param subscription The subscription + * @param sig The signal subscribed + * @return int 0 if ok else -1 + */ int low_can_subscription_t::create_rx_filter_j1939(low_can_subscription_t &subscription, std::shared_ptr sig) { subscription.signal_= sig; // Make sure that socket is opened. - if(open_socket(subscription) < 0) - { + if(open_socket(subscription, "", J1939_PROTOCOL) < 0) return -1; - } + return 0; } #endif +/** + * @brief Create an iso tp socket to read message + * + * @param subscription The subscription + * @param sig The signal subscribed + * @return int 0 if ok else -1 + */ +int low_can_subscription_t::create_rx_filter_isotp(low_can_subscription_t &subscription, std::shared_ptr sig) +{ + subscription.signal_= sig; + + // Make sure that socket is opened. + if(open_socket(subscription, "", ISOTP_PROTOCOL|ISOTP_RECEIVE) < 0) + return -1; + + return 0; +} + /// @brief Create a RX_SETUP receive job to be used by the BCM socket for a CAN signal /// subscription /// /// @return 0 if ok else -1 int low_can_subscription_t::create_rx_filter_can(low_can_subscription_t &subscription, std::shared_ptr sig) { - uint32_t flags; - float val; + uint32_t flags_bcm; struct timeval freq, timeout = {0, 0}; - struct canfd_frame cfd; subscription.signal_= sig; + bool is_fd = sig->get_message()->is_fd(); + uint32_t max_dlen = 0; + + uint32_t length_msg = sig->get_message()->get_length(); + std::vector data(length_msg); + can_message_t cm; - if (sig->get_message()->is_fd()) + if(! length_msg) { - flags = SETTIMER|RX_NO_AUTOTIMER|CAN_FD_FRAME; - cfd.len = CANFD_MAX_DLEN; + AFB_ERROR("Error in the length of message with id %d", sig->get_message()->get_id()); + return -1; + } + + encoder_t::encode_data(subscription.signal_, data, true, false, true); + + if (is_fd) + { + flags_bcm = SETTIMER|RX_NO_AUTOTIMER|CAN_FD_FRAME; + max_dlen = CANFD_MAX_DLEN; } else { - flags = SETTIMER|RX_NO_AUTOTIMER; - cfd.len = CAN_MAX_DLEN; + flags_bcm = SETTIMER|RX_NO_AUTOTIMER; + max_dlen = CAN_MAX_DLEN; } - val = (float)(1 << subscription.signal_->get_bit_size()) - 1; - if(! bitfield_encode_float(val, - subscription.signal_->get_bit_position(), - subscription.signal_->get_bit_size(), - 1, - subscription.signal_->get_offset(), - cfd.data, - cfd.len)) - return -1; + + cm = can_message_t( max_dlen, + sig->get_message()->get_id(), + length_msg, + false, + sig->get_message()->get_flags(), + data, + 0); frequency_clock_t f = subscription.event_filter_.frequency == 0 ? subscription.signal_->get_frequency() : frequency_clock_t(subscription.event_filter_.frequency); freq = f.get_timeval_from_period(); - struct bcm_msg bcm_msg = subscription.make_bcm_head(RX_SETUP, subscription.signal_->get_message()->get_id(), flags, timeout, freq); - subscription.add_one_bcm_frame(cfd, bcm_msg); + struct bcm_msg bcm_msg = subscription.make_bcm_head(RX_SETUP, subscription.signal_->get_message()->get_id(), flags_bcm, timeout, freq); - return create_rx_filter_bcm(subscription, bcm_msg); -} + std::vector cfd_vect = cm.convert_to_canfd_frame_vector(); -int low_can_subscription_t::create_rx_filter(std::shared_ptr sig) -{ - #ifdef USE_FEATURE_J1939 - if(sig->get_message()->is_j1939()) + if(cfd_vect.size() > 1) //multi { - return low_can_subscription_t::create_rx_filter_j1939(*this, sig); + AFB_ERROR("Not implemented yet"); + return -1; + } + else if(cfd_vect.size() == 1) + { + subscription.add_one_bcm_frame(cfd_vect[0], bcm_msg); } else { - #endif - return low_can_subscription_t::create_rx_filter_can(*this, sig); - #ifdef USE_FEATURE_J1939 + AFB_ERROR("No data available"); + return -1; } - #endif + + return create_rx_filter_bcm(subscription, bcm_msg); +} + + +int low_can_subscription_t::create_rx_filter(std::shared_ptr msg) +{ + std::shared_ptr signal_message = + std::make_shared(signal_t{msg->get_name(), + 0, + msg->get_length() * 8, + 1.00000f, + 0.00000f, + 0, + 0, + frequency_clock_t(0.00000f), + true, + false, + {}, + true, + nullptr, + nullptr, + false, + std::make_pair(false, 0), + static_cast(0), + -1, + ""}); + + signal_message->set_parent(msg); + return create_rx_filter(signal_message); +} + + +/** + * @brief Create the good socket to read message + * depending on the signal + * + * @param sig The signal subscribed + * @return 0 if ok else -1 + */ +int low_can_subscription_t::create_rx_filter(std::shared_ptr sig) +{ + if(!sig->get_message()->is_isotp() && !sig->get_message()->is_j1939()) + return low_can_subscription_t::create_rx_filter_can(*this, sig); +#ifdef USE_FEATURE_ISOTP + else if(sig->get_message()->is_isotp()) + return low_can_subscription_t::create_rx_filter_isotp(*this, sig); +#endif +#ifdef USE_FEATURE_J1939 + else if(sig->get_message()->is_j1939()) + return low_can_subscription_t::create_rx_filter_j1939(*this, sig); +#endif + AFB_ERROR("Signal can't be created (check config)"); + return -1; } @@ -403,10 +678,9 @@ int low_can_subscription_t::create_rx_filter(std::shared_ptr msg = std::make_shared(); - - msg->set_bcm_msg(bcm_msg); - if(bcm_msg.msg_head.can_id != OBD2_FUNCTIONAL_BROADCAST_ID) { subscription.socket_->write_message(msg); - if(! subscription.socket_) - return -1; + if(! subscription.socket_) + return -1; } else { for(uint8_t i = 0; i < 8; i++) { - bcm_msg.msg_head.can_id = OBD2_FUNCTIONAL_RESPONSE_START + i; - msg->set_bcm_msg(bcm_msg); + bcm_msg.msg_head.can_id = OBD2_FUNCTIONAL_RESPONSE_START + i; + msg.set_bcm_msg(bcm_msg); subscription.socket_->write_message(msg); if(! subscription.socket_) return -1; @@ -455,22 +727,99 @@ int low_can_subscription_t::create_rx_filter_bcm(low_can_subscription_t &subscri /// send a message /// /// @return 0 if ok else -1 -int low_can_subscription_t::tx_send(low_can_subscription_t &subscription, struct canfd_frame& cfd, const std::string& bus_name) +int low_can_subscription_t::tx_send(low_can_subscription_t &subscription, message_t *message, const std::string& bus_name) { - struct bcm_msg bcm_msg = subscription.make_bcm_head(TX_SEND, cfd.can_id); - subscription.add_one_bcm_frame(cfd, bcm_msg); + can_message_t *cm = static_cast(message); + + struct bcm_msg bcm_msg = subscription.make_bcm_head(TX_SEND, cm->get_id(), cm->get_flags()|TX_CP_CAN_ID); // TX_CP_CAN_ID -> copy in cfd the id of bcm + cm->set_bcm_msg(bcm_msg); - if(subscription.open_socket(subscription, bus_name) < 0) - {return -1;} + std::vector cfd_vect = cm->convert_to_canfd_frame_vector(); + if(subscription.open_socket(subscription, bus_name, CAN_PROTOCOL) < 0) + return -1; - std::shared_ptr msg = std::make_shared(); + struct bcm_msg &bcm_cm = cm->get_bcm_msg(); - msg->set_bcm_msg(bcm_msg); + if(cfd_vect.size() > 1) + { + AFB_ERROR("Multi frame BCM not implemented"); + return -1; + } + else if(cfd_vect.size() == 1) // raw or fd + { + subscription.add_one_bcm_frame(cfd_vect[0], bcm_cm); + + if(subscription.socket_->write_message(*cm) < 0) + { + AFB_ERROR("Error write message id : %d", cfd_vect[0].can_id); + return -1; + } + } + else // error + { + AFB_ERROR("Error no data available"); + return -1; + } - subscription.socket_->write_message(msg); if(! subscription.socket_.get()) return -1; return 0; } + +#ifdef USE_FEATURE_J1939 +/** + * @brief Allows to open socket j1939 and send j1939 messsage + * + * @param subscription The subscription + * @param message The j1939 message to send + * @param bus_name The bus name where to send message + * @return int 0 if ok else -1 + */ +int low_can_subscription_t::j1939_send(low_can_subscription_t &subscription, message_t *message, const std::string& bus_name) +{ + //struct bcm_msg bcm_msg = subscription.make_bcm_head(TX_SEND, cfd.can_id); + //subscription.add_one_bcm_frame(cfd, bcm_msg); + + if(subscription.open_socket(subscription, bus_name, J1939_PROTOCOL) < 0) + return -1; + + j1939_message_t *jm = static_cast(message); + jm->set_sockname(jm->get_pgn(), J1939_NO_NAME, J1939_NO_ADDR); + if(subscription.socket_->write_message(*jm) < 0) + { + AFB_ERROR("Error write j1939 message"); + return -1; + } + + return 0; +} +#endif + + +/** + * @brief Allows to open socket isotp and send can messsage + * + * @param subscription The subscription + * @param message The can message to send + * @param bus_name The bus name where to send message + * @return int 0 if ok else -1 + */ +int low_can_subscription_t::isotp_send(low_can_subscription_t &subscription, message_t *message, const std::string& bus_name) +{ + //struct bcm_msg bcm_msg = subscription.make_bcm_head(TX_SEND, cfd.can_id); + //subscription.add_one_bcm_frame(cfd, bcm_msg); + + if(subscription.open_socket(subscription, bus_name, ISOTP_PROTOCOL|ISOTP_SEND) < 0) + return -1; + + can_message_t *cm = static_cast(message); + if(subscription.socket_->write_message(*cm) < 0) + { + AFB_ERROR("Error write iso tp message"); + return -1; + } + + return 0; +}