Update to match current binding expectations

[src/low-level-can-generator.git] / src / openxc / signal.cpp

diff --git a/src/openxc/signal.cpp b/src/openxc/signal.cpp
index e60c3ee..858f64b 100755 (executable)
--- a/src/openxc/signal.cpp
+++ b/src/openxc/signal.cpp
@@ -88,12 +88,14 @@ namespace openxc
                return multiplex_;\r
        }\r
 \r
-       bool signal::is_big_endian() const{\r
-               return is_big_endian_;\r
+       sign_t signal::sign() const\r
+       {\r
+               return sign_;\r
        }\r
 \r
-       bool signal::is_signed() const{\r
-               return is_signed_;\r
+       std::int32_t signal::bit_sign_position() const\r
+       {\r
+               return bit_sign_position_;\r
        }\r
 \r
        std::string signal::unit() const{\r
@@ -134,11 +136,10 @@ namespace openxc
                {\r
                        multiplex_ =  std::make_pair(false,0);\r
                }\r
-               is_big_endian_ = j.count("is_big_endian") ? j["is_big_endian"].get<bool>() : false;\r
-               is_signed_ = j.count("is_signed") ? j["is_signed"].get<bool>() : false;\r
-               unit_ = j.count("unit") ? j["unit"].get<std::string>() : "";\r
-\r
 \r
+               bit_sign_position_ = j.count("bit_sign_position") ? j["bit_sign_position"].get<std::int32_t>() : -1;\r
+               sign_ = j.count("signed") ? (sign_t) j["signed"].get<std::uint32_t>() : sign_t::UNSIGNED;\r
+               unit_ = j.count("unit") ? j["unit"].get<std::string>() : "";\r
 \r
                if (j.count("states"))\r
                {\r
@@ -185,10 +186,8 @@ namespace openxc
 \r
                j["multiplex"] = multi;\r
 \r
-\r
-\r
-               j["is_big_endian"] = is_big_endian_;\r
-               j["is_signed"] = is_signed_;\r
+               j["bit_sign_position"] = bit_sign_position_;\r
+               j["signed"] = static_cast<std::uint32_t>(sign_);\r
                j["unit"] = unit_;\r
                return j;\r
        }\r