From d667c35f236467e82282580f2914e43f0967256d Mon Sep 17 00:00:00 2001
From: Brendan Bartels <bbartels@iastate.edu>
Date: Tue, 14 Mar 2017 21:46:50 -0500
Subject: [PATCH] wip: Fix rebase issue and don't use quad build for ci
---
quad/Makefile | 5 +++--
quad/src/quad_app/log_data.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/quad/Makefile b/quad/Makefile
index 23e6684e2..f784e354f 100644
--- a/quad/Makefile
+++ b/quad/Makefile
@@ -7,7 +7,7 @@ BOOT = $(OUTDIR)/BOOT.bin
.PHONY: all libs zybo boot test clean deep-clean
-all: libs zybo boot
+all: libs
libs:
$(MAKE) -C src/test
@@ -23,6 +23,7 @@ boot: $(BOOT)
test:
$(MAKE) -C src/queue test
$(MAKE) -C src/computation_graph test
+ $(MAKE) -C src/quad_app test
clean:
rm -rf $(INCDIR) $(LIBDIR) $(OUTDIR)
@@ -39,4 +40,4 @@ $(OUTDIR):
mkdir $(OUTDIR)
$(BOOT): zybo | $(OUTDIR)
- bash scripts/create_zybo_boot.sh
\ No newline at end of file
+ bash scripts/create_zybo_boot.sh
diff --git a/quad/src/quad_app/log_data.c b/quad/src/quad_app/log_data.c
index f6a0ab21a..db9c7d363 100644
--- a/quad/src/quad_app/log_data.c
+++ b/quad/src/quad_app/log_data.c
@@ -135,7 +135,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(LOG_ID, 0, header1, send_len);
+ send_data(hardware_struct, LOG_ID, 0, header1, send_len);
return;
}
--
GitLab