livox: rename handshakeTimeoutMs=>commandTimeoutMs

commonLibs/livoxProto1/device.cpp

@@ -90,7 +90,7 @@ std::string DiscoveredDevice::getDeviceTypeName(void) const
 
 Device::Device(const std::string &deviceIdentifier,
 	const std::shared_ptr<smo::ComponentThread>& componentThread,
-	int handshakeTimeoutMs, int retryDelayMs,
+	int commandTimeoutMs, int retryDelayMs,
 	const std::string& smoIp, uint8_t smoSubnetNbits,
 	uint16_t dataPort, uint16_t cmdPort, uint16_t imuPort)
 : discoveredDevice(
@@ -99,7 +99,7 @@ Device::Device(const std::string &deviceIdentifier,
 	""),
 nAttachedStimBuffs(0),
 componentThread(componentThread),
-handshakeTimeoutMs(handshakeTimeoutMs), retryDelayMs(retryDelayMs),
+commandTimeoutMs(commandTimeoutMs), retryDelayMs(retryDelayMs),
 smoIp(smoIp), detectedSmoListeningIp(""), smoSubnetNbits(smoSubnetNbits),
 dataPort(dataPort), cmdPort(cmdPort), imuPort(imuPort),
 heartbeatActive(false),
@@ -572,7 +572,7 @@ private:
 		 * we will consider the handshake to have failed.
 		 */
 		timeoutTimer.expires_from_now(
-			boost::posix_time::milliseconds(device.handshakeTimeoutMs));
+			boost::posix_time::milliseconds(device.commandTimeoutMs));
 
 		timeoutTimer.async_wait(
 			std::bind(
@@ -651,7 +651,7 @@ private:
 		if (finalTimerFired
 			&& finalSocketState == SocketState::SOCKET_STILL_WAITING)
 		{
-			std::cerr << __func__ << ": Handshake timeout with "
+			std::cerr << __func__ << ": Command timeout with "
 				<< deviceIP << "(" << device.discoveredDevice.deviceIdentifier
 				<< ")" << std::endl;
 
@@ -1389,7 +1389,7 @@ protected:
 	{
 		// Setup timeout timer
 		timeoutTimer.expires_from_now(
-			boost::posix_time::milliseconds(device.handshakeTimeoutMs));
+			boost::posix_time::milliseconds(device.commandTimeoutMs));
 
 		timeoutTimer.async_wait(
 			std::bind(
@@ -1998,7 +1998,7 @@ public:
 	{
 		// Set up timeout timer
 		timeoutTimer.expires_from_now(boost::posix_time::milliseconds(
-			device.handshakeTimeoutMs));
+			device.commandTimeoutMs));
 		timeoutTimer.async_wait(
 			std::bind(&SetReturnModeReq::setReturnModeReq1_1,
 				this, request,
@@ -2245,7 +2245,7 @@ public:
 	{
 		// Set up timeout timer
 		timeoutTimer.expires_from_now(boost::posix_time::milliseconds(
-			device.handshakeTimeoutMs));
+			device.commandTimeoutMs));
 
 		timeoutTimer.async_wait(
 			std::bind(&GetReturnModeReq::getReturnModeReq1_1,