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

quad: change "modular_quad_pid" to "real_quad"

parent a1ac6855
No related branches found
No related tags found
No related merge requests found
Showing
with 22 additions and 17 deletions
......@@ -6,12 +6,17 @@ the quad, and the XSDK main project that runs on the Zybo.
The main quad application is written as a library, and located at:
```
src/quad_app/quad_app.c
src/quad_app/ ("main" function in quad_app.c)
```
The main XSDK project that actually runs on the Zybo is located at:
```
xsdk_workspace/modular_quad_pid/main.c
xsdk_workspace/real_quad/
```
We also have a complemetary "virtual quad" to ease testing:
```
src/virt_quad/
```
## Building
......
......@@ -27,7 +27,7 @@
<tool id="xilinx.gnu.arm.c.toolchain.compiler.debug.177835003" name="ARM gcc compiler" superClass="xilinx.gnu.arm.c.toolchain.compiler.debug">
<option defaultValue="gnu.c.optimization.level.none" id="xilinx.gnu.compiler.option.optimization.level.1900496019" name="Optimization Level" superClass="xilinx.gnu.compiler.option.optimization.level" value="gnu.c.optimization.level.none" valueType="enumerated"/>
<option id="xilinx.gnu.compiler.option.debugging.level.1207856754" name="Debug Level" superClass="xilinx.gnu.compiler.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
<option id="xilinx.gnu.compiler.inferred.swplatform.includes.2123463819" name="Software Platform Include Path" superClass="xilinx.gnu.compiler.inferred.swplatform.includes" valueType="includePath"/>
<option id="xilinx.gnu.compiler.inferred.swplatform.includes.2123463819" name="Software Platform Include Path" superClass="xilinx.gnu.compiler.inferred.swplatform.includes"/>
<option id="xilinx.gnu.compiler.symbols.defined.1696008720" name="Defined symbols (-D)" superClass="xilinx.gnu.compiler.symbols.defined"/>
<option id="xilinx.gnu.compiler.dircategory.includes.1211006365" name="Include Paths" superClass="xilinx.gnu.compiler.dircategory.includes" valueType="includePath">
<listOptionValue builtIn="false" value="../../system_bsp/ps7_cortexa9_0/include"/>
......@@ -114,11 +114,11 @@
</option>
<option id="xilinx.gnu.compiler.dircategory.includes.1873624761" name="Include Paths" superClass="xilinx.gnu.compiler.dircategory.includes" valueType="includePath">
<listOptionValue builtIn="false" value="../../system_bsp/ps7_cortexa9_0/include"/>
<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/queue}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/modular_quad_pid/ext/commands}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/modular_quad_pid/ext/graph_blocks}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/real_quad/ext/computation_graph}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/real_quad/ext/quad_app}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/real_quad/ext/queue}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/real_quad/ext/commands}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/real_quad/ext/graph_blocks}&quot;"/>
</option>
<inputType id="xilinx.gnu.arm.c.compiler.input.846429887" name="C source files" superClass="xilinx.gnu.arm.c.compiler.input"/>
</tool>
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>modular_quad_pid</name>
<name>real_quad</name>
<comment></comment>
<projects>
<project>system_bsp</project>
......@@ -53,7 +53,7 @@
</linkedResources>
<filteredResources>
<filter>
<id>1489164394345</id>
<id>0</id>
<name></name>
<type>10</type>
<matcher>
......
......@@ -30,29 +30,29 @@ endif
# Add inputs and outputs from these tool invocations to the build variables
ELFSIZE += \
modular_quad_pid.elf.size \
real_quad.elf.size \
# All Target
all: modular_quad_pid.elf secondary-outputs
all: real_quad.elf secondary-outputs
# Tool invocations
modular_quad_pid.elf: $(OBJS) ../src/lscript.ld $(USER_OBJS)
real_quad.elf: $(OBJS) ../src/lscript.ld $(USER_OBJS)
@echo 'Building target: $@'
@echo 'Invoking: ARM gcc linker'
arm-xilinx-eabi-gcc -Wl,-T -Wl,../src/lscript.ld -L../../system_bsp/ps7_cortexa9_0/lib -o "modular_quad_pid.elf" $(OBJS) $(USER_OBJS) $(LIBS)
arm-xilinx-eabi-gcc -Wl,-T -Wl,../src/lscript.ld -L../../system_bsp/ps7_cortexa9_0/lib -o "real_quad.elf" $(OBJS) $(USER_OBJS) $(LIBS)
@echo 'Finished building target: $@'
@echo ' '
modular_quad_pid.elf.size: modular_quad_pid.elf
real_quad.elf.size: real_quad.elf
@echo 'Invoking: ARM Print Size'
arm-xilinx-eabi-size modular_quad_pid.elf |tee "modular_quad_pid.elf.size"
arm-xilinx-eabi-size real_quad.elf |tee "real_quad.elf.size"
@echo 'Finished building: $@'
@echo ' '
# Other Targets
clean:
-$(RM) $(OBJS)$(C_DEPS)$(EXECUTABLES)$(ELFSIZE)$(S_UPPER_DEPS) modular_quad_pid.elf
-$(RM) $(OBJS)$(C_DEPS)$(EXECUTABLES)$(ELFSIZE)$(S_UPPER_DEPS) real_quad.elf
-@echo ' '
secondary-outputs: $(ELFSIZE)
......
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