summaryrefslogtreecommitdiffstats
path: root/src/can
diff options
context:
space:
mode:
Diffstat (limited to 'src/can')
-rw-r--r--src/can/can-bus.cpp2
-rw-r--r--src/can/can-decoder.cpp6
-rw-r--r--src/can/can-message.cpp2
3 files changed, 2 insertions, 8 deletions
diff --git a/src/can/can-bus.cpp b/src/can/can-bus.cpp
index cfb9d86d..e799233a 100644
--- a/src/can/can-bus.cpp
+++ b/src/can/can-bus.cpp
@@ -246,7 +246,7 @@ int can_bus_t::init_can_dev()
}
}
- NOTICE(binder_interface, "Initialized %d/%d can bus device(s)", i, t);
+ NOTICE(binder_interface, "Initialized %d/%d can bus device(s)", i, (int)t);
return 0;
}
ERROR(binder_interface, "init_can_dev: Error at CAN device initialization. No devices read from configuration file. Did you specify canbus JSON object ?");
diff --git a/src/can/can-decoder.cpp b/src/can/can-decoder.cpp
index 467261af..8843059d 100644
--- a/src/can/can-decoder.cpp
+++ b/src/can/can-decoder.cpp
@@ -152,12 +152,6 @@ openxc_DynamicField decoder_t::stateDecoder(can_signal_t& signal,
openxc_DynamicField decoder_t::translateSignal(can_signal_t& signal, can_message_t& message,
const std::vector<can_signal_t>& signals)
{
- if(&signal == nullptr || &message == nullptr)
- {
- openxc_DynamicField ret = {0, openxc_DynamicField_Type_BOOL, 0, "", 0, 0, 0, 0};
- return ret;
- }
-
float value = decoder_t::parseSignalBitfield(signal, message);
DEBUG(binder_interface, "translateSignal: Decoded message from parseSignalBitfield: %f", value);
diff --git a/src/can/can-message.cpp b/src/can/can-message.cpp
index af0d3f38..f61de67e 100644
--- a/src/can/can-message.cpp
+++ b/src/can/can-message.cpp
@@ -234,7 +234,7 @@ can_message_t can_message_t::convert_from_canfd_frame(const struct canfd_frame&
};
DEBUG(binder_interface, "convert_from_canfd_frame: Found id: %X, format: %X, length: %X, data %02X%02X%02X%02X%02X%02X%02X%02X",
- id, format, length, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
+ id, (uint8_t)format, length, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
}
return can_message_t(maxdlen, id, length, format, rtr_flag, flags, data);