Refactoring

This commit is contained in:
2024-06-03 16:17:27 +02:00
parent 7264811444
commit ffb90c001d
4 changed files with 10 additions and 9 deletions

View File

@@ -24,6 +24,7 @@ const char* getServerURL = "http://145.92.8.132:443/get-ip";
String ipAddress = ""; // string that will hold the server's IP address
const char* Connectivity::fetchIPAddress() {
char* ipAddress = NULL; // Declare ipAddress as a char*
if (WiFi.status() == WL_CONNECTED) {
HTTPClient http;
WiFiClient client;
@@ -33,7 +34,7 @@ const char* Connectivity::fetchIPAddress() {
if (httpCode > 0) {
if (httpCode == HTTP_CODE_OK) {
// If successful (code 200), read the response body and store the IP address
ipAddress = http.getString();
ipAddress = strdup(http.getString().c_str());
}
} else {
Serial.printf("GET request failed, error: %s\n", http.errorToString(httpCode).c_str());

View File

@@ -37,7 +37,7 @@ struct acceleration {
accelData.z,
"data");
// %d = int, %f = floatation, %s = string
connectivity.httpPost(serverIp, "/", 3445, buffer, strlen(buffer), "application/json");
connectivity.httpPost("192.168.137.30", "/", 3445, buffer, strlen(buffer), "application/json");
lastTime = currentTime;
}
}

View File

@@ -17,14 +17,14 @@ void SensorManager::sensorSetup() {
// myIMU.enableStepCounter(500); //Send data update every 500ms
}
//get sensordata
SensorManager::RotationQuintillions SensorManager::getQuintillions() {
SensorManager::RotationQuaternions SensorManager::getQuaternions() {
if (myIMU.dataAvailable() == true) {
float i = myIMU.getQuatI();
float j = myIMU.getQuatJ();
float k = myIMU.getQuatK();
float w = myIMU.getQuatReal();
RotationQuintillions rotation = { i, j, k, w };
RotationQuaternions rotation = { i, j, k, w };
return rotation;
} else {
float i = myIMU.getQuatI();
@@ -32,13 +32,13 @@ SensorManager::RotationQuintillions SensorManager::getQuintillions() {
float k = myIMU.getQuatK();
float w = myIMU.getQuatReal();
RotationQuintillions rotation = { i, j, k, w };
RotationQuaternions rotation = { i, j, k, w };
return rotation;
}
}
//calculate Quintillions to Euler angles from -1π to +1π
//calculate Quaternions to Euler angles from -1π to +1π
SensorManager::eulerAngles SensorManager::getEulerAngles() {
SensorManager::RotationQuintillions rotation = getQuintillions();
SensorManager::RotationQuaternions rotation = getQuaternions();
float roll = atan2(2.0f * (rotation.w * rotation.i + rotation.j * rotation.k), 1.0f - 2.0f * (rotation.i * rotation.i + rotation.j * rotation.j));
float pitch = asin(2.0f * (rotation.w * rotation.j - rotation.k * rotation.i));
float yaw = atan2(2.0f * (rotation.w * rotation.k + rotation.i * rotation.j), 1.0f - 2.0f * (rotation.j * rotation.j + rotation.k * rotation.k));

View File

@@ -23,13 +23,13 @@ public:
acceleration getAcelleration();
bool sensorTap();
private:
struct RotationQuintillions {
struct RotationQuaternions {
float i;
float j;
float k;
float w;
};
RotationQuintillions getQuintillions();
RotationQuaternions getQuaternions();
BNO080 myIMU;
};