Merge pull request #10 from hideakitai/feature/bump-arxcontainer-to-v…

…0.6.0 feat: bump arxcontainer to v0.6.0
hideakitai · Feb 6, 2024 · 7683fd8 · 7683fd8
2 parents 77936d9 + bf4b00f
commit 7683fd8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/Packetizer/Types.h b/Packetizer/Types.h
@@ -69,8 +69,6 @@ namespace arduino {
         using DecoderMap = std::map<DecodeTargetStream, DecoderRef<Encoding>>;
 #endif
 
-        using namespace std;
-
 #else  // Do not have libstdc++11
 
 #ifndef PACKETIZER_MAX_PACKET_QUEUE_SIZE
@@ -89,16 +87,16 @@ namespace arduino {
 #define PACKETIZER_MAX_STREAM_MAP_SIZE 2
 #endif  // PACKETIZER_MAX_STREAM_MAP_SIZE
 
-        using PacketData = arx::vector<uint8_t, PACKETIZER_MAX_PACKET_BINARY_SIZE>;
+        using PacketData = arx::stdx::vector<uint8_t, PACKETIZER_MAX_PACKET_BINARY_SIZE>;
         struct Packet {
             uint8_t index;
             PacketData data;
         };
-        using PacketQueue = arx::deque<Packet, PACKETIZER_MAX_PACKET_QUEUE_SIZE>;
+        using PacketQueue = arx::stdx::deque<Packet, PACKETIZER_MAX_PACKET_QUEUE_SIZE>;
 
         using CallbackType = std::function<void(const uint8_t* data, const size_t size)>;
         using CallbackAlwaysType = std::function<void(const uint8_t index, const uint8_t* data, const size_t size)>;
-        using CallbackMap = arx::map<uint8_t, CallbackType, PACKETIZER_MAX_CALLBACK_QUEUE_SIZE>;
+        using CallbackMap = arx::stdx::map<uint8_t, CallbackType, PACKETIZER_MAX_CALLBACK_QUEUE_SIZE>;
 
         template <typename Encoding>
         using EncoderRef = std::shared_ptr<Encoder<Encoding>>;
@@ -107,11 +105,9 @@ namespace arduino {
 #ifdef PACKETIZER_ENABLE_STREAM
         struct DecodeTargetStream;
         template <typename Encoding>
-        using DecoderMap = arx::map<DecodeTargetStream, DecoderRef<Encoding>, PACKETIZER_MAX_STREAM_MAP_SIZE>;
+        using DecoderMap = arx::stdx::map<DecodeTargetStream, DecoderRef<Encoding>, PACKETIZER_MAX_STREAM_MAP_SIZE>;
 #endif
 
-        using namespace arx;
-
 #endif
 
         namespace encoding {

diff --git a/library.json b/library.json
@@ -11,13 +11,13 @@
         "url": "https://github.com/hideakitai",
         "maintainer": true
     },
-    "version": "0.8.0",
+    "version": "0.8.1",
     "license": "MIT",
     "frameworks": "*",
     "platforms": "*",
     "dependencies":
     {
-        "hideakitai/ArxContainer": "*",
+        "hideakitai/ArxContainer": ">=0.6.0",
         "hideakitai/ArxSmartPtr": "*",
         "hideakitai/ArxTypeTraits": "*",
         "hideakitai/CRCx": "*"

diff --git a/library.properties b/library.properties
@@ -1,10 +1,10 @@
 name=Packetizer
-version=0.8.0
+version=0.8.1
 author=hideakitai
 maintainer=hideakitai
 sentence=binary data packetization encoder / decoder based on COBS / SLIP encoding
 paragraph=binary data packetization encoder / decoder based on COBS / SLIP encoding
 category=Communication
 url=https://github.com/hideakitai/Packetizer
 architectures=*
-depends=ArxContainer,ArxSmartPtr,ArxTypeTraits,CRCx
+depends=ArxContainer(>=0.6.0),ArxSmartPtr,ArxTypeTraits,CRCx