philip/MDH-UAV-Control-System
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

LinkerScript.ld addition for EEPROM memory address

Browse Source
This commit is contained in:
philsson 2016-09-29 08:57:27 +02:00
parent 83b56b2404
commit a11e12b943
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UAV-ControlSystem/.cproject
View File

@ -44,6 +44,7 @@
<listOptionValue builtIn="false" value="bool=int"/> <listOptionValue builtIn="false" value="bool=int"/>
<listOptionValue builtIn="false" value="true=1"/> <listOptionValue builtIn="false" value="true=1"/>
<listOptionValue builtIn="false" value="&quot;false =0&quot;"/> <listOptionValue builtIn="false" value="&quot;false =0&quot;"/>
<listOptionValue builtIn="false" value="USE_FULL_ASSERT"/>
</option> </option>
<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.1429172986" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/> <inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.1429172986" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/>
<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.1184599199" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/> <inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.1184599199" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/>
@ -139,6 +140,7 @@
<listOptionValue builtIn="false" value="bool=int"/> <listOptionValue builtIn="false" value="bool=int"/>
<listOptionValue builtIn="false" value="true=1"/> <listOptionValue builtIn="false" value="true=1"/>
<listOptionValue builtIn="false" value="false=0"/> <listOptionValue builtIn="false" value="false=0"/>
<listOptionValue builtIn="false" value="USE_FULL_ASSERT"/>
</option> </option>
<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.517933833" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/> <inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.517933833" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/>
<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.348853835" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/> <inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.348853835" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/>
@ -214,4 +216,5 @@
<resource resourceType="PROJECT" workspacePath="/UAV-ControlSystem"/> <resource resourceType="PROJECT" workspacePath="/UAV-ControlSystem"/>
</configuration> </configuration>
</storageModule> </storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cproject> </cproject>

1
UAV-ControlSystem/LinkerScript.ld
View File

@ -63,6 +63,7 @@ MEMORY
{ {
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K
ROM (rx) : ORIGIN = 0x8000000, LENGTH = 512K ROM (rx) : ORIGIN = 0x8000000, LENGTH = 512K
EEPROM (xrw) : ORIGIN = 0x80E0000, LENGTH = 128K
} }
/* Sections */ /* Sections */

2
UAV-ControlSystem/src/drivers/system_clock.c
View File

@ -76,8 +76,6 @@ uint32_t clock_get_us()
asm volatile("\tnop\n"); asm volatile("\tnop\n");
} while (ms != clock_get_ms()); } while (ms != clock_get_ms());
assert_param(us >= 1000);
return (ms * 1000) + (usTicks * 1000 - cycle_cnt) / usTicks; return (ms * 1000) + (usTicks * 1000 - cycle_cnt) / usTicks;
} }