Fixed bug with sysclock where sensor context size was not set correctly.

CarletonURocketry · May 11, 2024 · 8de60ed · 8de60ed
1 parent 50cc989
commit 8de60ed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/main.c b/src/main.c
@@ -159,10 +159,12 @@ int main(int argc, char **argv) {
     }
 
     // Read all sensor data
+    errno_t read_result; // The result of a sensor read
+    size_t nbytes;       // The number of bytes returned by a sensor read
+
     while (!endless) {
-        errno_t read_result; // The result of a sensor read
-        size_t nbytes;       // The number of bytes returned by a sensor read
-        for (uint8_t i = 0; i < sizeof(sensors) / sizeof(sensors[0]); i++) {
+
+        for (uint8_t i = 0; i < MAX_SENSORS; i++) {
             Sensor sensor = sensors[i];              // Grab the current sensor
             uint8_t data[sensor_max_dsize(&sensor)]; // Allocate sufficient data to read the sensor
 

diff --git a/src/sensors/sensor_api.c b/src/sensors/sensor_api.c
@@ -27,10 +27,10 @@ const SensorTagData SENSOR_TAG_DATA[] = {
                           .dsize = sizeof(vec3d_t),
                           .dtype = TYPE_VEC3D},
     [TAG_ANGULAR_VEL] = {.name = "Angular velocity",
-                           .unit = "dps",
-                           .fmt_str = "%.2fX, %.2fY, %.2fZ",
-                           .dsize = sizeof(vec3d_t),
-                           .dtype = TYPE_VEC3D},
+                         .unit = "dps",
+                         .fmt_str = "%.2fX, %.2fY, %.2fZ",
+                         .dsize = sizeof(vec3d_t),
+                         .dtype = TYPE_VEC3D},
 };
 
 /**

diff --git a/src/sensors/sysclock/sysclock.c b/src/sensors/sysclock/sysclock.c
@@ -4,7 +4,6 @@
  */
 #include "sysclock.h"
 #include "../sensor_api.h"
-#include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
 #include <time.h>
@@ -101,7 +100,7 @@ void sysclock_init(Sensor *sensor, const int bus, const uint8_t addr, const Sens
     sensor->precision = precision;
     sensor->loc = (SensorLocation){.bus = bus, .addr = {.addr = (addr & 0x7F), .fmt = I2C_ADDRFMT_7BIT}};
     sensor->tag_list = (SensorTagList){.tags = TAGS, .len = sizeof(TAGS) / sizeof(SensorTag)};
-    sensor->context.size = sizeof(long);
+    sensor->context.size = sizeof(SysClockContext);
     sensor->open = &sysclock_open;
     sensor->read = &sysclock_read;
 }