X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fbinding%2Flow-can-subscription.cpp;h=99f209beeacdde75159b90f4a895f3ad8acb59be;hb=8c1df02d734676f79807e3a4682fb96ea88c5cb5;hp=1e22d260a62888fd72f5019ad80963efbb5c63ad;hpb=bdde88e49b303bb310609eee13e13c8b99a2ab09;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 1e22d260..99f209be 100644 --- a/low-can-binding/binding/low-can-subscription.cpp +++ b/low-can-binding/binding/low-can-subscription.cpp @@ -102,12 +102,9 @@ int low_can_subscription_t::set_event() int low_can_subscription_t::subscribe(afb_req_t request) { if(! afb_event_is_valid(event_)) - { if(set_event() < 0) - { return -1; - } - } + return afb_req_subscribe(request, event_); } @@ -175,12 +172,9 @@ const vect_ptr_diag_msg_t low_can_subscription_t::get_diagnostic_message() const 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; } @@ -190,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; } @@ -254,6 +245,11 @@ 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 * @@ -284,6 +280,11 @@ 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 * @@ -314,6 +315,11 @@ 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 * @@ -354,6 +360,10 @@ 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. @@ -364,13 +374,13 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co int ret = -1; if(! subscription.socket_) { - if(flags & BCM_PROTOCOL) + 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_bus()); + 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); @@ -394,12 +404,12 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co 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); + ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(), rx, tx); subscription.socket_ = socket; } else if(! bus_name.empty()) { - ret = socket->open(bus_name, subscription.get_rx_id(),subscription.get_tx_id()); + ret = socket->open(bus_name, subscription.get_rx_id(), subscription.get_tx_id()); subscription.socket_ = socket; } subscription.index_ = (int)subscription.socket_->socket(); @@ -409,30 +419,30 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co else if(flags & J1939_ADDR_CLAIM_PROTOCOL) { pgn_t pgn = J1939_NO_PGN; + std::shared_ptr socket = std::make_shared(); if(!bus_name.empty()) - { - std::shared_ptr socket = std::make_shared(); ret = socket->open(bus_name, pgn); - subscription.socket_ = socket; - } + subscription.socket_ = socket; subscription.index_ = (int)subscription.socket_->socket(); } else if(flags & J1939_PROTOCOL) { pgn_t pgn = J1939_NO_PGN; - if(subscription.signal_ != nullptr) + std::shared_ptr socket = std::make_shared(); + if(subscription.signal_) { pgn = subscription.signal_->get_message()->get_id(); - std::shared_ptr socket = std::make_shared(); ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(), pgn); - subscription.socket_ = socket; } else if(!bus_name.empty()) { - std::shared_ptr socket = std::make_shared(); ret = socket->open(bus_name, pgn); - subscription.socket_ = socket; } + + if(ret) + socket->define_opt(!j1939_pgn_is_pdu1(pgn),subscription.event_filter_.promisc); + + subscription.socket_ = socket; subscription.index_ = (int)subscription.socket_->socket(); } #endif @@ -495,7 +505,7 @@ void low_can_subscription_t::add_one_bcm_frame(struct canfd_frame& cfd, struct b void low_can_subscription_t::remove_last_bcm_frame(struct bcm_msg& bcm_msg) { struct canfd_frame cf; - memset(&cf,0,sizeof(cf)); + memset(&cf, 0, sizeof(cf)); bcm_msg.fd_frames[bcm_msg.msg_head.nframes] = cf; bcm_msg.msg_head.nframes--; } @@ -514,9 +524,8 @@ int low_can_subscription_t::create_rx_filter_j1939(low_can_subscription_t &subsc // Make sure that socket is opened. if(open_socket(subscription, "", J1939_PROTOCOL) < 0) - { return -1; - } + return 0; } #endif @@ -534,9 +543,8 @@ int low_can_subscription_t::create_rx_filter_isotp(low_can_subscription_t &subsc // Make sure that socket is opened. if(open_socket(subscription, "", ISOTP_PROTOCOL|ISOTP_RECEIVE) < 0) - { return -1; - } + return 0; } @@ -608,6 +616,35 @@ int low_can_subscription_t::create_rx_filter_can(low_can_subscription_t &subscri 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 @@ -618,26 +655,17 @@ int low_can_subscription_t::create_rx_filter_can(low_can_subscription_t &subscri 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); - } + 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 - else - { - AFB_ERROR("Signal can't be j1939 and isotp"); - return -1; - } + AFB_ERROR("Signal can't be created (check config)"); + return -1; } @@ -650,7 +678,6 @@ int low_can_subscription_t::create_rx_filter(std::shared_ptrwrite_message(msg); - if(! subscription.socket_) - return -1; + if(! subscription.socket_) + return -1; } else { @@ -706,20 +731,16 @@ int low_can_subscription_t::tx_send(low_can_subscription_t &subscription, messag { 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 + 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); std::vector cfd_vect = cm->convert_to_canfd_frame_vector(); - if(subscription.open_socket(subscription, bus_name, BCM_PROTOCOL) < 0) - { - return -1; - } + if(subscription.open_socket(subscription, bus_name, CAN_PROTOCOL) < 0) + return -1; struct bcm_msg &bcm_cm = cm->get_bcm_msg(); - - if(cfd_vect.size() > 1) { AFB_ERROR("Multi frame BCM not implemented"); @@ -742,9 +763,7 @@ int low_can_subscription_t::tx_send(low_can_subscription_t &subscription, messag } if(! subscription.socket_.get()) - { - return -1; - } + return -1; return 0; } @@ -764,9 +783,7 @@ int low_can_subscription_t::j1939_send(low_can_subscription_t &subscription, mes //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); @@ -795,9 +812,7 @@ int low_can_subscription_t::isotp_send(low_can_subscription_t &subscription, mes //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)