Add UDP client feature

matsujirushi · matsujirushi · commit 797c95f46e67 · 2025-06-13T09:15:54.000+09:00
diff --git a/examples/soracom/soracom-uptime-off/soracom-uptime-off.ino b/examples/soracom/soracom-uptime-off/soracom-uptime-off.ino
@@ -20,9 +20,13 @@ static const char APN[] = "soracom.io";
 static const char HOST[] = "uni.soracom.io";
 static constexpr int PORT = 23080;
 
+template<typename MODULE> using CellularClient = WioCellularTcpClient2<MODULE>;  // TCP
+// template<typename MODULE> using CellularClient = WioCellularUdpClient2<MODULE>; // UDP
+
 static constexpr int INTERVAL = 1000 * 60 * 15;        // [ms]
 static constexpr int POWER_ON_TIMEOUT = 1000 * 20;     // [ms]
 static constexpr int NETWORK_TIMEOUT = 1000 * 60 * 3;  // [ms]
+static constexpr int CONNECT_TIMEOUT = 1000 * 10;      // [ms]
 static constexpr int RECEIVE_TIMEOUT = 1000 * 10;      // [ms]
 static constexpr int POWER_OFF_DELAY_TIME = 1000 * 3;  // [ms]
 
@@ -111,13 +115,13 @@ static bool send(const JsonDocument &doc) {
   Serial.println(PORT);
 
   {
-    WioCellularTcpClient2<WioCellularModule> client{ WioCellular };
+    CellularClient<WioCellularModule> client{ WioCellular };
     if (!client.open(WioNetwork.config.pdpContextId, HOST, PORT)) {
       Serial.printf("ERROR: Failed to open %s\n", WioCellularResultToString(client.getLastResult()));
       return false;
     }
 
-    if (!client.waitforConnect()) {
+    if (!client.waitforConnect(CONNECT_TIMEOUT)) {
       Serial.printf("ERROR: Failed to connect %s\n", WioCellularResultToString(client.getLastResult()));
       return false;
     }
diff --git a/examples/soracom/soracom-uptime-psm/soracom-uptime-psm.ino b/examples/soracom/soracom-uptime-psm/soracom-uptime-psm.ino
@@ -20,9 +20,13 @@ static const char APN[] = "soracom.io";
 static const char HOST[] = "uni.soracom.io";
 static constexpr int PORT = 23080;
 
+template<typename MODULE> using CellularClient = WioCellularTcpClient2<MODULE>;  // TCP
+// template<typename MODULE> using CellularClient = WioCellularUdpClient2<MODULE>; // UDP
+
 static constexpr int INTERVAL = 1000 * 60 * 5;            // [ms]
 static constexpr int POWER_ON_TIMEOUT = 1000 * 20;        // [ms]
 static constexpr int NETWORK_TIMEOUT = 1000 * 60 * 3;     // [ms]
+static constexpr int CONNECT_TIMEOUT = 1000 * 10;         // [ms]
 static constexpr int RECEIVE_TIMEOUT = 1000 * 10;         // [ms]
 static constexpr int PSM_PERIOD = 60 * 6;                 // [s]
 static constexpr int PSM_ACTIVE = 2;                      // [s]
@@ -133,13 +137,13 @@ static bool send(const JsonDocument &doc) {
   Serial.println(PORT);
 
   {
-    WioCellularTcpClient2<WioCellularModule> client{ WioCellular };
+    CellularClient<WioCellularModule> client{ WioCellular };
     if (!client.open(WioNetwork.config.pdpContextId, HOST, PORT)) {
       Serial.printf("ERROR: Failed to open %s\n", WioCellularResultToString(client.getLastResult()));
       return false;
     }
 
-    if (!client.waitforConnect()) {
+    if (!client.waitforConnect(CONNECT_TIMEOUT)) {
       Serial.printf("ERROR: Failed to connect %s\n", WioCellularResultToString(client.getLastResult()));
       return false;
     }
diff --git a/examples/soracom/soracom-uptime/soracom-uptime.ino b/examples/soracom/soracom-uptime/soracom-uptime.ino
@@ -20,9 +20,13 @@ static const char APN[] = "soracom.io";
 static const char HOST[] = "uni.soracom.io";
 static constexpr int PORT = 23080;
 
+template<typename MODULE> using CellularClient = WioCellularTcpClient2<MODULE>;  // TCP
+// template<typename MODULE> using CellularClient = WioCellularUdpClient2<MODULE>; // UDP
+
 static constexpr int INTERVAL = 1000 * 60 * 5;         // [ms]
 static constexpr int POWER_ON_TIMEOUT = 1000 * 20;     // [ms]
 static constexpr int NETWORK_TIMEOUT = 1000 * 60 * 3;  // [ms]
+static constexpr int CONNECT_TIMEOUT = 1000 * 10;      // [ms]
 static constexpr int RECEIVE_TIMEOUT = 1000 * 10;      // [ms]
 
 static void abortHandler(int sig) {
@@ -105,13 +109,13 @@ static bool send(const JsonDocument &doc) {
   Serial.println(PORT);
 
   {
-    WioCellularTcpClient2<WioCellularModule> client{ WioCellular };
+    CellularClient<WioCellularModule> client{ WioCellular };
     if (!client.open(WioNetwork.config.pdpContextId, HOST, PORT)) {
       Serial.printf("ERROR: Failed to open %s\n", WioCellularResultToString(client.getLastResult()));
       return false;
     }
 
-    if (!client.waitforConnect()) {
+    if (!client.waitforConnect(CONNECT_TIMEOUT)) {
       Serial.printf("ERROR: Failed to connect %s\n", WioCellularResultToString(client.getLastResult()));
       return false;
     }
diff --git a/src/WioCellular.hpp b/src/WioCellular.hpp
@@ -53,8 +53,11 @@ extern WioCellularNetwork WioNetwork;
 
 #include "client/WioCellularArduinoTcpClient.hpp"
 #include "client/WioCellularTcpClient2.hpp"
+#include "client/WioCellularUdpClient2.hpp"
 
 template <typename MODULE>
 using WioCellularTcpClient2 = wiocellular::client::WioCellularTcpClient2<MODULE>;
+template <typename MODULE>
+using WioCellularUdpClient2 = wiocellular::client::WioCellularUdpClient2<MODULE>;
 
 #endif // WIOCELLULAR_HPP
diff --git a/src/client/WioCellularTcpClient2.hpp b/src/client/WioCellularTcpClient2.hpp
@@ -7,10 +7,10 @@
 #ifndef WIOCELLULARTCPCLIENT2_HPP
 #define WIOCELLULARTCPCLIENT2_HPP
 
-#include <bitset>
 #include <memory>
 #include "internal/CountdownTimer.hpp"
 #include "internal/Misc.hpp"
+#include "internal/UsedConnectIds.hpp"
 #include "WioCellularResult.hpp"
 
 namespace wiocellular::client
@@ -66,7 +66,6 @@ namespace wiocellular::client
         State State_;
         WioCellularResult LastResult_;
         std::unique_ptr<typename MODULE::UrcHandler> UrcHandler_;
-        inline static std::bitset<12> UsedConnectIds_;
         int ConnectId_;
         bool ReceivedNofity_;
         uint32_t openedTime_;
@@ -195,9 +194,9 @@ namespace wiocellular::client
 
             {
                 int connectId = -1;
-                for (size_t i = 0; i < UsedConnectIds_.size(); ++i)
+                for (size_t i = 0; i < wiocellular::internal::UsedConnectIds.size(); ++i)
                 {
-                    if (!UsedConnectIds_.test(i))
+                    if (!wiocellular::internal::UsedConnectIds.test(i))
                     {
                         connectId = i;
                         break;
@@ -208,7 +207,7 @@ namespace wiocellular::client
                     LastResult_ = WioCellularResult::InsufficientResources;
                     return false;
                 }
-                UsedConnectIds_.set(connectId);
+                wiocellular::internal::UsedConnectIds.set(connectId);
                 ConnectId_ = connectId;
             }
 
@@ -218,7 +217,7 @@ namespace wiocellular::client
             if (const auto result = WioCellular.openSocket2(cid, ConnectId_, "TCP", ipAddress, remotePort, 0); result != WioCellularResult::Ok)
             {
                 UrcHandler_ = nullptr;
-                UsedConnectIds_.reset(ConnectId_);
+                wiocellular::internal::UsedConnectIds.reset(ConnectId_);
                 LastResult_ = result;
                 return false;
             }
@@ -297,7 +296,7 @@ namespace wiocellular::client
                 }
 
                 UrcHandler_ = nullptr;
-                UsedConnectIds_.reset(ConnectId_);
+                wiocellular::internal::UsedConnectIds.reset(ConnectId_);
                 setState(State::Closed);
             }
 
diff --git a/src/client/WioCellularUdpClient2.hpp b/src/client/WioCellularUdpClient2.hpp
diff --git a/src/internal/UsedConnectIds.hpp b/src/internal/UsedConnectIds.hpp

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@`
`7`	`7`	`#ifndef WIOCELLULARTCPCLIENT2_HPP`
`8`	`8`	`#define WIOCELLULARTCPCLIENT2_HPP`
`9`	`9`
`10`		`-#include <bitset>`
`11`	`10`	`#include <memory>`
`12`	`11`	`#include "internal/CountdownTimer.hpp"`
`13`	`12`	`#include "internal/Misc.hpp"`
	`13`	`+#include "internal/UsedConnectIds.hpp"`
`14`	`14`	`#include "WioCellularResult.hpp"`
`15`	`15`
`16`	`16`	`namespace wiocellular::client`
`@@ -66,7 +66,6 @@ namespace wiocellular::client`
`66`	`66`	`State State_;`
`67`	`67`	`WioCellularResult LastResult_;`
`68`	`68`	`std::unique_ptr<typename MODULE::UrcHandler> UrcHandler_;`
`69`		`- inline static std::bitset<12> UsedConnectIds_;`
`70`	`69`	`int ConnectId_;`
`71`	`70`	`bool ReceivedNofity_;`
`72`	`71`	`uint32_t openedTime_;`
`@@ -195,9 +194,9 @@ namespace wiocellular::client`
`195`	`194`
`196`	`195`	`{`
`197`	`196`	`int connectId = -1;`
`198`		`- for (size_t i = 0; i < UsedConnectIds_.size(); ++i)`
	`197`	`+ for (size_t i = 0; i < wiocellular::internal::UsedConnectIds.size(); ++i)`
`199`	`198`	`{`
`200`		`- if (!UsedConnectIds_.test(i))`
	`199`	`+ if (!wiocellular::internal::UsedConnectIds.test(i))`
`201`	`200`	`{`
`202`	`201`	`connectId = i;`
`203`	`202`	`break;`
`@@ -208,7 +207,7 @@ namespace wiocellular::client`
`208`	`207`	`LastResult_ = WioCellularResult::InsufficientResources;`
`209`	`208`	`return false;`
`210`	`209`	`}`
`211`		`- UsedConnectIds_.set(connectId);`
	`210`	`+ wiocellular::internal::UsedConnectIds.set(connectId);`
`212`	`211`	`ConnectId_ = connectId;`
`213`	`212`	`}`
`214`	`213`
`@@ -218,7 +217,7 @@ namespace wiocellular::client`
`218`	`217`	`if (const auto result = WioCellular.openSocket2(cid, ConnectId_, "TCP", ipAddress, remotePort, 0); result != WioCellularResult::Ok)`
`219`	`218`	`{`
`220`	`219`	`UrcHandler_ = nullptr;`
`221`		`- UsedConnectIds_.reset(ConnectId_);`
	`220`	`+ wiocellular::internal::UsedConnectIds.reset(ConnectId_);`
`222`	`221`	`LastResult_ = result;`
`223`	`222`	`return false;`
`224`	`223`	`}`
`@@ -297,7 +296,7 @@ namespace wiocellular::client`
`297`	`296`	`}`
`298`	`297`
`299`	`298`	`UrcHandler_ = nullptr;`
`300`		`- UsedConnectIds_.reset(ConnectId_);`
	`299`	`+ wiocellular::internal::UsedConnectIds.reset(ConnectId_);`
`301`	`300`	`setState(State::Closed);`
`302`	`301`	`}`
`303`	`302`