v/maiana
1
0
Fork 0
mirror of https://github.com/peterantypas/maiana.git synced 2025-05-28 05:10:40 -07:00
Code Issues Projects Releases Wiki Activity

Final version with split board

Browse Source
This commit is contained in:
PETER ANTYPAS 2016-12-03 11:19:31 -08:00
parent 6243cdae95
commit b32124af07
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/.cproject
View File

@ -220,6 +220,7 @@
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash.385120787" name="Create flash image" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.151303882" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.38748253" name="FPU Type" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.fpv4spd16" valueType="enumerated"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.1999432244" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.arch.none" valueType="enumerated"/>
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1050738922" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
<builder buildPath="${workspace_loc:/ais_transponder}/Release" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1394997471" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1731827839" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">

8
bootloader/src/main.cpp
View File

@ -64,15 +64,13 @@ int main(int argc, char* argv[])
* - If no metadata is present, enter UART interactive mode and wait for software upload
* - If metadata is present, jump to software start address (APPLICATION_ADDRESS)
*/
ApplicationMetadata *metadata = (ApplicationMetadata*)METADATA_ADDRESS;
if ( metadata == NULL || metadata->magic != METADATA_MAGIC ) {
trace_printf("ClockSpeed: %d\n", SystemCoreClock);
ApplicationMetadata *metadata = (ApplicationMetadata*)METADATA_ADDRESS;
if ( metadata == NULL || metadata->magic != METADATA_MAGIC ) {
trace_printf("There is no software installed. Entering UART mode\n");
enterUARTMode();
}
else {
if ( !verifyApplicationChecksum(*metadata) ) {
trace_printf("The software is corrupt. Entering UART mode\n");
enterUARTMode();