Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix: correctly stop the binding.
[apps/agl-service-can-low-level.git]
/
low-can-binding
/
can
/
can-signals.cpp
diff --git
a/low-can-binding/can/can-signals.cpp
b/low-can-binding/can/can-signals.cpp
index
6211fa1
..
a964556
100644
(file)
--- a/
low-can-binding/can/can-signals.cpp
+++ b/
low-can-binding/can/can-signals.cpp
@@
-19,15
+19,17
@@
#include "can-signals.hpp"
#include "can-signals.hpp"
-#include "../
configur
ation.hpp"
+#include "../
binding/applic
ation.hpp"
#include "../utils/signals.hpp"
#include "can-decoder.hpp"
#include "../utils/signals.hpp"
#include "can-decoder.hpp"
+#include "can-message.hpp"
+#include "can-bus.hpp"
#include "../diagnostic/diagnostic-message.hpp"
#include "../diagnostic/diagnostic-message.hpp"
+#include "canutil/write.h"
std::string can_signal_t::prefix_ = "messages";
std::string can_signal_t::prefix_ = "messages";
-can_signal_t::can_signal_t(std::uint8_t message_set_id,
- std::uint8_t message_id,
+can_signal_t::can_signal_t(
std::string generic_name,
uint8_t bit_position,
uint8_t bit_size,
std::string generic_name,
uint8_t bit_position,
uint8_t bit_size,
@@
-40,12
+42,11
@@
can_signal_t::can_signal_t(std::uint8_t message_set_id,
bool force_send_changed,
std::map<uint8_t, std::string> states,
bool writable,
bool force_send_changed,
std::map<uint8_t, std::string> states,
bool writable,
-
SignalD
ecoder decoder,
-
SignalE
ncoder encoder,
+
signal_d
ecoder decoder,
+
signal_e
ncoder encoder,
bool received)
bool received)
- : message_set_id_{ message_set_id }
- , message_id_{ message_id }
- , generic_name_{ generic_name }
+ : parent_{nullptr},
+ generic_name_{ generic_name }
, bit_position_{ bit_position }
, bit_size_{ bit_size }
, factor_{ factor }
, bit_position_{ bit_position }
, bit_size_{ bit_size }
, factor_{ factor }
@@
-63,13
+64,12
@@
can_signal_t::can_signal_t(std::uint8_t message_set_id,
, last_value_{.0f}
{}
, last_value_{.0f}
{}
-
-const can_message_definition_t& can_signal_t::get_message() const
+can_message_definition_t* can_signal_t::get_message() const
{
{
- return
configuration_t::instance().get_can_message_definition(message_set_id_, message_id_)
;
+ return
parent_
;
}
}
-const std::string
&
can_signal_t::get_generic_name() const
+const std::string can_signal_t::get_generic_name() const
{
return generic_name_;
}
{
return generic_name_;
}
@@
-79,7
+79,7
@@
const std::string can_signal_t::get_name() const
return prefix_ + "." + generic_name_;
}
return prefix_ + "." + generic_name_;
}
-const std::string
&
can_signal_t::get_prefix() const
+const std::string can_signal_t::get_prefix() const
{
return prefix_;
}
{
return prefix_;
}
@@
-107,7
+107,7
@@
float can_signal_t::get_offset() const
float can_signal_t::get_min_value() const
{
return min_value_;
float can_signal_t::get_min_value() const
{
return min_value_;
-}
+}
float can_signal_t::get_max_value() const
{
float can_signal_t::get_max_value() const
{
@@
-141,6
+141,20
@@
const std::string can_signal_t::get_states(uint8_t value)
return std::string();
}
return std::string();
}
+uint64_t can_signal_t::get_states(const std::string& value) const
+{
+ uint64_t ret = -1;
+ for( const auto& state: states_)
+ {
+ if(state.second == value)
+ {
+ ret = (uint64_t)state.first;
+ break;
+ }
+ }
+ return ret;
+}
+
size_t can_signal_t::get_state_count() const
{
return states_.size();
size_t can_signal_t::get_state_count() const
{
return states_.size();
@@
-151,12
+165,12
@@
bool can_signal_t::get_writable() const
return writable_;
}
return writable_;
}
-
SignalD
ecoder& can_signal_t::get_decoder()
+
signal_d
ecoder& can_signal_t::get_decoder()
{
return decoder_;
}
{
return decoder_;
}
-
SignalE
ncoder& can_signal_t::get_encoder()
+
signal_e
ncoder& can_signal_t::get_encoder()
{
return encoder_;
}
{
return encoder_;
}
@@
-165,11
+179,22
@@
bool can_signal_t::get_received() const
{
return received_;
}
{
return received_;
}
+
float can_signal_t::get_last_value() const
{
return last_value_;
}
float can_signal_t::get_last_value() const
{
return last_value_;
}
+std::pair<float, uint64_t> can_signal_t::get_last_value_with_timestamp() const
+{
+ return std::make_pair(last_value_, frequency_.get_last_tick());
+}
+
+void can_signal_t::set_parent(can_message_definition_t* parent)
+{
+ parent_ = parent;
+}
+
void can_signal_t::set_prefix(std::string val)
{
prefix_ = val;
void can_signal_t::set_prefix(std::string val)
{
prefix_ = val;
@@
-184,3
+209,9
@@
void can_signal_t::set_last_value(float val)
{
last_value_ = val;
}
{
last_value_ = val;
}
+
+void can_signal_t::set_timestamp(uint64_t timestamp)
+{
+ frequency_.tick(timestamp);
+}
+