Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MicroCART
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Distributed Autonomous Networked Control Lab
MicroCART
Commits
d667c35f
Commit
d667c35f
authored
8 years ago
by
bbartels
Committed by
dawehr
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wip: Fix rebase issue and don't use quad build for ci
parent
cfab8a89
No related branches found
No related tags found
1 merge request
!9
Abstract the hardware layer
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
quad/Makefile
+3
-2
3 additions, 2 deletions
quad/Makefile
quad/src/quad_app/log_data.c
+1
-1
1 addition, 1 deletion
quad/src/quad_app/log_data.c
with
4 additions
and
3 deletions
quad/Makefile
+
3
−
2
View file @
d667c35f
...
@@ -7,7 +7,7 @@ BOOT = $(OUTDIR)/BOOT.bin
...
@@ -7,7 +7,7 @@ BOOT = $(OUTDIR)/BOOT.bin
.PHONY
:
all libs zybo boot test clean deep-clean
.PHONY
:
all libs zybo boot test clean deep-clean
all
:
libs
zybo boot
all
:
libs
libs
:
libs
:
$(
MAKE
)
-C
src/test
$(
MAKE
)
-C
src/test
...
@@ -23,6 +23,7 @@ boot: $(BOOT)
...
@@ -23,6 +23,7 @@ boot: $(BOOT)
test
:
test
:
$(
MAKE
)
-C
src/queue
test
$(
MAKE
)
-C
src/queue
test
$(
MAKE
)
-C
src/computation_graph
test
$(
MAKE
)
-C
src/computation_graph
test
$(
MAKE
)
-C
src/quad_app
test
clean
:
clean
:
rm
-rf
$(
INCDIR
)
$(
LIBDIR
)
$(
OUTDIR
)
rm
-rf
$(
INCDIR
)
$(
LIBDIR
)
$(
OUTDIR
)
...
@@ -39,4 +40,4 @@ $(OUTDIR):
...
@@ -39,4 +40,4 @@ $(OUTDIR):
mkdir
$(
OUTDIR
)
mkdir
$(
OUTDIR
)
$(BOOT)
:
zybo | $(OUTDIR)
$(BOOT)
:
zybo | $(OUTDIR)
bash scripts/create_zybo_boot.sh
bash scripts/create_zybo_boot.sh
\ No newline at end of file
This diff is collapsed.
Click to expand it.
quad/src/quad_app/log_data.c
+
1
−
1
View file @
d667c35f
...
@@ -135,7 +135,7 @@ void printLogging(hardware_t *hardware_struct, log_t* log_struct, parameter_t* p
...
@@ -135,7 +135,7 @@ void printLogging(hardware_t *hardware_struct, log_t* log_struct, parameter_t* p
// Let user know that allocation failed
// Let user know that allocation failed
if
(
arraySize
!=
LOG_STARTING_SIZE
)
{
if
(
arraySize
!=
LOG_STARTING_SIZE
)
{
size_t
send_len
=
sprintf
(
header1
,
"Failed to allocate enough log memory
\n
"
);
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
;
return
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment