From 7e60d5e5e611808df5119ea79b0b5e9de49e053e Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Wed, 29 May 2024 15:35:29 +0200 Subject: [PATCH] fixed type error causing bootloop --- .../arduino/Movement-sensor-code/Connectivity.cpp | 2 +- .../Movement-sensor-code/Movement-sensor-code.ino | 15 +++++---------- code/arduino/Movement-sensor-code/headerFIle.h | 4 +++- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/code/arduino/Movement-sensor-code/Connectivity.cpp b/code/arduino/Movement-sensor-code/Connectivity.cpp index a1c30c4..367e114 100644 --- a/code/arduino/Movement-sensor-code/Connectivity.cpp +++ b/code/arduino/Movement-sensor-code/Connectivity.cpp @@ -4,7 +4,7 @@ void Connectivity::connectWiFi(char* ssid, char* pass){ WiFi.mode(WIFI_STA); WiFi.begin(ssid, pass); while (WiFi.status() != WL_CONNECTED) { - Serial.println("connecting to wifi"); + // Serial.println("connecting to wifi"); delay(1000); } Serial.println(WiFi.localIP()); diff --git a/code/arduino/Movement-sensor-code/Movement-sensor-code.ino b/code/arduino/Movement-sensor-code/Movement-sensor-code.ino index 89ac75b..35b30bb 100644 --- a/code/arduino/Movement-sensor-code/Movement-sensor-code.ino +++ b/code/arduino/Movement-sensor-code/Movement-sensor-code.ino @@ -1,31 +1,27 @@ #include "headerFile.h" // SensorManager::Rotation offset; -#define BUFFER_SIZE 1024 - -#define DEVICE_ID 1 - -char *buffer = (char *)malloc(sizeof(char) * BUFFER_SIZE); void setup() { - Serial.begin(9600); + // Serial.begin(9600); // Serial.println("startup"); //connect to internet and start sensor connectivity.connectWiFi(ssid, pass); sensorManager.sensorSetup(); } +unsigned long lastTime = 0; // will store the last time the code was run + void loop() { SensorManager::eulerAngles eulerRotation = sensorManager.getEulerAngles(); SensorManager::acceleration rotationAcceleration = sensorManager.getAcelleration(); - unsigned long lastTime = 0; // will store the last time the code was run unsigned long currentTime = millis(); if (currentTime - lastTime >= 100) { // 100 ms has passed memset(buffer, 0, BUFFER_SIZE); sprintf( buffer, - "{\"deviceId\": %d, \"rotationX\": %d, \"rotationY\": %d, \"rotationZ\": %d, \"accelerationX\": %d, \"accelerationY\": %d, \"accelerationZ\": %d, \"type\": %s}", + "{\"deviceId\": %d, \"rotationX\": %f, \"rotationY\": %f, \"rotationZ\": %f, \"accelerationX\": %f, \"accelerationY\": %f, \"accelerationZ\": %f, \"type\": %s}", DEVICE_ID, eulerRotation.roll, eulerRotation.pitch, @@ -34,8 +30,7 @@ void loop() { rotationAcceleration.y, rotationAcceleration.z, "data"); - // Serial.println(connectivity.httpPost("192.168.137.45", "/", 3445, message.c_str(), message.length(), "json")); - // Serial.println(message); + // %d = int, %f = floatation, %s = string connectivity.httpPost("192.168.137.45", "/", 3445, buffer, strlen(buffer), "application/json"); lastTime = currentTime; } diff --git a/code/arduino/Movement-sensor-code/headerFIle.h b/code/arduino/Movement-sensor-code/headerFIle.h index b7b8220..b065b3e 100644 --- a/code/arduino/Movement-sensor-code/headerFIle.h +++ b/code/arduino/Movement-sensor-code/headerFIle.h @@ -8,6 +8,8 @@ Connectivity connectivity; WebSocketsClient webSocket; #define USE_SERIAL Serial - #define ssid "1235678i" #define pass "12345678" +#define BUFFER_SIZE 1024 +#define DEVICE_ID 1 +char *buffer = (char *)malloc(sizeof(char) * BUFFER_SIZE);