Skip to content
Snippets Groups Projects
Commit 41e5a469 authored by bbartels's avatar bbartels
Browse files

Merge branch 'groundStation-dev-comp_graph-commands' of...

Merge branch 'groundStation-dev-comp_graph-commands' of git.ece.iastate.edu:danc/MicroCART_17-18 into groundStation-dev-comp_graph-commands
parents a358ad23 75f3c300
No related branches found
No related tags found
No related merge requests found
Showing
with 116 additions and 79 deletions
...@@ -4,4 +4,4 @@ set -e ...@@ -4,4 +4,4 @@ set -e
# Quad Libraries and Boot image # Quad Libraries and Boot image
(cd quad && make) (cd quad && make)
(cd groundstation && make) (cd groundStation && make)
...@@ -10,11 +10,6 @@ INCDIR=../quad/inc src/vrpn src/vrpn/quat src/vrpn/build $(BESRCDIR) $(CLISRCDIR ...@@ -10,11 +10,6 @@ INCDIR=../quad/inc src/vrpn src/vrpn/quat src/vrpn/build $(BESRCDIR) $(CLISRCDIR
LIBS= -lpthread -lbluetooth -lvrpn -lquat -Lsrc/vrpn/build -Lsrc/vrpn/build/quat -lcomputation_graph -L../quad/lib -lcommands LIBS= -lpthread -lbluetooth -lvrpn -lquat -Lsrc/vrpn/build -Lsrc/vrpn/build/quat -lcomputation_graph -L../quad/lib -lcommands
OBJDIR=obj OBJDIR=obj
# Common Objects
# COMSRCDIR=../common
# COMSOURCES := $(wildcard $(COMSRCDIR)/*.c )
# COMOBJECTS = $(COMSOURCES:$(COMSRCDIR)/%.c=$(OBJDIR)/%.o)
# Backend Specific Variables # Backend Specific Variables
BEBINARY=BackEnd BEBINARY=BackEnd
BESRCDIR=src/backend BESRCDIR=src/backend
...@@ -39,7 +34,10 @@ FECOBJECTS = $(FECSOURCES:$(FESRCDIR)/%.c=$(OBJDIR)/%.o) ...@@ -39,7 +34,10 @@ FECOBJECTS = $(FECSOURCES:$(FESRCDIR)/%.c=$(OBJDIR)/%.o)
OBJECTS=$(CLIOBJECTS) $(BECOBJECTS) $(BECPPOBJECTS) $(FECOBJECTS) OBJECTS=$(CLIOBJECTS) $(BECOBJECTS) $(BECPPOBJECTS) $(FECOBJECTS)
# Default target # Default target
all: logs objdir backend cli $(SYMLINKS) all: quad logs objdir backend cli $(SYMLINKS)
quad:
$(MAKE) -C ../quad
$(SYMLINKS): $(CLIBINARY) $(SYMLINKS): $(CLIBINARY)
$(foreach symlink, $(SYMLINKS), ln -s $(CLIBINARY) $(symlink);) $(foreach symlink, $(SYMLINKS), ln -s $(CLIBINARY) $(symlink);)
......
...@@ -82,7 +82,8 @@ static void quad_recv(); ...@@ -82,7 +82,8 @@ static void quad_recv();
static int wasDisconnected(int fd); static int wasDisconnected(int fd);
/* handle controller responses from quad to frontend */ /* handle controller responses from quad to frontend */
static void handleResponse(struct metadata *m, uint8_t * data); static void handleResponse(struct metadata *m, uint8_t * data);
/* Create new dynamic logfile name */
char * create_log_name(char * buffer, size_t max);
/* Thread-safe wrappers */ /* Thread-safe wrappers */
pthread_mutex_t quadSocketMutex; pthread_mutex_t quadSocketMutex;
...@@ -113,6 +114,8 @@ fd_set rfds_master; ...@@ -113,6 +114,8 @@ fd_set rfds_master;
int max_fd = 0; int max_fd = 0;
static FILE * quadlog_file; static FILE * quadlog_file;
static int quadlog_file_open;
static char user_specified_log_name[256] = "";
pthread_mutex_t quadResponseMutex, cliInputMutex ; pthread_mutex_t quadResponseMutex, cliInputMutex ;
unsigned char *commandBuf; unsigned char *commandBuf;
...@@ -131,8 +134,6 @@ int main(int argc, char **argv) ...@@ -131,8 +134,6 @@ int main(int argc, char **argv)
{ {
int activity; int activity;
FD_ZERO(&rfds_master); FD_ZERO(&rfds_master);
char log_file[256] = "logs/";
/* /*
* Create backend listening socket * Create backend listening socket
*/ */
...@@ -203,30 +204,15 @@ int main(int argc, char **argv) ...@@ -203,30 +204,15 @@ int main(int argc, char **argv)
if(argc >= 2) if(argc >= 2)
{ {
strncat(log_file, argv[1], strlen(argv[1])); strncat(user_specified_log_name, argv[1], strlen(argv[1]));
} else {
time_t rawtime;
char timestr [30];
time(&rawtime);
sprintf(timestr,"%s",ctime(&rawtime));
// Lets convert space to _ in
char *p = timestr;
size_t i = 0;
while(i < strlen(timestr))
{
if (*p == ' ')
*p = '_';
i++;
p++;
}
// timestr has a weird char at the end of it.
// we will not include it in our file name
strncat(log_file, timestr, strlen(timestr) -1 );
strcat(log_file, ".txt");
} }
char log_file[256];
create_log_name(log_file, 256);
printf("Creating log file '%s'...\n",log_file); printf("Creating log file '%s'...\n",log_file);
quadlog_file = fopen(log_file, "a"); quadlog_file = fopen(log_file, "a");
quadlog_file_open = 1;
// Tell the quad we are ready to send it vrpn data // Tell the quad we are ready to send it vrpn data
sendStartPacket(); sendStartPacket();
...@@ -811,6 +797,12 @@ static void quad_recv() { ...@@ -811,6 +797,12 @@ static void quad_recv() {
switch (m.msg_type) { switch (m.msg_type) {
case LOG_ID: case LOG_ID:
if (!quadlog_file_open) {
char log_file[256];
create_log_name(log_file, 256);
printf("New log file created: '%s'\n", log_file);
quadlog_file = fopen(log_file, "a");
}
/* something like this */ /* something like this */
printf("(Quad) : Log found\n"); printf("(Quad) : Log found\n");
fwrite((char *) data, sizeof(char), m.data_len, quadlog_file); fwrite((char *) data, sizeof(char), m.data_len, quadlog_file);
...@@ -823,6 +815,12 @@ static void quad_recv() { ...@@ -823,6 +815,12 @@ static void quad_recv() {
case RESPADDNODE_ID: case RESPADDNODE_ID:
handleResponse(&m, data); handleResponse(&m, data);
break; break;
case LOG_END_ID:
if (quadlog_file_open) {
fclose(quadlog_file);
quadlog_file_open = 0;
}
break;
default: default:
printf("(Backend): message type %d ignored from quad\n", m.msg_type); printf("(Backend): message type %d ignored from quad\n", m.msg_type);
} }
...@@ -907,3 +905,25 @@ void findTimeDiff(int respID) { ...@@ -907,3 +905,25 @@ void findTimeDiff(int respID) {
timeval_subtract(&result, &tend, &timeArr[respID%MAX_HASH_SIZE]); timeval_subtract(&result, &tend, &timeArr[respID%MAX_HASH_SIZE]);
printf("(BackEnd): Elapsed time = %ld ms\n", result.tv_usec/1000); printf("(BackEnd): Elapsed time = %ld ms\n", result.tv_usec/1000);
} }
char * create_log_name(char * buffer, size_t max) {
static const char * prefix = "logs";
static size_t num_logs = 0;
static const char * format_string = "%Y-%m-%e_%-l:%M";
time_t curr_time;
char c_time_string[256];
struct tm * tmp;
curr_time = time(NULL);
tmp = localtime(&curr_time);
strftime(c_time_string, 256, format_string, tmp);
if(strcmp(user_specified_log_name, "") == 0) {
sprintf(buffer, "%s/%s_%lu.txt", prefix, c_time_string, num_logs++);
} else {
sprintf(buffer, "%s/%s_%lu.txt", prefix, user_specified_log_name, num_logs++);
}
return buffer;
}
\ No newline at end of file
...@@ -39,7 +39,7 @@ enum MessageTypeID{ ...@@ -39,7 +39,7 @@ enum MessageTypeID{
UPDATE_ID, // 03 UPDATE_ID, // 03
BEGINUPDATE_ID, // 04 BEGINUPDATE_ID, // 04
LOG_ID, // 05 LOG_ID, // 05
RESPONSE_ID, // 06 LOG_END_ID, // 06 - Responding with controller parameters. Example: PID constants
SETPARAM_ID, // 07 - Setting node parameters. SETPARAM_ID, // 07 - Setting node parameters.
GETPARAM_ID, // 08 - Getting node parameters. GETPARAM_ID, // 08 - Getting node parameters.
RESPPARAM_ID, // 09 - Responding with node parameters. RESPPARAM_ID, // 09 - Responding with node parameters.
...@@ -52,8 +52,7 @@ enum MessageTypeID{ ...@@ -52,8 +52,7 @@ enum MessageTypeID{
RESPNODES_ID, // 16 - Responding with node IDs from current comp_graph RESPNODES_ID, // 16 - Responding with node IDs from current comp_graph
ADDNODE_ID, // 17 - Add a node of specified type_id ADDNODE_ID, // 17 - Add a node of specified type_id
RESPADDNODE_ID, // 18 - Responding with the block_id of the newly added node RESPADDNODE_ID, // 18 - Responding with the block_id of the newly added node
LOG_END_ID, // 19 - Responding with controller parameters. Example: PID constants MAX_TYPE_ID // 19 - Just used to keep track of the size. Must remain at the end
MAX_TYPE_ID // 20 - Just used to keep track of the size. Must remain at the end
}; };
struct modular_structs; struct modular_structs;
......
...@@ -108,9 +108,7 @@ ...@@ -108,9 +108,7 @@
<tool id="xilinx.gnu.arm.c.toolchain.compiler.release.85270120" name="ARM gcc compiler" superClass="xilinx.gnu.arm.c.toolchain.compiler.release"> <tool id="xilinx.gnu.arm.c.toolchain.compiler.release.85270120" name="ARM gcc compiler" superClass="xilinx.gnu.arm.c.toolchain.compiler.release">
<option defaultValue="gnu.c.optimization.level.more" id="xilinx.gnu.compiler.option.optimization.level.515686013" name="Optimization Level" superClass="xilinx.gnu.compiler.option.optimization.level" valueType="enumerated"/> <option defaultValue="gnu.c.optimization.level.more" id="xilinx.gnu.compiler.option.optimization.level.515686013" name="Optimization Level" superClass="xilinx.gnu.compiler.option.optimization.level" valueType="enumerated"/>
<option id="xilinx.gnu.compiler.option.debugging.level.1121150517" name="Debug Level" superClass="xilinx.gnu.compiler.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/> <option id="xilinx.gnu.compiler.option.debugging.level.1121150517" name="Debug Level" superClass="xilinx.gnu.compiler.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
<option id="xilinx.gnu.compiler.inferred.swplatform.includes.687694973" name="Software Platform Include Path" superClass="xilinx.gnu.compiler.inferred.swplatform.includes" valueType="includePath"> <option id="xilinx.gnu.compiler.inferred.swplatform.includes.687694973" name="Software Platform Include Path" superClass="xilinx.gnu.compiler.inferred.swplatform.includes" valueType="includePath"/>
<listOptionValue builtIn="false" value="../../system_bsp/ps7_cortexa9_0/include"/>
</option>
<option id="xilinx.gnu.compiler.symbols.defined.1562495938" name="Defined symbols (-D)" superClass="xilinx.gnu.compiler.symbols.defined" valueType="definedSymbols"> <option id="xilinx.gnu.compiler.symbols.defined.1562495938" name="Defined symbols (-D)" superClass="xilinx.gnu.compiler.symbols.defined" valueType="definedSymbols">
<listOptionValue builtIn="false" value="NDEBUG=1"/> <listOptionValue builtIn="false" value="NDEBUG=1"/>
</option> </option>
...@@ -119,6 +117,7 @@ ...@@ -119,6 +117,7 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/modular_quad_pid/ext/computation_graph}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/modular_quad_pid/ext/computation_graph}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/modular_quad_pid/ext/quad_app}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/modular_quad_pid/ext/quad_app}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/modular_quad_pid/ext/queue}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/modular_quad_pid/ext/queue}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/modular_quad_pid/ext/commands}&quot;"/>
</option> </option>
<inputType id="xilinx.gnu.arm.c.compiler.input.846429887" name="C source files" superClass="xilinx.gnu.arm.c.compiler.input"/> <inputType id="xilinx.gnu.arm.c.compiler.input.846429887" name="C source files" superClass="xilinx.gnu.arm.c.compiler.input"/>
</tool> </tool>
......
...@@ -25,6 +25,11 @@ ...@@ -25,6 +25,11 @@
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures> </natures>
<linkedResources> <linkedResources>
<link>
<name>ext/commands</name>
<type>2</type>
<location>/local/ucart/MicroCART_17-18/quad/src/commands</location>
</link>
<link> <link>
<name>ext/computation_graph</name> <name>ext/computation_graph</name>
<type>2</type> <type>2</type>
......
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
/local/ucart/MicroCART_17-18/quad/src/commands/commands.c
OBJS += \
./ext/commands/commands.o
C_DEPS += \
./ext/commands/commands.d
# Each subdirectory must supply rules for building sources it contributes
ext/commands/commands.o: /local/ucart/MicroCART_17-18/quad/src/commands/commands.c
@echo 'Building file: $<'
@echo 'Invoking: ARM gcc compiler'
arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -I"/local/ucart/MicroCART_17-18/quad/src/commands" -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<'
@echo ' '
...@@ -35,49 +35,49 @@ C_DEPS += \ ...@@ -35,49 +35,49 @@ C_DEPS += \
ext/computation_graph/computation_graph.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/computation_graph.c ext/computation_graph/computation_graph.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/computation_graph.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: ARM gcc compiler' @echo 'Invoking: ARM gcc compiler'
arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -c -fmessage-length=0 -I../../system_bsp/ps7_cortexa9_0/include -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -I"/local/ucart/MicroCART_17-18/quad/src/commands" -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '
ext/computation_graph/node_accumulator.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_accumulator.c ext/computation_graph/node_accumulator.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_accumulator.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: ARM gcc compiler' @echo 'Invoking: ARM gcc compiler'
arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -c -fmessage-length=0 -I../../system_bsp/ps7_cortexa9_0/include -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -I"/local/ucart/MicroCART_17-18/quad/src/commands" -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '
ext/computation_graph/node_add.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_add.c ext/computation_graph/node_add.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_add.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: ARM gcc compiler' @echo 'Invoking: ARM gcc compiler'
arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -c -fmessage-length=0 -I../../system_bsp/ps7_cortexa9_0/include -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -I"/local/ucart/MicroCART_17-18/quad/src/commands" -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '
ext/computation_graph/node_constant.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_constant.c ext/computation_graph/node_constant.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_constant.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: ARM gcc compiler' @echo 'Invoking: ARM gcc compiler'
arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -c -fmessage-length=0 -I../../system_bsp/ps7_cortexa9_0/include -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -I"/local/ucart/MicroCART_17-18/quad/src/commands" -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '
ext/computation_graph/node_gain.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_gain.c ext/computation_graph/node_gain.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_gain.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: ARM gcc compiler' @echo 'Invoking: ARM gcc compiler'
arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -c -fmessage-length=0 -I../../system_bsp/ps7_cortexa9_0/include -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -I"/local/ucart/MicroCART_17-18/quad/src/commands" -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '
ext/computation_graph/node_mult.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_mult.c ext/computation_graph/node_mult.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_mult.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: ARM gcc compiler' @echo 'Invoking: ARM gcc compiler'
arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -c -fmessage-length=0 -I../../system_bsp/ps7_cortexa9_0/include -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -I"/local/ucart/MicroCART_17-18/quad/src/commands" -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '
ext/computation_graph/node_pow.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_pow.c ext/computation_graph/node_pow.o: /local/ucart/MicroCART_17-18/quad/src/computation_graph/node_pow.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: ARM gcc compiler' @echo 'Invoking: ARM gcc compiler'
arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -c -fmessage-length=0 -I../../system_bsp/ps7_cortexa9_0/include -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -I"/local/ucart/MicroCART_17-18/quad/src/commands" -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '
......
...@@ -17,7 +17,7 @@ C_DEPS += \ ...@@ -17,7 +17,7 @@ C_DEPS += \
ext/queue/queue.o: /local/ucart/MicroCART_17-18/quad/src/queue/queue.c ext/queue/queue.o: /local/ucart/MicroCART_17-18/quad/src/queue/queue.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: ARM gcc compiler' @echo 'Invoking: ARM gcc compiler'
arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -c -fmessage-length=0 -I../../system_bsp/ps7_cortexa9_0/include -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -I"/local/ucart/MicroCART_17-18/quad/src/commands" -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '
......
...@@ -12,6 +12,7 @@ RM := rm -rf ...@@ -12,6 +12,7 @@ RM := rm -rf
-include ext/queue/subdir.mk -include ext/queue/subdir.mk
-include ext/quad_app/subdir.mk -include ext/quad_app/subdir.mk
-include ext/computation_graph/subdir.mk -include ext/computation_graph/subdir.mk
-include ext/commands/subdir.mk
-include subdir.mk -include subdir.mk
-include objects.mk -include objects.mk
......
...@@ -20,4 +20,5 @@ src \ ...@@ -20,4 +20,5 @@ src \
ext/queue \ ext/queue \
ext/quad_app \ ext/quad_app \
ext/computation_graph \ ext/computation_graph \
ext/commands \
...@@ -53,7 +53,7 @@ C_DEPS += \ ...@@ -53,7 +53,7 @@ C_DEPS += \
src/%.o: ../src/%.c src/%.o: ../src/%.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: ARM gcc compiler' @echo 'Invoking: ARM gcc compiler'
arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -c -fmessage-length=0 -I../../system_bsp/ps7_cortexa9_0/include -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-xilinx-eabi-gcc -DNDEBUG=1 -Wall -O2 -I../../system_bsp/ps7_cortexa9_0/include -I"/local/ucart/MicroCART_17-18/quad/src/computation_graph" -I"/local/ucart/MicroCART_17-18/quad/src/quad_app" -I"/local/ucart/MicroCART_17-18/quad/src/queue" -I"/local/ucart/MicroCART_17-18/quad/src/commands" -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '
......
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