summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/agl-vcar/signals.json6
-rw-r--r--low-can-binding/can/message/j1939-message.hpp2
-rw-r--r--low-can-binding/can/message/message.cpp2
-rw-r--r--low-can-binding/utils/socketcan-isotp.hpp2
-rw-r--r--low-can-binding/utils/socketcan.hpp11
-rw-r--r--plugins/j1939-signals.cpp1
6 files changed, 14 insertions, 10 deletions
diff --git a/examples/agl-vcar/signals.json b/examples/agl-vcar/signals.json
index 2a4f5187..c1542eba 100644
--- a/examples/agl-vcar/signals.json
+++ b/examples/agl-vcar/signals.json
@@ -10,7 +10,6 @@
"bus": "hs",
"is_fd" : false,
"is_j1939" : false,
- "length" : 8,
"signals": {
"doors.driver.open": {
"generic_name": "doors.front_left.open",
@@ -58,7 +57,6 @@
"bus": "hs",
"is_fd" : false,
"is_j1939" : false,
- "length" : 8,
"signals": {
"windows.driver.open": {
"generic_name": "windows.front_left.open",
@@ -99,7 +97,6 @@
"is_fd" : false,
"is_extended": false,
"is_j1939" : false,
- "length" : 8,
"signals": {
"PT_FuelLevelPct": {
"generic_name": "fuel.level",
@@ -133,7 +130,6 @@
"is_fd" : false,
"is_extended": false,
"is_j1939" : false,
- "length" : 8,
"signals": {
"PT_EngineOilTempHigh": {
"generic_name": "engine.oil.temp.high",
@@ -159,7 +155,6 @@
"is_fd" : false,
"is_extended": false,
"is_j1939" : false,
- "length" : 8,
"signals": {
"PT_VehicleAvgSpeed": {
"generic_name": "vehicle.average.speed",
@@ -176,7 +171,6 @@
"is_fd" : false,
"is_extended": true,
"is_j1939" : false,
- "length" : 8,
"signals": {
"LeftTemperature": {
"generic_name": "hvac.temperature.left",
diff --git a/low-can-binding/can/message/j1939-message.hpp b/low-can-binding/can/message/j1939-message.hpp
index a513e94e..850455c4 100644
--- a/low-can-binding/can/message/j1939-message.hpp
+++ b/low-can-binding/can/message/j1939-message.hpp
@@ -79,4 +79,4 @@ class j1939_message_t : public message_t
struct sockaddr_can get_sockname();
void set_sockname(struct sockaddr_can sockname);
void set_sockname(pgn_t pgn, name_t name, uint8_t addr);
-}; \ No newline at end of file
+};
diff --git a/low-can-binding/can/message/message.cpp b/low-can-binding/can/message/message.cpp
index 2a23ca5a..191e1f23 100644
--- a/low-can-binding/can/message/message.cpp
+++ b/low-can-binding/can/message/message.cpp
@@ -188,4 +188,4 @@ void message_t::set_maxdlen(uint32_t maxdlen)
void message_t::set_length(uint32_t length)
{
length_ = length;
-} \ No newline at end of file
+}
diff --git a/low-can-binding/utils/socketcan-isotp.hpp b/low-can-binding/utils/socketcan-isotp.hpp
index 86ed9faf..dfaf0089 100644
--- a/low-can-binding/utils/socketcan-isotp.hpp
+++ b/low-can-binding/utils/socketcan-isotp.hpp
@@ -36,4 +36,4 @@ namespace utils
virtual int write_message(message_t& obj);
int define_tx_address(std::string device_name, canid_t rx_id, canid_t tx_id);
};
-} \ No newline at end of file
+}
diff --git a/low-can-binding/utils/socketcan.hpp b/low-can-binding/utils/socketcan.hpp
index 17cec019..de8163e5 100644
--- a/low-can-binding/utils/socketcan.hpp
+++ b/low-can-binding/utils/socketcan.hpp
@@ -30,6 +30,17 @@
#define INVALID_SOCKET -1
#define NO_CAN_ID 0xFFFFFFFFU
+/**
+ * @enum socket_type
+ * @brief The type of socket
+ */
+enum class socket_type {
+ BCM, ///< BCM - Socket BCM
+ J1939_ADDR_CLAIM, ///< J1939 - Socket J1939
+ J1939, ///< J1939 - Socket J1939
+ INVALID
+};
+
namespace utils
{
diff --git a/plugins/j1939-signals.cpp b/plugins/j1939-signals.cpp
index 7ec634a7..863df576 100644
--- a/plugins/j1939-signals.cpp
+++ b/plugins/j1939-signals.cpp
@@ -1015,7 +1015,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set
})}
} // end signals vector
})} // end message_definition entry
-
}, // end message_definition vector
{ // beginning diagnostic_messages_ vector