feat: bump arxcontainer to v0.6.0

hideakitai · Feb 5, 2024 · 92feb78 · 92feb78
1 parent 3746031
commit 92feb78
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 18 deletions.
diff --git a/Artnet/ArtDmx.h b/Artnet/ArtDmx.h
@@ -85,10 +85,10 @@ using SequenceMap = std::map<Destination, uint8_t>;
 using CallbackMap = std::map<uint16_t, CallbackType>;
 #else
 // sender
-using LastSendTimeMsMap = arx::map<Destination, uint32_t>;
-using SequenceMap = arx::map<Destination, uint8_t>;
+using LastSendTimeMsMap = arx::stdx::map<Destination, uint32_t>;
+using SequenceMap = arx::stdx::map<Destination, uint8_t>;
 // receiver
-using CallbackMap = arx::map<uint16_t, CallbackType>;
+using CallbackMap = arx::stdx::map<uint16_t, CallbackType>;
 #endif
 
 inline Metadata generateMetadataFrom(const uint8_t *packet)

diff --git a/Artnet/Common.h b/Artnet/Common.h
@@ -64,11 +64,9 @@ constexpr uint16_t PACKET_SIZE {530};
 #if ARX_HAVE_LIBSTDCPLUSPLUS >= 201103L  // Have libstdc++11
 template <uint16_t SIZE>
 using Array = std::array<uint8_t, SIZE>;
-using namespace std;
 #else
 template <uint16_t SIZE>
-using Array = arx::vector<uint8_t, SIZE>;
-using namespace arx;
+using Array = arx::stdx::vector<uint8_t, SIZE>;
 #endif
 
 struct RemoteInfo

diff --git a/Artnet/Receiver.h b/Artnet/Receiver.h
@@ -153,12 +153,7 @@ class Receiver_
     auto subscribeArtDmxUniverse(uint16_t universe, const Fn &func)
     -> std::enable_if_t<arx::is_callable<Fn>::value>
     {
-#if ARX_HAVE_LIBSTDCPLUSPLUS >= 201103L  // Have libstdc++11
-        this->callback_art_dmx_universes.insert(make_pair(universe, arx::function_traits<Fn>::cast(func)));
-#else
-        // TODO: arx::map::insert()
-        this->callback_art_dmx_universes.insert(make_pair<uint16_t, ArtDmxCallback>(universe, arx::function_traits<Fn>::cast(func)));
-#endif
+        this->callback_art_dmx_universes.insert(std::make_pair(universe, arx::function_traits<Fn>::cast(func)));
     }
 
     // subscribe artdmx packet for all universes

diff --git a/Artnet/Sender.h b/Artnet/Sender.h
@@ -52,7 +52,7 @@ class Sender_
         art_dmx::Destination dest {ip, net, subnet, universe};
         uint32_t now = millis();
         if (this->last_send_times.find(dest) == this->last_send_times.end()) {
-            this->last_send_times.insert(make_pair(dest, uint32_t(0)));
+            this->last_send_times.insert(std::make_pair(dest, uint32_t(0)));
         }
         if (now >= this->last_send_times[dest] + DEFAULT_INTERVAL_MS) {
             this->sendArxDmxInternal(dest, physical);
@@ -105,7 +105,7 @@ class Sender_
         }
 #endif
         if (this->sequences.find(dest) == this->sequences.end()) {
-            this->sequences.insert(make_pair(dest, uint8_t(0)));
+            this->sequences.insert(std::make_pair(dest, uint8_t(0)));
         }
         art_dmx::setMetadataTo(this->packet.data(), this->sequences[dest], physical, dest.net, dest.subnet, dest.universe);
         this->sendRawData(dest.ip, DEFAULT_PORT, this->packet.data(), this->packet.size());

diff --git a/examples/Apps/TouchDesigner/artnet_test.toe b/examples/Apps/TouchDesigner/artnet_test.toe
diff --git a/library.json b/library.json
@@ -11,13 +11,13 @@
         "url": "https://github.com/hideakitai",
         "maintainer": true
     },
-    "version": "0.4.0",
+    "version": "0.4.1",
     "license": "MIT",
     "frameworks": "*",
     "platforms": "*",
     "dependencies":
     {
-        "hideakitai/ArxContainer": "*",
+        "hideakitai/ArxContainer": ">=0.6.0",
         "hideakitai/ArxTypeTraits": "*"
     }
 }
diff --git a/library.properties b/library.properties
@@ -1,10 +1,10 @@
 name=ArtNet
-version=0.4.0
+version=0.4.1
 author=hideakitai
 maintainer=hideakitai
 sentence=Art-Net Sender/Receiver for Arduino (Ethernet, WiFi)
 paragraph=Art-Net Sender/Receiver for Arduino (Ethernet, WiFi)
 category=Communication
 url=https://github.com/hideakitai/ArtNet
 architectures=*
-depends=ArxContainer,ArxTypeTraits
+depends=ArxContainer(>=0.6.0),ArxTypeTraits