Skip to content
Snippets Groups Projects
Commit 57b7c0c8 authored by bbartels's avatar bbartels Committed by dawehr
Browse files

wip: Fix rebase issue and don't use quad build for ci

parent 24677d86
No related branches found
No related tags found
No related merge requests found
......@@ -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
......@@ -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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment