From 648b0613e2ab649d530b4b954667fc4cbc3e4c69 Mon Sep 17 00:00:00 2001 From: Doi Yusuke Date: Fri, 4 Nov 2016 20:45:08 +0900 Subject: [PATCH 1/4] Register v1.2.4 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 123dd25..5d39531 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(ics3 CXX) SET(PROJECT_VER_MAJOR 1) SET(PROJECT_VER_MINOR 2) -SET(PROJECT_VER_PATCH 3) +SET(PROJECT_VER_PATCH 4) SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}") SET(PROJECT_APIVER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}") From a7468f0dc3cb74b8b350c950b46aeba398e56784 Mon Sep 17 00:00:00 2001 From: Doi Yusuke Date: Fri, 4 Nov 2016 20:45:20 +0900 Subject: [PATCH 2/4] Update alias name for container concepts --- include/core.hpp | 8 ++++---- src/ics3.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/core.hpp b/include/core.hpp index 7a40167..95a89b6 100644 --- a/include/core.hpp +++ b/include/core.hpp @@ -10,10 +10,10 @@ namespace ics { class Core { public: - using value = uint8_t; - using Container = std::vector; - using IDContainerTx = std::array; - using IDContainerRx = std::array; + using value_type = uint8_t; + using Container = std::vector; + using IDContainerTx = std::array; + using IDContainerRx = std::array; explicit Core(const std::string&, speed_t); // touch by only libics3 ~Core() noexcept; Core(const Core&) = delete; diff --git a/src/ics3.cpp b/src/ics3.cpp index 312322d..864b031 100644 --- a/src/ics3.cpp +++ b/src/ics3.cpp @@ -9,7 +9,7 @@ static inline ics::Angle::rawType getReceiveAngle(const ics::Core::Container& rx return (rx[4] << 7) | rx[5]; } -static inline ics::Core::value getCmd(const ics::Core::value head, const ics::ID& id) { +static inline ics::Core::value_type getCmd(const ics::Core::value_type head, const ics::ID& id) { return head | id.get(); } From a5595e805b7c2f74a0e741e6135be9ad6cf4eb1a Mon Sep 17 00:00:00 2001 From: Doi Yusuke Date: Fri, 4 Nov 2016 20:57:57 +0900 Subject: [PATCH 3/4] Update alias type to correct type --- include/ics3/eepparam.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ics3/eepparam.hpp b/include/ics3/eepparam.hpp index 95bfd89..0db67a0 100644 --- a/include/ics3/eepparam.hpp +++ b/include/ics3/eepparam.hpp @@ -10,8 +10,8 @@ namespace ics { class EepParam { public: using type = uint16_t; - using size_type = std::size_t; using TargetContainer = std::array; + using size_type = TargetContainer::size_type; using InvalidChecker = type (&)(type, type, type); enum Flag : type { REVERSE = 0x01, From e207cc6d0cb0cdb110a6f95274273ee8a7bff9a3 Mon Sep 17 00:00:00 2001 From: Doi Yusuke Date: Fri, 4 Nov 2016 21:01:10 +0900 Subject: [PATCH 4/4] Omit length member --- include/ics3/eeprom.hpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/ics3/eeprom.hpp b/include/ics3/eeprom.hpp index a83222a..8661932 100644 --- a/include/ics3/eeprom.hpp +++ b/include/ics3/eeprom.hpp @@ -11,9 +11,7 @@ namespace ics { class EepRom { friend ICS3; // for ICS3::getRom() public: - using size_type = std::size_t; - static constexpr size_type length {64}; - using Container = std::array; + using Container = std::array; EepParam get(EepParam) const; void set(const EepParam&) noexcept;