aboutsummaryrefslogtreecommitdiffstats
path: root/low-can-binding/binding
diff options
context:
space:
mode:
Diffstat (limited to 'low-can-binding/binding')
-rw-r--r--low-can-binding/binding/low-can-cb.cpp3
-rw-r--r--low-can-binding/binding/low-can-subscription.cpp24
-rw-r--r--low-can-binding/binding/low-can-subscription.hpp7
3 files changed, 26 insertions, 8 deletions
diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp
index 5e03c754..5d5a5170 100644
--- a/low-can-binding/binding/low-can-cb.cpp
+++ b/low-can-binding/binding/low-can-cb.cpp
@@ -314,6 +314,9 @@ static event_filter_t generate_filter(json_object* args)
if (json_object_object_get_ex(filter, "max", &obj)
&& (json_object_is_type(obj, json_type_double) || json_object_is_type(obj, json_type_int)))
event_filter.max = (float)json_object_get_double(obj);
+ if (json_object_object_get_ex(filter, "promisc", &obj)
+ && (json_object_is_type(obj, json_type_boolean)))
+ event_filter.promisc = (bool)json_object_get_boolean(obj);
if (json_object_object_get_ex(filter, "rx_id", &obj)
&& (json_object_is_type(obj, json_type_int)))
event_filter.rx_id = (canid_t) json_object_get_int(obj);
diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp
index 3cbcb6c9..4bdf3181 100644
--- a/low-can-binding/binding/low-can-subscription.cpp
+++ b/low-can-binding/binding/low-can-subscription.cpp
@@ -254,6 +254,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
*
@@ -314,6 +319,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
*
@@ -409,30 +419,32 @@ 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<utils::socketcan_j1939_addressclaiming_t> socket = std::make_shared<utils::socketcan_j1939_addressclaiming_t>();
if(!bus_name.empty())
{
- std::shared_ptr<utils::socketcan_j1939_addressclaiming_t> socket = std::make_shared<utils::socketcan_j1939_addressclaiming_t>();
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;
+ std::shared_ptr<utils::socketcan_j1939_data_t> socket = std::make_shared<utils::socketcan_j1939_data_t>();
if(subscription.signal_)
{
pgn = subscription.signal_->get_message()->get_id();
- std::shared_ptr<utils::socketcan_j1939_data_t> socket = std::make_shared<utils::socketcan_j1939_data_t>();
ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(), pgn);
- subscription.socket_ = socket;
}
else if(!bus_name.empty())
{
- std::shared_ptr<utils::socketcan_j1939_data_t> socket = std::make_shared<utils::socketcan_j1939_data_t>();
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
diff --git a/low-can-binding/binding/low-can-subscription.hpp b/low-can-binding/binding/low-can-subscription.hpp
index fa6b795e..972b6d61 100644
--- a/low-can-binding/binding/low-can-subscription.hpp
+++ b/low-can-binding/binding/low-can-subscription.hpp
@@ -35,12 +35,13 @@ struct event_filter_t
float frequency; ///< frequency - Maximum frequency which will be received and pushed to a subscribed event.
float min; ///< min - Minimum value that the signal doesn't have to go below to be pushed.
float max; ///< max - Maximum value that the signal doesn't have to go above to be pushed.
+ bool promisc; //<promisc - Active mode promisc on socket that permit this feature (j1939)
canid_t rx_id; ///< rx_id - RX_ID for ISO_TP protocol
canid_t tx_id; ///< tx_id - TX_ID for ISO_TP protocol
- event_filter_t() : frequency{0}, min{-__FLT_MAX__}, max{__FLT_MAX__}, rx_id{NO_CAN_ID}, tx_id{NO_CAN_ID} {};
+ event_filter_t() : frequency{0}, min{-__FLT_MAX__}, max{__FLT_MAX__}, promisc{false}, rx_id{NO_CAN_ID}, tx_id{NO_CAN_ID} {};
bool operator==(const event_filter_t& ext) const {
- return frequency == ext.frequency && min == ext.min && max == ext.max && rx_id == ext.rx_id && tx_id == ext.tx_id;
+ return frequency == ext.frequency && min == ext.min && max == ext.max && promisc == ext.promisc && rx_id == ext.rx_id && tx_id == ext.tx_id;
}
};
@@ -87,6 +88,7 @@ public:
float get_frequency() const;
float get_min() const;
float get_max() const;
+ bool get_promisc() const;
canid_t get_rx_id() const;
canid_t get_tx_id() const;
std::shared_ptr<utils::socketcan_t> get_socket();
@@ -95,6 +97,7 @@ public:
void set_min(float min);
void set_max(float max);
void set_index(int index);
+ void set_promisc(bool promisc);
void set_rx_id(canid_t rx_id);
void set_tx_id(canid_t tx_id);
void set_signal(std::shared_ptr<signal_t> signal);