Mercurial > public > ostc4
changeset 123:a984d87a1ec0 FlipDisplay
Added option to build FontPack as static libary which is linked to the Firmware project (to allow separate build settings)
| author | Ideenmodellierer |
|---|---|
| date | Sun, 27 Jan 2019 22:01:07 +0100 |
| parents | 871baf20776b |
| children | 4b355396557a |
| files | Common/CPU1-F429.ld Discovery/Src/gfx_fonts.c FontPack/base_upperRegion.c RefPrj/Firmware/.cproject RefPrj/FontPack/.cproject |
| diffstat | 5 files changed, 197 insertions(+), 86 deletions(-) [+] |
line wrap: on
line diff
--- a/Common/CPU1-F429.ld Sun Jan 13 18:59:53 2019 +0100 +++ b/Common/CPU1-F429.ld Sun Jan 27 22:01:07 2019 +0100 @@ -124,7 +124,6 @@ *(.glue_7) /* glue arm to thumb code */ *(.glue_7t) /* glue thumb to arm code */ *(.eh_frame) - . = ALIGN(4); _etext = .; /* define a global symbols at end of code */ } >ROM @@ -195,54 +194,9 @@ KEEP( *(.bootloader_firmware_data) ) } > ROM - - .upper_font_dir 0x081DEF00 : { /* Flash Sector 23 is protected (bootloader font + image) => use end of sector 22 */ - /* Define Known Address for Each Font */ - __font_directory = .; - - - *(.upper_font_directory.Awe48) - *(.upper_font_directory.FontT24) - *(.upper_font_directory.FontT42) - *(.upper_font_directory.FontT48) - *(.upper_font_directory.FontT54) - *(.upper_font_directory.FontT84) - *(.upper_font_directory.FontT105) - *(.upper_font_directory.FontT144) - *(.upper_font_directory.Batt24*) + /* Flash Sector 23 is protected (bootloader font + image) => use end of sector 22 */ - __font_directory_end = .; - LONG( -1 ); /* Magic End Marker */ - - /* and for Each Image */ -/* __image_directory = .; */ -/* PROVIDE( ImgHWcolor = __image_directory + 0 * 8 ); - PROVIDE( ImgOSTC = __image_directory + 1 * 8 ); */ -/* __image_directory_end = __image_directory + 2 * 8; */ - -/* KEEP( *(.upper_image_directory) ) */ - - /* FIXME: shall KEEP images here */ - LONG( -1 ); /* Magic End Marker */ - - /* and for CLUT */ -/* PROVIDE( indexHWcolor = . ); */ - . += 0x100; - LONG( -1 ); /* Magic End Marker */ - } >UPPER - - - - - /* Put fonts and images in UPPER region */ - /* - .upper_images : { - __upper_image_data = .; - KEEP( *(.newupper_images) ) - __upper_image_data_end = .; - } > UPPER - */ /* TODO: the linker does not seem to work as the one of used for initial bootloader ==> Reconstruct layout to keep it compatible with the first version */ @@ -516,14 +470,30 @@ /* moving of fonts from lower to upper */ - *(.upper_fonts*) + *(.upper_fonts.*) __upper_font_data_end = .; } >UPPER - + .upper_directory 0x081DEF00 : { + __font_directory = .; + *(.upper_font_directory.Awe48) + *(.upper_font_directory.FontT24) + *(.upper_font_directory.FontT42) + *(.upper_font_directory.FontT48) + *(.upper_font_directory.FontT54) + *(.upper_font_directory.FontT84) + *(.upper_font_directory.FontT105) + *(.upper_font_directory.FontT144) + *(.upper_font_directory.Batt24*) + + __font_directory_end = .; + LONG( -1 ); /* Magic End Marker */ + + } >UPPER + @@ -570,6 +540,7 @@ . = ALIGN(8); PROVIDE ( end = . ); PROVIDE ( _end = . ); + PROVIDE ( __end__ = . ); . = . + _Min_Heap_Size; . = . + _Min_Stack_Size; . = ALIGN(8);
--- a/Discovery/Src/gfx_fonts.c Sun Jan 13 18:59:53 2019 +0100 +++ b/Discovery/Src/gfx_fonts.c Sun Jan 27 22:01:07 2019 +0100 @@ -22,10 +22,6 @@ # define INCLUDE_FONTS_BINARY #endif -#ifndef INCLUDE_FONTS_BINARY -#define INCLUDE_FONTS_BINARY 1 -#endif - #ifdef INCLUDE_FONTS_BINARY /* Fonts fixed in upper region */
--- a/FontPack/base_upperRegion.c Sun Jan 13 18:59:53 2019 +0100 +++ b/FontPack/base_upperRegion.c Sun Jan 27 22:01:07 2019 +0100 @@ -49,12 +49,12 @@ // From Common/Inc: #include "FirmwareData.h" -// From Discovery/Inc -#include "gfx_fonts.h" +#ifdef DEBUG // From AC6 support: #include <stdio.h> #include <stdint.h> +#endif ////////////////////////////////////////////////////////////////////////////// @@ -85,6 +85,7 @@ ////////////////////////////////////////////////////////////////////////////// +#ifdef BUILD_LIBRARY /* Fonts fixed in upper region */ #include "Fonts/font_awe48.h" #include "Fonts/font_T24.h" @@ -95,32 +96,35 @@ #include "Fonts/font_T105.h" #include "Fonts/font_T144_plus.h" +#include "Fonts/image_ostc.h" +#else +#include "gfx_fonts.h" +#endif /* Images fixed in upper region */ #include "Fonts/image_battery.h" #include "Fonts/image_heinrichs_weikamp.h" -#include "Fonts/image_ostc.h" + +///////////////////////////////////////////////////////////////////////////// + -////////////////////////////////////////////////////////////////////////////// +#ifdef DEBUG + +#define ASSERT(e) \ + do { if( ! (e) ) { ++errors; printf("FAIL at %3d: %s \n", __LINE__, #e); errorflag = 1;} } while(0) + +#define ASSERT_RANGE(e, min, max) ASSERT(min <= e); ASSERT( e <= max) extern void initialise_monitor_handles(void); static int errors = 0; static uint8_t errorflag = 0; -#define ASSERT(e) \ - do { if( ! (e) ) { ++errors; printf("FAIL at %3d: %s \n", __LINE__, #e); errorflag = 1;} } while(0) - -#define ASSERT_RANGE(e, min, max) ASSERT(min <= e); ASSERT( e <= max) - - - int main(void) { -#ifdef DEBUG_STLINK_V2 +#if DEBUG_STLINK_V2 initialise_monitor_handles(); #endif - //---- Check the linker puts the directory at the requested address ------ ASSERT( & Awe48 == (tFont*)0x81DFE00 ); ASSERT( & FontT24 == (tFont*)0x81DFE0c ); @@ -131,8 +135,6 @@ ASSERT( & FontT105 == (tFont*)0x81DFE48 ); ASSERT( & FontT144 == (tFont*)0x81DFE54 ); - - //---- Check the linker puts the font data in the requested section ------ extern tChar __upper_font_data; extern tChar __upper_font_data_end; @@ -145,9 +147,6 @@ ASSERT_RANGE(&ImgOSTC, (tImage*)&__upper_font_data, (tImage*)&__upper_font_data_end); - - - for(const tFont* font = & __font_directory; font < &__font_directory_end; ++font) { printf("Font: %x\n",font); @@ -236,5 +235,28 @@ printf("Font Check: no errors.\n"); return 0; } +/*#endif*/ +#else +#define ASSERT(e) \ + do { if( ! (e) ) { ++errors; errorflag = 1;} } while(0) +#define ASSERT_RANGE(e, min, max) ASSERT(min <= e); ASSERT( e <= max) + +uint16_t errors = 1; +static uint8_t errorflag = 0; +uint16_t CheckFontPosition() +{ + uint16_t retvalue; + ASSERT( & Awe48 == (tFont*)0x81DFE00 ); + ASSERT( & FontT24 == (tFont*)0x81DFE0c ); + ASSERT( & FontT42 == (tFont*)0x81DFE18 ); + ASSERT( & FontT48 == (tFont*)0x81DFE24 ); + ASSERT( & FontT54 == (tFont*)0x81DFE30 ); + ASSERT( & FontT84 == (tFont*)0x81DFE3c ); + ASSERT( & FontT105 == (tFont*)0x81DFE48 ); + ASSERT( & FontT144 == (tFont*)0x81DFE54 ); + retvalue = errors; + return retvalue; +} +#endif /************************ (C) COPYRIGHT heinrichs weikamp *****END OF FILE****/
--- a/RefPrj/Firmware/.cproject Sun Jan 13 18:59:53 2019 +0100 +++ b/RefPrj/Firmware/.cproject Sun Jan 27 22:01:07 2019 +0100 @@ -50,7 +50,12 @@ </tool> <tool id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.1908756987" name="MCU GCC Linker" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker"> <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script.1377166494" name="Linker Script (-T)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script" useByScannerDiscovery="false" value="${ProjDirPath}\..\ostc4\Common\CPU1-F429.ld" valueType="string"/> - <option id="gnu.c.link.option.ldflags.1166539479" name="Linker flags" superClass="gnu.c.link.option.ldflags" useByScannerDiscovery="false" value="" valueType="string"/> + <option id="gnu.c.link.option.ldflags.1166539479" name="Linker flags" superClass="gnu.c.link.option.ldflags" useByScannerDiscovery="false" value="-u _printf_float " valueType="string"/> + <option id="gnu.c.link.option.other.2080432652" name="Other options (-Xlinker [option])" superClass="gnu.c.link.option.other" useByScannerDiscovery="false"/> + <option id="gnu.c.link.option.paths.1365621909" name="Library search path (-L)" superClass="gnu.c.link.option.paths" useByScannerDiscovery="false"/> + <option id="gnu.c.link.option.libs.600039101" name="Libraries (-l)" superClass="gnu.c.link.option.libs" useByScannerDiscovery="false"/> + <option id="gnu.c.link.option.strip.81740779" name="Omit all symbol information (-s)" superClass="gnu.c.link.option.strip" useByScannerDiscovery="false" value="false" valueType="boolean"/> + <option id="gnu.c.link.option.nodeflibs.813429471" name="Do not use default libraries (-nodefaultlibs)" superClass="gnu.c.link.option.nodeflibs" useByScannerDiscovery="false" value="true" valueType="boolean"/> <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1253118494" superClass="cdt.managedbuild.tool.gnu.c.linker.input"> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/> @@ -109,7 +114,7 @@ </extensions> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="fr.ac6.managedbuild.config.gnu.cross.exe.release.1554475450" name="Release" parent="fr.ac6.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary and Printing size information:" postbuildStep="arm-none-eabi-objcopy -R .upper* -O binary "${BuildArtifactFileBaseName}.elf" "${BuildArtifactFileBaseName}.bin"; arm-none-eabi-size -B "${BuildArtifactFileName}""> + <configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="fr.ac6.managedbuild.config.gnu.cross.exe.release.1554475450" name="Release" parent="fr.ac6.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary and Printing size information:" postbuildStep="arm-none-eabi-objcopy -R .upper* -R .font_firmware_data -O binary "${BuildArtifactFileBaseName}.elf" "${BuildArtifactFileBaseName}.bin"; arm-none-eabi-size "${BuildArtifactFileName}""> <folderInfo id="fr.ac6.managedbuild.config.gnu.cross.exe.release.1554475450." name="/" resourcePath=""> <toolChain id="fr.ac6.managedbuild.toolchain.gnu.cross.exe.release.240202493" name="Ac6 STM32 MCU GCC" superClass="fr.ac6.managedbuild.toolchain.gnu.cross.exe.release"> <option id="fr.ac6.managedbuild.option.gnu.cross.mcu.1492720020" name="Mcu" superClass="fr.ac6.managedbuild.option.gnu.cross.mcu" useByScannerDiscovery="false" value="STM32F429IITx" valueType="string"/> @@ -144,14 +149,22 @@ <option id="gnu.cpp.compiler.option.debugging.level.1273410642" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/> </tool> <tool id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.1139299269" name="MCU GCC Linker" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker"> - <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script.920748377" name="Linker Script (-T)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script" useByScannerDiscovery="false" value="${ProjDirPath}\..\ostc4_versuch\Common\CPU1-F429.ld" valueType="string"/> + <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script.920748377" name="Linker Script (-T)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script" useByScannerDiscovery="false" value="${ProjDirPath}\..\ostc4\Common\CPU1-F429.ld" valueType="string"/> <option id="gnu.c.link.option.strip.1057056433" name="Omit all symbol information (-s)" superClass="gnu.c.link.option.strip" useByScannerDiscovery="false" value="false" valueType="boolean"/> - <option id="gnu.c.link.option.ldflags.1124840583" name="Linker flags" superClass="gnu.c.link.option.ldflags" useByScannerDiscovery="false" value="" valueType="string"/> + <option id="gnu.c.link.option.ldflags.1124840583" name="Linker flags" superClass="gnu.c.link.option.ldflags" useByScannerDiscovery="false" value="-u _printf_float" valueType="string"/> <option id="gnu.c.link.option.nostart.543218958" name="Do not use standard start files (-nostartfiles)" superClass="gnu.c.link.option.nostart" useByScannerDiscovery="false" value="false" valueType="boolean"/> - <option id="gnu.c.link.option.nodeflibs.1612021002" name="Do not use default libraries (-nodefaultlibs)" superClass="gnu.c.link.option.nodeflibs" useByScannerDiscovery="false" value="false" valueType="boolean"/> + <option id="gnu.c.link.option.nodeflibs.1612021002" name="Do not use default libraries (-nodefaultlibs)" superClass="gnu.c.link.option.nodeflibs" useByScannerDiscovery="false" value="true" valueType="boolean"/> <option id="gnu.c.link.option.nostdlibs.1798219046" name="No startup or default libs (-nostdlib)" superClass="gnu.c.link.option.nostdlibs" useByScannerDiscovery="false" value="false" valueType="boolean"/> <option id="gnu.c.link.option.noshared.68365841" name="No shared libraries (-static)" superClass="gnu.c.link.option.noshared" useByScannerDiscovery="false" value="false" valueType="boolean"/> <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.gcsections.789080992" name="Discard unused sections (-Wl,--gc-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.gcsections" useByScannerDiscovery="false" value="true" valueType="boolean"/> + <option id="gnu.c.link.option.paths.379955370" name="Library search path (-L)" superClass="gnu.c.link.option.paths" useByScannerDiscovery="false" valueType="libPaths"> + <listOptionValue builtIn="false" value=""${workspace_loc:/OSTC4_FontPack/Library}""/> + </option> + <option id="gnu.c.link.option.libs.1816353759" name="Libraries (-l)" superClass="gnu.c.link.option.libs" useByScannerDiscovery="false" valueType="libs"> + <listOptionValue builtIn="false" value="OSTC4_FontPack"/> + </option> + <option id="gnu.c.link.option.shared.1154842171" name="Shared (-shared)" superClass="gnu.c.link.option.shared" useByScannerDiscovery="false" value="false" valueType="boolean"/> + <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.libmath.201580205" name="Use C math library (-lm)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.libmath" useByScannerDiscovery="false" value="false" valueType="boolean"/> <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.937739753" superClass="cdt.managedbuild.tool.gnu.c.linker.input"> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/>
--- a/RefPrj/FontPack/.cproject Sun Jan 13 18:59:53 2019 +0100 +++ b/RefPrj/FontPack/.cproject Sun Jan 27 22:01:07 2019 +0100 @@ -3,7 +3,13 @@ <storageModule moduleId="org.eclipse.cdt.core.settings"> <cconfiguration id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.8604359"> <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.8604359" moduleId="org.eclipse.cdt.core.settings" name="Debug"> - <externalSettings/> + <externalSettings> + <externalSetting> + <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/OSTC4_FontPack"/> + <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/OSTC4_FontPack/Debug"/> + <entry flags="RESOLVED" kind="libraryFile" name="OSTC4_FontPack" srcPrefixMapping="" srcRootPath=""/> + </externalSetting> + </externalSettings> <extensions> <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> @@ -30,6 +36,7 @@ <listOptionValue builtIn="false" value="STM32"/> <listOptionValue builtIn="false" value="STM32F4"/> <listOptionValue builtIn="false" value="STM32F429IITx"/> + <listOptionValue builtIn="false" value="BUILD_LIBRARY"/> <listOptionValue builtIn="false" value="DEBUG"/> </option> <option id="gnu.c.compiler.option.include.paths.1100726123" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> @@ -44,7 +51,7 @@ <option id="gnu.cpp.compiler.option.debugging.level.263533406" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/> </tool> <tool id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.974050716" name="MCU GCC Linker" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker"> - <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script.1276477164" name="Linker Script (-T)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script" useByScannerDiscovery="false" value="D:\Projekte\OSTC\workspace\ostc4\Common\CPU1-F429.ld" valueType="string"/> + <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script.1276477164" name="Linker Script (-T)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script" useByScannerDiscovery="false" value="${ProjDirPath}\..\ostc4\Common\CPU1-F429.ld" valueType="string"/> <option id="gnu.c.link.option.ldflags.1724198262" name="Linker flags" superClass="gnu.c.link.option.ldflags" useByScannerDiscovery="false" value="-specs=nosys.specs -specs=nano.specs -specs=rdimon.specs -lc -lrdimon" valueType="string"/> <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.538362104" superClass="cdt.managedbuild.tool.gnu.c.linker.input"> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> @@ -81,19 +88,20 @@ </extensions> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="fr.ac6.managedbuild.config.gnu.cross.exe.release.85982751" name="Release" parent="fr.ac6.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary and Printing size information:" postbuildStep="arm-none-eabi-objcopy -O binary "${BuildArtifactFileBaseName}.elf" "${BuildArtifactFileBaseName}.bin"; arm-none-eabi-size -B "${BuildArtifactFileName}""> + <configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="fr.ac6.managedbuild.config.gnu.cross.exe.release.85982751" name="Release" parent="fr.ac6.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary and Printing size information:" postbuildStep="arm-none-eabi-objcopy -j.font_firmware_data -j .upper* -O binary "${BuildArtifactFileBaseName}.elf" "${BuildArtifactFileBaseName}.bin"; arm-none-eabi-size "${BuildArtifactFileName}""> <folderInfo id="fr.ac6.managedbuild.config.gnu.cross.exe.release.85982751." name="/" resourcePath=""> <toolChain id="fr.ac6.managedbuild.toolchain.gnu.cross.exe.release.82093752" name="Ac6 STM32 MCU GCC" superClass="fr.ac6.managedbuild.toolchain.gnu.cross.exe.release"> - <option id="fr.ac6.managedbuild.option.gnu.cross.mcu.1846726325" name="Mcu" superClass="fr.ac6.managedbuild.option.gnu.cross.mcu" value="STM32F429IITx" valueType="string"/> - <option id="fr.ac6.managedbuild.option.gnu.cross.fpu.914670237" name="Floating point hardware" superClass="fr.ac6.managedbuild.option.gnu.cross.fpu" value="fr.ac6.managedbuild.option.gnu.cross.fpu.fpv4-sp-d16" valueType="enumerated"/> - <option id="fr.ac6.managedbuild.option.gnu.cross.floatabi.1719772845" name="Floating-point ABI" superClass="fr.ac6.managedbuild.option.gnu.cross.floatabi" value="fr.ac6.managedbuild.option.gnu.cross.floatabi.hard" valueType="enumerated"/> - <option id="fr.ac6.managedbuild.option.gnu.cross.board.685755771" name="Board" superClass="fr.ac6.managedbuild.option.gnu.cross.board" value="OSTC_Discovery" valueType="string"/> + <option id="fr.ac6.managedbuild.option.gnu.cross.mcu.1846726325" name="Mcu" superClass="fr.ac6.managedbuild.option.gnu.cross.mcu" useByScannerDiscovery="false" value="STM32F429IITx" valueType="string"/> + <option id="fr.ac6.managedbuild.option.gnu.cross.fpu.914670237" name="Floating point hardware" superClass="fr.ac6.managedbuild.option.gnu.cross.fpu" useByScannerDiscovery="false" value="fr.ac6.managedbuild.option.gnu.cross.fpu.fpv4-sp-d16" valueType="enumerated"/> + <option id="fr.ac6.managedbuild.option.gnu.cross.floatabi.1719772845" name="Floating-point ABI" superClass="fr.ac6.managedbuild.option.gnu.cross.floatabi" useByScannerDiscovery="false" value="fr.ac6.managedbuild.option.gnu.cross.floatabi.hard" valueType="enumerated"/> + <option id="fr.ac6.managedbuild.option.gnu.cross.board.685755771" name="Board" superClass="fr.ac6.managedbuild.option.gnu.cross.board" useByScannerDiscovery="false" value="OSTC_Discovery" valueType="string"/> <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="fr.ac6.managedbuild.targetPlatform.gnu.cross.1764280635" isAbstract="false" osList="all" superClass="fr.ac6.managedbuild.targetPlatform.gnu.cross"/> <builder buildPath="${workspace_loc:/OSTC4_FontPack}/Release" id="fr.ac6.managedbuild.builder.gnu.cross.994448876" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="fr.ac6.managedbuild.builder.gnu.cross"/> <tool id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.1451356873" name="MCU GCC Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler"> <option id="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level.1636772741" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.c.optimization.level.size" valueType="enumerated"/> <option id="gnu.c.compiler.option.debugging.level.1687174546" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.1782566881" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"> + <listOptionValue builtIn="false" value="BUILD_LIBRARY"/> <listOptionValue builtIn="false" value="STM32"/> <listOptionValue builtIn="false" value="STM32F4"/> <listOptionValue builtIn="false" value="STM32F429IITx"/> @@ -102,6 +110,7 @@ <listOptionValue builtIn="false" value=""${workspace_loc:/ostc4/Discovery/Inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/ostc4/Common/Inc}""/> </option> + <option id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.ffunction.1964060747" name="Place the function in their own section (-ffunction-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.ffunction" useByScannerDiscovery="false" value="false" valueType="boolean"/> <inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.1105204667" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/> <inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.1803519542" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/> </tool> @@ -110,8 +119,20 @@ <option id="gnu.cpp.compiler.option.debugging.level.447927632" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/> </tool> <tool id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.1086419053" name="MCU GCC Linker" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker"> - <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script.1362967323" name="Linker Script (-T)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script" value="${workspace_loc:\ostc4\Common\CPU1-F429.ld" valueType="string"/> - <option id="gnu.c.link.option.ldflags.948436028" name="Linker flags" superClass="gnu.c.link.option.ldflags" value="-specs=nosys.specs" valueType="string"/> + <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script.1362967323" name="Linker Script (-T)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script" useByScannerDiscovery="false" value="${ProjDirPath}\..\ostc4\Common\CPU1-F429.ld" valueType="string"/> + <option id="gnu.c.link.option.ldflags.948436028" name="Linker flags" superClass="gnu.c.link.option.ldflags" useByScannerDiscovery="false" value="" valueType="string"/> + <option id="gnu.c.link.option.libs.26271697" name="Libraries (-l)" superClass="gnu.c.link.option.libs" useByScannerDiscovery="false" valueType="libs"> + <listOptionValue builtIn="false" value="OSTC4_FontPack"/> + </option> + <option id="gnu.c.link.option.paths.992619057" name="Library search path (-L)" superClass="gnu.c.link.option.paths" useByScannerDiscovery="false" valueType="libPaths"> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/Library}""/> + </option> + <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.libmath.170919225" name="Use C math library (-lm)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.libmath" useByScannerDiscovery="false" value="false" valueType="boolean"/> + <option id="gnu.c.link.option.nostdlibs.1982413845" name="No startup or default libs (-nostdlib)" superClass="gnu.c.link.option.nostdlibs" useByScannerDiscovery="false" value="true" valueType="boolean"/> + <option id="gnu.c.link.option.defname.273075010" name="DEF file name (-Wl,--output-def=)" superClass="gnu.c.link.option.defname" useByScannerDiscovery="false" value="" valueType="string"/> + <option id="gnu.c.link.option.nodeflibs.722744601" name="Do not use default libraries (-nodefaultlibs)" superClass="gnu.c.link.option.nodeflibs" useByScannerDiscovery="false" value="true" valueType="boolean"/> + <option id="gnu.c.link.option.nostart.716813369" name="Do not use standard start files (-nostartfiles)" superClass="gnu.c.link.option.nostart" useByScannerDiscovery="false" value="true" valueType="boolean"/> + <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.gcsections.935355899" name="Discard unused sections (-Wl,--gc-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.gcsections" useByScannerDiscovery="false" value="false" valueType="boolean"/> <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1997315207" superClass="cdt.managedbuild.tool.gnu.c.linker.input"> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/> @@ -128,7 +149,93 @@ <sourceEntries> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="inc"/> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/> - <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="startup"/> + <entry excluding="sysmem.c|startup_stm32.s" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="startup"/> + </sourceEntries> + </configuration> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> + </cconfiguration> + <cconfiguration id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.8604359.909071357"> + <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.8604359.909071357" moduleId="org.eclipse.cdt.core.settings" name="Library"> + <externalSettings> + <externalSetting> + <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/OSTC4_FontPack"/> + <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/OSTC4_FontPack/Debug"/> + <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/OSTC4_FontPack/Library"/> + <entry flags="RESOLVED" kind="libraryFile" name="OSTC4_FontPack" srcPrefixMapping="" srcRootPath=""/> + </externalSetting> + </externalSettings> + <extensions> + <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> + <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> + <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/> + <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> + </extensions> + </storageModule> + <storageModule moduleId="cdtBuildSystem" version="4.0.0"> + <configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.8604359.909071357" name="Library" parent="fr.ac6.managedbuild.config.gnu.cross.exe.debug" postannouncebuildStep="Generating binary and Printing size information:" postbuildStep=""> + <folderInfo id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.8604359.909071357." name="/" resourcePath=""> + <toolChain id="fr.ac6.managedbuild.toolchain.gnu.cross.exe.debug.716142956" name="Ac6 STM32 MCU GCC" superClass="fr.ac6.managedbuild.toolchain.gnu.cross.exe.debug"> + <option id="fr.ac6.managedbuild.option.gnu.cross.mcu.851600135" name="Mcu" superClass="fr.ac6.managedbuild.option.gnu.cross.mcu" useByScannerDiscovery="false" value="STM32F429IITx" valueType="string"/> + <option id="fr.ac6.managedbuild.option.gnu.cross.fpu.66923943" name="Floating point hardware" superClass="fr.ac6.managedbuild.option.gnu.cross.fpu" useByScannerDiscovery="false" value="fr.ac6.managedbuild.option.gnu.cross.fpu.fpv4-sp-d16" valueType="enumerated"/> + <option id="fr.ac6.managedbuild.option.gnu.cross.floatabi.1895212320" name="Floating-point ABI" superClass="fr.ac6.managedbuild.option.gnu.cross.floatabi" useByScannerDiscovery="false" value="fr.ac6.managedbuild.option.gnu.cross.floatabi.hard" valueType="enumerated"/> + <option id="fr.ac6.managedbuild.option.gnu.cross.board.1172718385" name="Board" superClass="fr.ac6.managedbuild.option.gnu.cross.board" useByScannerDiscovery="false" value="OSTC_Discovery" valueType="string"/> + <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="fr.ac6.managedbuild.targetPlatform.gnu.cross.1763358241" isAbstract="false" osList="all" superClass="fr.ac6.managedbuild.targetPlatform.gnu.cross"/> + <builder buildPath="${workspace_loc:/OSTC4_FontPack}/Debug" id="fr.ac6.managedbuild.builder.gnu.cross.704483138" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="fr.ac6.managedbuild.builder.gnu.cross"/> + <tool id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.1803634375" name="MCU GCC Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler"> + <option id="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level.1841868987" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.c.optimization.level.size" valueType="enumerated"/> + <option id="gnu.c.compiler.option.debugging.level.345718747" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/> + <option id="gnu.c.compiler.option.preprocessor.def.symbols.376731920" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"> + <listOptionValue builtIn="false" value="BUILD_LIBRARY"/> + <listOptionValue builtIn="false" value="STM32"/> + <listOptionValue builtIn="false" value="STM32F4"/> + <listOptionValue builtIn="false" value="STM32F429IITx"/> + </option> + <option id="gnu.c.compiler.option.include.paths.902474985" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> + <listOptionValue builtIn="false" value=""${workspace_loc:/ostc4/Discovery/Inc}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/ostc4/Common/Inc}""/> + </option> + <option id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.ffunction.636156041" name="Place the function in their own section (-ffunction-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.ffunction" useByScannerDiscovery="false" value="false" valueType="boolean"/> + <option id="gnu.c.compiler.option.dialect.std.717247782" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/> + <option id="fr.ac6.managedbuid.gnu.c.compiler.option.misc.other.1947577353" name="Other flags" superClass="fr.ac6.managedbuid.gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-fmessage-length=0 -u symbol" valueType="string"/> + <inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.130180392" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/> + <inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.1496213048" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/> + </tool> + <tool id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.297117296" name="MCU G++ Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler"> + <option id="fr.ac6.managedbuild.gnu.cpp.compiler.option.optimization.level.1051900381" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/> + <option id="gnu.cpp.compiler.option.debugging.level.54545315" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/> + </tool> + <tool id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.186877509" name="MCU GCC Linker" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker"> + <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script.984692934" name="Linker Script (-T)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.script" useByScannerDiscovery="false" value="D:\Projekte\OSTC\workspace\ostc4\Common\CPU1-F429.ld" valueType="string"/> + <option id="gnu.c.link.option.ldflags.607567160" name="Linker flags" superClass="gnu.c.link.option.ldflags" useByScannerDiscovery="false" value="" valueType="string"/> + <option defaultValue="true" id="gnu.c.link.option.shared.1993088520" name="Shared (-shared)" superClass="gnu.c.link.option.shared" useByScannerDiscovery="false" value="true" valueType="boolean"/> + <option id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.libmath.56830929" name="Use C math library (-lm)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker.libmath" useByScannerDiscovery="false" value="false" valueType="boolean"/> + <option id="gnu.c.link.option.nostdlibs.1464483722" name="No startup or default libs (-nostdlib)" superClass="gnu.c.link.option.nostdlibs" useByScannerDiscovery="false" value="true" valueType="boolean"/> + <option id="gnu.c.link.option.nodeflibs.1536962786" name="Do not use default libraries (-nodefaultlibs)" superClass="gnu.c.link.option.nodeflibs" useByScannerDiscovery="false" value="true" valueType="boolean"/> + <option id="gnu.c.link.option.nostart.1772588839" name="Do not use standard start files (-nostartfiles)" superClass="gnu.c.link.option.nostart" useByScannerDiscovery="false" value="true" valueType="boolean"/> + <option id="gnu.c.link.option.defname.1036522968" name="DEF file name (-Wl,--output-def=)" superClass="gnu.c.link.option.defname" useByScannerDiscovery="false" value="" valueType="string"/> + <option id="gnu.c.link.option.soname.1729002893" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" useByScannerDiscovery="false" value="" valueType="string"/> + <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1169750436" superClass="cdt.managedbuild.tool.gnu.c.linker.input"> + <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> + <additionalInput kind="additionalinput" paths="$(LIBS)"/> + </inputType> + <outputType id="cdt.managedbuild.tool.gnu.c.linker.output.1270989360" outputPrefix="lib" superClass="cdt.managedbuild.tool.gnu.c.linker.output"/> + </tool> + <tool id="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker.651745697" name="MCU G++ Linker" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker"> + <option defaultValue="true" id="gnu.cpp.link.option.shared.164600601" name="Shared (-shared)" superClass="gnu.cpp.link.option.shared" valueType="boolean"/> + </tool> + <tool id="fr.ac6.managedbuild.tool.gnu.archiver.974344177" name="MCU GCC Archiver" superClass="fr.ac6.managedbuild.tool.gnu.archiver"/> + <tool id="fr.ac6.managedbuild.tool.gnu.cross.assembler.1475237248" name="MCU GCC Assembler" superClass="fr.ac6.managedbuild.tool.gnu.cross.assembler"> + <inputType id="cdt.managedbuild.tool.gnu.assembler.input.23100294" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> + <inputType id="fr.ac6.managedbuild.tool.gnu.cross.assembler.input.1352464072" superClass="fr.ac6.managedbuild.tool.gnu.cross.assembler.input"/> + </tool> + </toolChain> + </folderInfo> + <sourceEntries> + <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="inc"/> + <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/> + <entry excluding="sysmem.c|startup_stm32.s" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="startup"/> </sourceEntries> </configuration> </storageModule> @@ -150,6 +257,7 @@ <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/> <storageModule moduleId="refreshScope" versionNumber="2"> + <configuration configurationName="Library"/> <configuration configurationName="Debug"> <resource resourceType="PROJECT" workspacePath="/OSTC4_FontPack"/> </configuration> @@ -157,4 +265,5 @@ <resource resourceType="PROJECT" workspacePath="/OSTC4_FontPack"/> </configuration> </storageModule> + <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> </cproject>