Formatting

CarletonURocketry · Jun 11, 2024 · 8149e90 · 8149e90
1 parent c50a3ec
commit 8149e90
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/src/collectors/lsm6dso32_clctr.c b/src/collectors/lsm6dso32_clctr.c
@@ -1,7 +1,7 @@
 #include "../drivers/lsm6dso32/lsm6dso32.h"
 #include "../drivers/sensor_api.h"
-#include "collectors.h"
 #include "../logging-utils/logging.h"
+#include "collectors.h"
 #include <stdio.h>
 
 #define return_err(err) return (void *)((uint64_t)errno)
@@ -17,7 +17,7 @@ void *lsm6dso32_collector(void *args) {
     mqd_t sensor_q = mq_open(SENSOR_QUEUE, O_WRONLY);
     if (sensor_q == -1) {
         log_print(stderr, LOG_ERROR, "LSM6DSO32 collector could not open message queue '%s': '%s'", SENSOR_QUEUE,
-                    strerror(errno));
+                  strerror(errno));
         return_err(err);
     }
 

diff --git a/src/collectors/pac195x_clctr.c b/src/collectors/pac195x_clctr.c
@@ -1,6 +1,6 @@
+#include "../logging-utils/logging.h"
 #include "collectors.h"
 #include "drivers/pac195x/pac195x.h"
-#include "../logging-utils/logging.h"
 #include <stdio.h>
 
 /** Macro to early return errors. */
@@ -15,7 +15,7 @@ void *pac1952_2_collector(void *args) {
     mqd_t sensor_q = mq_open(SENSOR_QUEUE, O_WRONLY);
     if (sensor_q == -1) {
         log_print(stderr, LOG_ERROR, "PAC195X collector could not open message queue '%s': '%s'", SENSOR_QUEUE,
-                    strerror(errno));
+                  strerror(errno));
         return_err(err);
     }
 

diff --git a/src/collectors/sht41_clctr.c b/src/collectors/sht41_clctr.c
@@ -20,7 +20,7 @@ void *sht41_collector(void *args) {
     mqd_t sensor_q = mq_open(SENSOR_QUEUE, O_WRONLY);
     if (sensor_q == -1) {
         log_print(stderr, LOG_ERROR, "SHT41 collector could not open message queue '%s': '%s'", SENSOR_QUEUE,
-                    strerror(errno));
+                  strerror(errno));
         return (void *)((uint64_t)errno);
     }
 

diff --git a/src/collectors/sysclock_clctr.c b/src/collectors/sysclock_clctr.c
@@ -1,6 +1,6 @@
 #include "../drivers/sensor_api.h"
-#include "collectors.h"
 #include "../logging-utils/logging.h"
+#include "collectors.h"
 #include <errno.h>
 #include <stdio.h>
 #include <sys/time.h>
@@ -22,7 +22,7 @@ void *sysclock_collector(void *args) {
     mqd_t sensor_q = mq_open(SENSOR_QUEUE, O_WRONLY);
     if (sensor_q == -1) {
         log_print(stderr, LOG_ERROR, "Sysclock collector could not open message queue '%s': '%s'", SENSOR_QUEUE,
-                    strerror(errno));
+                  strerror(errno));
         return (void *)((uint64_t)errno);
     }
 

diff --git a/src/main.c b/src/main.c
@@ -4,11 +4,11 @@
  *
  * The main function for the fetcher module, where program logic is used to create a console application.
  */
+#include "../logging-utils/logging.h"
 #include "board-id/board_id.h"
 #include "collectors/collectors.h"
 #include "drivers/m24c0x/m24c0x.h"
 #include "drivers/sensor_api.h"
-#include "../logging-utils/logging.h"
 #include <devctl.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -106,15 +106,15 @@ int main(int argc, char **argv) {
     mqd_t sensor_q = mq_open(SENSOR_QUEUE, O_CREAT | O_RDONLY, S_IWOTH | S_IRUSR, &q_attr);
     if (sensor_q == -1) {
         log_print(stderr, LOG_ERROR, "Could not create internal queue '%s' with error: '%s'", SENSOR_QUEUE,
-                    strerror(errno));
+                  strerror(errno));
         exit(EXIT_FAILURE);
     }
 
     // Get message queue attributes since it's necessary to know max message size for receiving
     struct mq_attr sensor_q_attr;
     if (mq_getattr(sensor_q, &sensor_q_attr) == -1) {
         log_print(stderr, LOG_ERROR, "Failed to get attributes of message queue '%s': '%s'", SENSOR_QUEUE,
-                    strerror(errno));
+                  strerror(errno));
         exit(EXIT_FAILURE);
     }
 
@@ -208,8 +208,7 @@ int main(int argc, char **argv) {
     while (print_output) {
         if (mq_receive(sensor_q, (char *)&recv_msg, sensor_q_attr.mq_msgsize, NULL) == -1) {
             // Handle error without exiting
-            log_print(stderr, LOG_ERROR, "Failed to receive message on queue '%s': %s", SENSOR_QUEUE,
-                        strerror(errno));
+            log_print(stderr, LOG_ERROR, "Failed to receive message on queue '%s': %s", SENSOR_QUEUE, strerror(errno));
             continue;
         }
         // Successfully received data, print it to output stream