Smikkelbakje/J1B4-Fitbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comments and cleanup

Browse Source
This commit is contained in:
Sam Hos
2024-06-05 13:56:23 +02:00
parent fbca5ce351
commit d0c74c4e25
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/arduino/Movement-sensor-code/Connectivity.h
View File

@@ -1,5 +1,5 @@
#ifndef Connectivity_h #ifndef MOVEMENTSENSORCODE_CONNECTIVITY_h
#define Connectivity_h #define MOVEMENTSENSORCODE_CONNECTIVITY_h
#include "Arduino.h" #include "Arduino.h"
#include <WebSocketsClient.h> #include <WebSocketsClient.h>
@@ -30,4 +30,4 @@ private:
}; };
#endif #endif // MOVEMENTSENSORCODE_CONNECTIVITY_h

20
code/arduino/Movement-sensor-code/Movement-sensor-code.ino
View File

@@ -9,9 +9,10 @@ void setup() {
} }
void loop() { void loop() {
SensorManager::RotationQuaternions Rotation = sensorManager.getQuaternions(); SensorManager::eulerAngles Rotation = sensorManager.getEulerAngles();
// SensorManager::acceleration rotationAcceleration = sensorManager.getAcelleration();
//static structure
// TODO: redo json for esp8266 and in android studio
struct acceleration { struct acceleration {
float x = 9; float x = 9;
float y = 9; float y = 9;
@@ -19,22 +20,22 @@ struct acceleration {
} accelData; } accelData;
if (!ipAquired) { if (!ipAquired) {
serverIp = connectivity.fetchIPAddress(); // Assign the value here serverIp = connectivity.fetchIPAddress(); //Fetch pepper ip address
ipAquired = true; ipAquired = true;
} }
unsigned long lastTime = 0; // will store the last time the code was run unsigned long lastTime = 0; // will store the last time the code was run
unsigned long currentTime = millis(); unsigned long currentTime = millis();
if (currentTime - lastTime >= 100) { // 100 ms has passed if (currentTime - lastTime >= 100) { // do everything inside every 100 ms
memset(buffer, 0, BUFFER_SIZE); memset(buffer, 0, BUFFER_SIZE);
sprintf( sprintf(
buffer, buffer,
"{\"deviceId\": %d, \"rotationX\": %f, \"rotationY\": %f, \"rotationZ\": %f, \"accelerationX\": %f, \"accelerationY\": %f, \"accelerationZ\": %f, \"type\": %s}", "{\"deviceId\": %d, \"rotationX\": %f, \"rotationY\": %f, \"rotationZ\": %f, \"accelerationX\": %f, \"accelerationY\": %f, \"accelerationZ\": %f, \"type\": %s}",
DEVICE_ID, DEVICE_ID,
Rotation.i, Rotation.roll,
Rotation.j, Rotation.pitch,
Rotation.k, Rotation.yaw,
Rotation.w, accelData.x,
accelData.y, accelData.y,
accelData.z, accelData.z,
"data"); "data");
@@ -45,6 +46,3 @@ struct acceleration {
lastTime = currentTime; lastTime = currentTime;
} }
} }
//acceleration.X
//acceleration.Y
//acceleration.Z

10
code/arduino/Movement-sensor-code/SensorManager.h
View File

@@ -1,5 +1,5 @@
#ifndef SensorManager_h #ifndef MOVEMENTSENSORCODE_SENSORMANAGER_H
#define SensorManager_h #define MOVEMENTSENSORCODE_SENSORMANAGER_H
#include "Arduino.h" #include "Arduino.h"
#include "SparkFun_BNO080_Arduino_Library.h" #include "SparkFun_BNO080_Arduino_Library.h"
@@ -23,6 +23,8 @@ public:
acceleration getAcelleration(); acceleration getAcelleration();
bool sensorTap(); bool sensorTap();
private:
struct RotationQuaternions { struct RotationQuaternions {
float i; float i;
float j; float j;
@@ -31,9 +33,7 @@ public:
}; };
RotationQuaternions getQuaternions(); RotationQuaternions getQuaternions();
private:
BNO080 myIMU; BNO080 myIMU;
}; };
#endif #endif // MOVEMENTSENSORCODE_SENSORMANAGER_H

7
code/arduino/Movement-sensor-code/headerFIle.h
View File

@@ -8,11 +8,10 @@ Connectivity connectivity;
WebSocketsClient webSocket; WebSocketsClient webSocket;
#define USE_SERIAL Serial #define USE_SERIAL Serial
#define ssid "msi 5556" #define ssid "1235678i"
#define pass "abc12345" #define pass "12345678"
#define BUFFER_SIZE 1024 #define BUFFER_SIZE 1024
#define DEVICE_ID 1 #define DEVICE_ID 0
#define IP_ADDRESS "192.168.137.12"
char *buffer = (char *)malloc(sizeof(char) * BUFFER_SIZE); char *buffer = (char *)malloc(sizeof(char) * BUFFER_SIZE);
const char* serverIp = NULL; // Declare serverIp here const char* serverIp = NULL; // Declare serverIp here