From 5205d13f37af06005b2023568eca7106d7276205 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Wed, 27 May 2015 16:28:31 +0300 Subject: [PATCH] centralized::Storage fix --- .../protocol/dynamic_node_id_server/centralized/storage.hpp | 2 +- .../protocol/dynamic_node_id_server/centralized/storage.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/centralized/storage.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/centralized/storage.hpp index 99e04eb183..c03957d14f 100644 --- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/centralized/storage.hpp +++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/centralized/storage.hpp @@ -25,7 +25,7 @@ class Storage public: typedef uint8_t Size; - enum { Capacity = NodeID::Max - 1 }; + enum { Capacity = NodeID::Max }; struct Entry { diff --git a/libuavcan/test/protocol/dynamic_node_id_server/centralized/storage.cpp b/libuavcan/test/protocol/dynamic_node_id_server/centralized/storage.cpp index 615dc73f11..51ada6d104 100644 --- a/libuavcan/test/protocol/dynamic_node_id_server/centralized/storage.cpp +++ b/libuavcan/test/protocol/dynamic_node_id_server/centralized/storage.cpp @@ -164,11 +164,11 @@ TEST(dynamic_node_id_server_centralized_Storage, Basic) { ASSERT_LE(0, stor.add(entry.node_id, entry.unique_id)); - entry.node_id = uint8_t(entry.node_id.get() + 1U); + entry.node_id = uint8_t(uavcan::min(entry.node_id.get() + 1U, 127U)); entry.unique_id[0] = uint8_t(entry.unique_id[0] + 1U); } - ASSERT_GT(0, stor.add(entry.node_id, entry.unique_id)); // Failing because full + ASSERT_GT(0, stor.add(123, entry.unique_id)); // Failing because full storage.print(); }