Code Review
/
src
/
low-level-can-generator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add gitlab issue/merge request templates
[src/low-level-can-generator.git]
/
src
/
openxc
/
signal.hpp
diff --git
a/src/openxc/signal.hpp
b/src/openxc/signal.hpp
index
e0124c3
..
ce0a2e1
100755
(executable)
--- a/
src/openxc/signal.hpp
+++ b/
src/openxc/signal.hpp
@@
-8,24
+8,38
@@
\r
namespace openxc
\r
{
\r
\r
namespace openxc
\r
{
\r
+ enum sign_t
\r
+ {
\r
+ UNSIGNED = 0,
\r
+ SIGN_BIT = 1,
\r
+ ONES_COMPLEMENT = 2,
\r
+ TWOS_COMPLEMENT = 3,
\r
+ SIGN_BIT_EXTERN = 4
\r
+ };
\r
+
\r
class signal
\r
{
\r
private:
\r
std::string id_;
\r
std::string generic_name_;
\r
class signal
\r
{
\r
private:
\r
std::string id_;
\r
std::string generic_name_;
\r
- std::uint32_t bit_position_;
\r
- std::uint32_t bit_size_;
\r
+ std::uint32_t
bit_position_;
\r
+ std::uint32_t
bit_size_;
\r
float factor_;
\r
float offset_;
\r
std::string decoder_;
\r
bool ignore_;
\r
bool enabled_;
\r
float factor_;
\r
float offset_;
\r
std::string decoder_;
\r
bool ignore_;
\r
bool enabled_;
\r
- std::map<std::string, std::vector<std::uint32_t>> states_;
\r
- float max_frequency_;
\r
+ std::map<std::string, std::vector<std::uint32_t>>
states_;
\r
+ float
max_frequency_;
\r
bool send_same_;
\r
bool force_send_changed_;
\r
bool writable_;
\r
std::string encoder_;
\r
bool send_same_;
\r
bool force_send_changed_;
\r
bool writable_;
\r
std::string encoder_;
\r
+ std::pair<bool,int> multiplex_;
\r
+ sign_t sign_;
\r
+ std::int32_t bit_sign_position_;
\r
+ std::string unit_;
\r
+
\r
public:
\r
std::string id() const;
\r
void id(const std::string& id);
\r
public:
\r
std::string id() const;
\r
void id(const std::string& id);
\r
@@
-43,7
+57,11
@@
namespace openxc
bool force_send_changed() const;
\r
bool writable() const;
\r
std::string encoder() const;
\r
bool force_send_changed() const;
\r
bool writable() const;
\r
std::string encoder() const;
\r
-
\r
+ std::pair<bool,int> multiplex() const;
\r
+ sign_t sign() const;
\r
+ std::int32_t bit_sign_position() const;
\r
+ std::string unit() const;
\r
+
\r
void from_json(const nlohmann::json& j);
\r
nlohmann::json to_json() const;
\r
};
\r
void from_json(const nlohmann::json& j);
\r
nlohmann::json to_json() const;
\r
};
\r