From 6e70e527f18786f823ccab5a557a8e88d4a0c066 Mon Sep 17 00:00:00 2001
From: David Wehr <dawehr@iastate.edu>
Date: Fri, 17 Mar 2017 20:10:13 -0500
Subject: [PATCH] Fixed compile errors.
---
quad/src/quad_app/log_data.c | 20 ++++++++++----------
quad/src/quad_app/log_data.h | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/quad/src/quad_app/log_data.c b/quad/src/quad_app/log_data.c
index 6c0a1698b..131fabbeb 100644
--- a/quad/src/quad_app/log_data.c
+++ b/quad/src/quad_app/log_data.c
@@ -29,7 +29,7 @@ struct graph_tuple { // Tuple for
struct str {
char* str;
- int size;
+ size_t size;
size_t capacity;
};
@@ -43,34 +43,34 @@ int row_size;
static char units_output_str[512] = {};
static char units_param_str[512] = {};
-static struct str units_output { .str = units_output_str, .size = 0, .capacity = sizeof(units_output_str)};
-static struct str units_param { .str = units_param_str, .size = 0 .capacity = sizeof(units_output_str)};
+static struct str units_output = { .str = units_output_str, .size = 0, .capacity = sizeof(units_output_str)};
+static struct str units_param = { .str = units_param_str, .size = 0, .capacity = sizeof(units_output_str)};
-void safe_strcat(struct str, char* to_add) {
+void safe_strcat(struct str str, char* to_add) {
size_t add_len = strlen(to_add);
if (add_len + str.size <= str.capacity) {
strcpy(&(str.str[str.size]), to_add);
- str.size += to_add;
+ str.size += add_len;
}
}
void addOutputToLog(log_t* log_struct, int controller_id, int output_id, char* units) {
- static units_buf[64];
+ static char units_buf[64];
if (n_outputs < MAX_LOG_NUM) {
log_outputs[n_outputs].block_id = controller_id;
log_outputs[n_outputs].sub_id = output_id;
n_outputs++;
- snprintf(units_buf, sizeof(units_buf) "\t%s", units);
+ snprintf(units_buf, sizeof(units_buf), "\t%s", units);
safe_strcat(units_output, units_buf);
}
}
void addParamToLog(log_t* log_struct, int controller_id, int param_id, char* units) {
- static units_buf[64];
+ static char units_buf[64];
if (n_params < MAX_LOG_NUM) {
log_params[n_params].block_id = controller_id;
log_params[n_params].sub_id = param_id;
n_params++;
- snprintf(units_buf, sizeof(units_buf) "\t%s", units);
+ snprintf(units_buf, sizeof(units_buf), "\t%s", units);
safe_strcat(units_param, units_buf);
}
}
@@ -167,7 +167,7 @@ void printLogging(hardware_t *hardware_struct, log_t* log_struct, parameter_t* p
// Let user know that allocation failed
if (arraySize != LOG_STARTING_SIZE) {
size_t send_len = sprintf(header1, "Failed to allocate enough log memory\n");
- send_data(hardware_struct, LOG_ID, 0, header1, send_len);
+ send_data(&hardware_struct->uart, LOG_ID, 0, header1, send_len);
return;
}
diff --git a/quad/src/quad_app/log_data.h b/quad/src/quad_app/log_data.h
index baa21990c..1dd2d1741 100644
--- a/quad/src/quad_app/log_data.h
+++ b/quad/src/quad_app/log_data.h
@@ -18,12 +18,12 @@ void initialize_logging(log_t* log_struct, parameter_t* ps);
/**
* Adds the given block output to the data to be logged
*/
-void addOutputToLog(log_t* log_struct, int controller_id, int output_id);
+void addOutputToLog(log_t* log_struct, int controller_id, int output_id, char* units);
/**
* Adds the given block parameter to the data to be logged
*/
-void addParamToLog(log_t* log_struct, int controller_id, int param_id);
+void addParamToLog(log_t* log_struct, int controller_id, int param_id, char* units);
/**
--
GitLab