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
5b02761f
Commit
5b02761f
authored
8 years ago
by
burneykb
Browse files
Options
Downloads
Patches
Plain Diff
Fixed makefile to conform to new oganization and use obj dir correctly
parent
6feb8355
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
groundStation/Makefile
+38
-24
38 additions, 24 deletions
groundStation/Makefile
groundStation/src/backend/backend.c
+4
-4
4 additions, 4 deletions
groundStation/src/backend/backend.c
groundStation/src/cli/monitorQuad.c
+4
-0
4 additions, 0 deletions
groundStation/src/cli/monitorQuad.c
with
46 additions
and
28 deletions
groundStation/Makefile
+
38
−
24
View file @
5b02761f
# Declaration of variables
# Generic Variables
GCC
=
gcc
GXX
=
g++
CFLAGS
=
-Wall
-Wpedantic
-Wextra
-Werror
-std
=
c99
-g
-Wno-unused-parameter
-Wno-unused-variable
-Wno-unused-function
-Wno-unused-but-set-variable
CXXFLAGS
=
-Wall
-Wpedantic
-Wextra
-Werror
-Wno-reorder
-Wno-unused-variable
-std
=
c++0x
-g
INCLUDES
=
$(
foreach
dir
,
$(
INCDIR
)
,
-I
$(
dir
))
# Directories
SRCDIR
=
src
INCDIR
=
inc src src/vrpn src/vrpn/quat src/vrpn/build
INCDIR
=
inc src/vrpn src/vrpn/quat src/vrpn/build
$(
BESRCDIR
)
$(
CLISRCDIR
)
LIBS
=
-lpthread
-lbluetooth
-lvrpn
-lquat
-Lsrc
/vrpn/build
-Lsrc
/vrpn/build/quat
OBJDIR
=
obj
# Final exacutable name
EXE
=
BackEnd
# Backend Specific Variables
BEBINARY
=
BackEnd
BESRCDIR
=
src/backend
BECSOURCES
:=
$(
wildcard
$(
BESRCDIR
)
/
*
.c
)
BECOBJECTS
=
$(
BECSOURCES:
$(
BESRCDIR
)
/%.c
=
$(
OBJDIR
)
/%.o
)
BECPPSOURCES
:=
$(
wildcard
$(
BESRCDIR
)
/
*
.cpp
)
BECPPOBJECTS
=
$(
BECPPSOURCES:
$(
BESRCDIR
)
/%.cpp
=
$(
OBJDIR
)
/%.o
)
# File names
CSOURCES
:=
$(
foreach
dir
,
$(
SRCDIR
)
,
$(
wildcard
$(
dir
)
/
*
.c
))
CPPSOURCES
:=
$(
foreach
dir
,
$(
SRCDIR
)
,
$(
wildcard
$(
dir
)
/
*
.cpp
))
COBJECTS
=
$(
CSOURCES:.c
=
.o
)
CPPOBJECTS
=
$(
CPPSOURCES:.cpp
=
.o
)
OBJECTS
=
$(
CPPOBJECTS
)
$(
COBJECTS
)
# CLI Specific Variables
CLISRCDIR
=
src/cli
CLISOURCES
:=
$(
wildcard
$(
CLISRCDIR
)
/
*
.c
)
CLIOBJECTS
=
$(
CLISOURCES:
$(
CLISRCDIR
)
/%.c
=
$(
OBJDIR
)
/%.o
)
CLIBINARIES
=
$(
notdir
$(
patsubst %.c,%,
$(
CLISOURCES
)))
LIBS
=
-lpthread
-lbluetooth
-lvrpn
-lquat
-Lsrc
/vrpn/build
-Lsrc
/vrpn/build/quat
OBJECTS
=
$(
CLIOBJECTS
)
$(
BECOBJECTS
)
$(
BECPPOBJECTS
)
# Default target
all
:
logs
$(EXE)
all
:
logs
objdir backend cli
vrpn
:
vrpn/build
# Main target
$(EXE)
:
$(OBJECTS)
$(
GXX
)
$(
CXXFLAGS
)
$^
-o
$@
$(
INCLUDES
)
$(
LIBS
)
cli
:
$(CLIOBJECTS) $(CLIBINARIES)
$(COBJECTS)
:
%.o :
%.c
$(
GCC
)
$(
CFLAGS
)
-c
$
<
-o
$@
$(
INCLUDES
)
$(
LIBS
)
$(C
LI
OBJECTS)
:
$(OBJDIR)/%.o : $(CLISRCDIR)/
%.c
$(
GCC
)
$(
CFLAGS
)
-c
$
^
-o
$@
$(
INCLUDES
)
$(
LIBS
)
$(CPPOBJECTS)
:
%.o : %.cpp
$(
GXX
)
$(
CXXFLAGS
)
-c
$<
-o
$@
$(
INCLUDES
)
$(
LIBS
)
$(CLIBINARIES)
:
% : $(OBJDIR)/%.o
$(
GCC
)
$(
CFLAGS
)
$^
-o
$@
$(
INCLUDES
)
$(
LIBS
)
backend
:
$(BECPPOBJECTS) $(BECOBJECTS)
$(
GXX
)
$(
CXXFLAGS
)
$^
-o
$(
BEBINARY
)
$(
INCLUDES
)
$(
LIBS
)
$(BECOBJECTS)
:
$(OBJDIR)/%.o : $(BESRCDIR)/%.c
$(
GCC
)
$(
CFLAGS
)
-c
$^
-o
$@
$(
INCLUDES
)
$(
LIBS
)
$(BECPPOBJECTS)
:
$(OBJDIR)/%.o : $(BESRCDIR)/%.cpp
$(
GXX
)
$(
CXXFLAGS
)
-c
$^
-o
$@
$(
INCLUDES
)
$(
LIBS
)
vrpn/build
:
mkdir
-p
src/vrpn/build
...
...
@@ -44,12 +56,14 @@ vrpn/build:
logs
:
mkdir
-p
logs
objdir
:
mkdir
-p
obj
clean_logs
:
rm
-f
logs/
*
clean
:
rm
-f
$(
EXE
)
$(
OBJECT
S
)
rm
-
r
f
$(
OBJDIR
)
/
$(
BEBINARY
)
$(
CLIBINARIE
S
)
debug
:
@
echo
$(
COBJECTS
)
@
echo
$(
CPPOBJECTS
)
@
echo
$(
CLIBINARIES
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
groundStation/src/backend/backend.c
+
4
−
4
View file @
5b02761f
...
...
@@ -334,7 +334,7 @@ void sendStartPacket() {
}
void
sendVrpnPacket
(
struct
ucart_vrpn_TrackerData
*
info
)
{
int
pSize
=
sizeof
(
ucart_vrpn_TrackerData
)
+
8
;
int
pSize
=
sizeof
(
struct
ucart_vrpn_TrackerData
)
+
8
;
int
n
;
unsigned
char
packet
[
pSize
];
currMessageID
++
;
...
...
@@ -344,9 +344,9 @@ void sendVrpnPacket(struct ucart_vrpn_TrackerData *info) {
//TODO Figure out Packet ID with this new ucar_vrpn_TrackerData struct
packet
[
3
]
=
(
currMessageID
&
0x000000ff
);
// MSG ID(1)
packet
[
4
]
=
((
currMessageID
>>
8
)
&
0x000000ff
);
// MSG ID(2)
packet
[
5
]
=
(
sizeof
(
ucart_vrpn_TrackerData
)
&
0x000000ff
);
// DATALEN(1)
packet
[
6
]
=
((
sizeof
(
ucart_vrpn_TrackerData
)
>>
8
)
&
0x00000ff
);
// DATALEN(2)
memcpy
(
&
packet
[
7
],
&
info
,
sizeof
(
ucart_vrpn_TrackerData
));
packet
[
5
]
=
(
sizeof
(
struct
ucart_vrpn_TrackerData
)
&
0x000000ff
);
// DATALEN(1)
packet
[
6
]
=
((
sizeof
(
struct
ucart_vrpn_TrackerData
)
>>
8
)
&
0x00000ff
);
// DATALEN(2)
memcpy
(
&
packet
[
7
],
&
info
,
sizeof
(
struct
ucart_vrpn_TrackerData
));
char
checksum
=
0
;
int
i
;
...
...
This diff is collapsed.
Click to expand it.
groundStation/src/cli/monitorQuad.c
0 → 100644
+
4
−
0
View file @
5b02761f
int
main
(
int
argc
,
char
**
argv
)
{
return
0
;
}
\ No newline at end of file
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