diff options
author | asanoaozora <fifitaneki@hotmail.com> | 2016-09-22 11:12:02 +0200 |
---|---|---|
committer | asanoaozora <fifitaneki@hotmail.com> | 2016-09-22 11:12:02 +0200 |
commit | c25f7101bae08776a128fe64a306e45b62dfc56f (patch) | |
tree | d19a348c1be76882bc4da1935d2b9d5f13a48755 /src/tripcomputer | |
parent | b083370474dccf501010bef5a0c6fec4d77f0c8d (diff) | |
download | navigation-c25f7101bae08776a128fe64a306e45b62dfc56f.tar.gz |
Refinement to facilitate migration to CommonAPI
Diffstat (limited to 'src/tripcomputer')
-rw-r--r-- | src/tripcomputer/ctripcomputer.cpp | 2 | ||||
-rw-r--r-- | src/tripcomputer/ctripcomputer.h | 4 | ||||
-rw-r--r-- | src/tripcomputer/ctripcomputertypes.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/tripcomputer/ctripcomputer.cpp b/src/tripcomputer/ctripcomputer.cpp index 01db594..f7461f3 100644 --- a/src/tripcomputer/ctripcomputer.cpp +++ b/src/tripcomputer/ctripcomputer.cpp @@ -254,7 +254,7 @@ void CTripComputer::ResetTrip(const uint8_t &number) } } -void CTripComputer::SetUnits(const tupleUint16_t &data) +void CTripComputer::SetUnits(const tupleInt32_t &data) { //to do m_units = data; diff --git a/src/tripcomputer/ctripcomputer.h b/src/tripcomputer/ctripcomputer.h index 4f29566..62747c7 100644 --- a/src/tripcomputer/ctripcomputer.h +++ b/src/tripcomputer/ctripcomputer.h @@ -133,7 +133,7 @@ public: * \param data : dictionary of unit per value * */ - void SetUnits(const tupleUint16_t &data); + void SetUnits(const tupleInt32_t &data); /*! * \brief Get the basic data of a given trip (for testing) @@ -149,7 +149,7 @@ private: version_t m_version; uint8_t m_tripNumbers; vector<trip_t> m_tripData; - tupleUint16_t m_units; + tupleInt32_t m_units; bool m_firstRefresh; tripComputerInput_t m_lastTripComputerInput; }; diff --git a/src/tripcomputer/ctripcomputertypes.h b/src/tripcomputer/ctripcomputertypes.h index ab2436d..4203893 100644 --- a/src/tripcomputer/ctripcomputertypes.h +++ b/src/tripcomputer/ctripcomputertypes.h @@ -51,14 +51,14 @@ typedef boost::variant<uint32_t,uint16_t> variantTripComputer_t; * \brief Dictionary for getting the trip computer output values. * */ -typedef map<uint16_t,variantTripComputer_t > tupleVariantTripComputer_t; +typedef map<int32_t,variantTripComputer_t > tupleVariantTripComputer_t; /** * \union tupleUint16_t * \brief Dictionary for setting the trip computer units. * */ -typedef map<uint16_t,uint16_t> tupleUint16_t; +typedef map<int32_t,int32_t> tupleInt32_t; /** * \struct version_t |