modelec/TCPSocketServer
1
0
Fork 0
mirror of https://github.com/modelec/TCPSocketServer.git synced 2026-01-19 00:47:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

better map value

Browse Source
This commit is contained in:
ackimixs
2024-05-15 22:30:47 +02:00
parent 8db1229324
commit 92cdc869ac
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
TCPServer.cpp
View File

@@ -171,7 +171,7 @@ void TCPServer::handleMessage(const std::string& message, int clientSocket)
}
if (args[0] == "0") {
if (!handleEmergecnyFlag) {
int angle = TCPUtils::mapValue(value, -32767, 32768, - PI / 2, PI / 2);
int angle = static_cast<int>(TCPUtils::mapValue(value, -32767.0, 32768.0, - PI / 2, PI / 2));
this->broadcastMessage("strat;arduino;angle;" + std::to_string(angle) + "\n");
}
}
@@ -181,11 +181,11 @@ void TCPServer::handleMessage(const std::string& message, int clientSocket)
value = -value;
if (value < 0) {
speed = TCPUtils::mapValue(value, -32767, 0, -310, -70);
speed = static_cast<int>(TCPUtils::mapValue(value, -32767.0, 0.0, -310.0, -70.0));
} else if (value == 0) {
speed = 0; // Maps 0 to 0
} else {
speed = TCPUtils::mapValue(value, 70, 32768, 70, 310);
speed = static_cast<int>(TCPUtils::mapValue(value, 0.0, 32768.0, 70.0, 310.0));
}
if (!handleEmergecnyFlag) {
@@ -201,7 +201,7 @@ void TCPServer::handleMessage(const std::string& message, int clientSocket)
}
}
else if (args[0] == "2") {
int speed = TCPUtils::mapValue(value, -32767, 32768, -310, 310);
int speed = static_cast<int>(TCPUtils::mapValue(value, -32767.0, 32768.0, -310.0, 310.0));
this->broadcastMessage("start;arduino;rotate;" + std::to_string(speed));
}
}

4
utils.h
View File

@@ -26,8 +26,8 @@ namespace TCPUtils {
std::vector<std::string> split(const std::string& str, const std::string& delimiter);
template<typename T>
int mapValue(T v, int v_min, int v_max, int v_min_prime, int v_max_prime) {
return v_min_prime + (static_cast<int>(v) - v_min) * (v_max_prime - v_min_prime) / (v_max - v_min);
T mapValue(T v, T v_min, T v_max, T v_min_prime, T v_max_prime) {
return v_min_prime + (v - v_min) * (v_max_prime - v_min_prime) / (v_max - v_min);
}
}