From f17e6ad02f883cd03e5b3dea3e84b85bb7b1a8b0 Mon Sep 17 00:00:00 2001
From: James Talbert <jtalbert@iastate.edu>
Date: Tue, 30 Apr 2019 12:39:33 -0500
Subject: [PATCH] Fixed issue with the unix compile for tests
---
quad/src/quad_app/callbacks.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/quad/src/quad_app/callbacks.c b/quad/src/quad_app/callbacks.c
index 3de4b471c..eccc1f8fe 100644
--- a/quad/src/quad_app/callbacks.c
+++ b/quad/src/quad_app/callbacks.c
@@ -40,7 +40,7 @@ int cb_packetlog(struct modular_structs* structs, struct metadata *meta, u8 *dat
n_msg_received += 1;
total_payload_received += length;
int len = sprintf(buf, "Packets received: %d", n_msg_received);
- send_data(structs->hardware_struct.comm.uart, PACKETLOG_ID, 0, buf, len);
+ send_data(structs->hardware_struct.comm.uart, PACKETLOG_ID, 0, (u8*)buf, len);
return 0;
}
@@ -54,7 +54,7 @@ int cb_getpacketlogs(struct modular_structs* structs, struct metadata *meta, u8
// Message logging number of messages received and size of payload received
int len = snprintf((char*)buf, sizeof buf, "%d,%lu", n_msg_received, total_payload_received);
- send_data(structs->hardware_struct.comm.uart, LOG_ID, 0, buf, len >= sizeof(buf) ? 255 : len + 1);
+ send_data(structs->hardware_struct.comm.uart, LOG_ID, 0, (u8*)buf, len >= sizeof(buf) ? 255 : len + 1);
return 0;
}
@@ -437,10 +437,6 @@ int cb_addnode(struct modular_structs *structs, struct metadata *meta, unsigned
int cb_overrideoutput(struct modular_structs *structs, struct metadata *meta, unsigned char *data, unsigned short length) {
override_t* override_info = &structs->override_struct;
-
- int offset_mode = offsetof(override_t, mode);
- int offset_values = offsetof(override_t, values);
- int offset_value0 = offsetof(override_t, values[0]);
int num_overrides = sizeof(structs->override_struct.values)
/ sizeof(*structs->override_struct.values);
--
GitLab