Skip to content

Commit

Permalink
fixed deps, cleanup eclipse config, version 0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexanderSteiger
AlexanderSteiger committed Nov 6, 2019
1 parent e70c871 commit 5d2b60b
Show file tree
Hide file tree
Showing 22 changed files with 483 additions and 1,053 deletions.
830 changes: 233 additions & 597 deletions TxtFactoryClient/.cproject
View file

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions TxtFactoryClient/.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
<name>TxtFactoryClient</name>
<comment></comment>
<projects>
<project>KeLibTxt_Work</project>
<project>MotorIOLib</project>
<project>ROBOProLib</project>
<project>SDLWidgetsLib</project>
<project>TxtControlLib</project>
<project>TxtSmartFactoryLib</project>
</projects>
<buildSpec>
Expand Down
207 changes: 70 additions & 137 deletions TxtFactoryMain/.cproject
View file

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions TxtFactoryMain/.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
<name>TxtFactoryMain</name>
<comment></comment>
<projects>
<project>KeLibTxt_Work</project>
<project>MotorIOLib</project>
<project>ROBOProLib</project>
<project>SDLWidgetsLib</project>
<project>TxtControlLib</project>
<project>TxtSmartFactoryLib</project>
</projects>
<buildSpec>
Expand Down
398 changes: 121 additions & 277 deletions TxtParkPos/.cproject
View file

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions TxtParkPos/.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
<name>TxtParkPos</name>
<comment></comment>
<projects>
<project>KeLibTxt_Work</project>
<project>MotorIOLib</project>
<project>ROBOProLib</project>
<project>SDLWidgetsLib</project>
<project>TxtControlLib</project>
<project>TxtSmartFactoryLib</project>
</projects>
<buildSpec>
Expand Down
49 changes: 49 additions & 0 deletions TxtParkPos/.settings/org.eclipse.cdt.managedbuilder.core.prefs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
eclipse.preferences.version=1
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/CPATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/CPATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/CPLUS_INCLUDE_PATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/CPLUS_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/C_INCLUDE_PATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/C_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/append=true
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/appendContributed=true
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/CPATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/CPATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/CPLUS_INCLUDE_PATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/CPLUS_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/C_INCLUDE_PATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/C_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/append=true
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/appendContributed=true
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/CPATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/CPATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/CPLUS_INCLUDE_PATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/CPLUS_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/C_INCLUDE_PATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/C_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/append=true
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/appendContributed=true
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666/CPATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666/CPATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666/CPLUS_INCLUDE_PATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666/CPLUS_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666/C_INCLUDE_PATH/delimiter=\:
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666/C_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666/append=true
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.release.345746666/appendContributed=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/LIBRARY_PATH/delimiter=\:
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/LIBRARY_PATH/operation=remove
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/append=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.136449856/appendContributed=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/LIBRARY_PATH/delimiter=\:
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/LIBRARY_PATH/operation=remove
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/append=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.203970726/appendContributed=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/LIBRARY_PATH/delimiter=\:
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/LIBRARY_PATH/operation=remove
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/append=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666.489247668/appendContributed=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666/LIBRARY_PATH/delimiter=\:
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666/LIBRARY_PATH/operation=remove
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666/append=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.release.345746666/appendContributed=true
36 changes: 10 additions & 26 deletions TxtSmartFactoryLib/.cproject
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="a" artifactName="${ProjName}_Debug" 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="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.cross.exe.debug.1044973461" name="Posix_Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="cdt.managedbuild.config.gnu.cross.exe.debug" postannouncebuildStep="makedocfsm" postbuildStep="bash ../doc/makedocfsm.sh" preannouncebuildStep="" prebuildStep="">
<configuration artifactExtension="a" artifactName="${ProjName}_Debug" 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="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.cross.exe.debug.1044973461" name="Posix_Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.cross.exe.debug" postannouncebuildStep="makedocfsm" postbuildStep="bash ../doc/makedocfsm.sh" preannouncebuildStep="" prebuildStep="">
<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.debug.1044973461." name="/" resourcePath="">
<toolChain errorParsers="" id="cdt.managedbuild.toolchain.gnu.cross.exe.debug.898297730" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.debug">
<option id="cdt.managedbuild.option.gnu.cross.prefix.515251002" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" value="arm-linux-gnueabihf-" valueType="string"/>
<option id="cdt.managedbuild.option.gnu.cross.path.291696342" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path" value="/opt/FT/TXT/opt/ext-toolchain/bin" valueType="string"/>
<option id="cdt.managedbuild.option.gnu.cross.prefix.515251002" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" useByScannerDiscovery="false" value="arm-linux-gnueabihf-" valueType="string"/>
<option id="cdt.managedbuild.option.gnu.cross.path.291696342" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path" useByScannerDiscovery="false" value="/opt/FT/TXT/opt/ext-toolchain/bin" valueType="string"/>
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1794861560" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
<builder buildPath="${workspace_loc:/HelloWorldCross}/Debug" enabledIncrementalBuild="true" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="cdt.managedbuild.builder.gnu.cross.1860008959" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
<tool command="gcc" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.tool.gnu.cross.c.compiler.1227954050" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.17339318" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
<option id="gnu.c.compiler.option.debugging.level.1791301996" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.17339318" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.c.optimization.level.most" valueType="enumerated"/>
<option id="gnu.c.compiler.option.debugging.level.1791301996" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.144554529" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/TxtSmartFactoryLib/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/TxtSmartFactoryLib/libs}&quot;"/>
Expand All @@ -51,8 +51,8 @@
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.700375260" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
<tool command="g++" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.180405712" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
<option id="gnu.cpp.compiler.option.optimization.level.1093418724" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
<option id="gnu.cpp.compiler.option.debugging.level.77112162" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
<option id="gnu.cpp.compiler.option.optimization.level.1093418724" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
<option id="gnu.cpp.compiler.option.debugging.level.77112162" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1324079182" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/TxtSmartFactoryLib/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/TxtSmartFactoryLib/libs}&quot;"/>
Expand Down Expand Up @@ -107,7 +107,7 @@
</tool>
<tool id="cdt.managedbuild.tool.gnu.cross.archiver.906526135" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
<tool command="as" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GASErrorParser" id="cdt.managedbuild.tool.gnu.cross.assembler.86681019" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.340757820" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.340757820" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/deps/include}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1545681009" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
Expand All @@ -120,15 +120,7 @@
</sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
<externalSettings containerId="KeLibTxt_Work;cdt.managedbuild.config.gnu.cross.lib.release.455464804" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier">
<externalSetting>
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/KeLibTxt_Work"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/KeLibTxt_Work/Release"/>
<entry flags="RESOLVED" kind="libraryFile" name="KeLibTxt_Work" srcPrefixMapping="" srcRootPath=""/>
</externalSetting>
</externalSettings>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
<cconfiguration id="cdt.managedbuild.config.gnu.cross.exe.release.345746666">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.release.345746666" moduleId="org.eclipse.cdt.core.settings" name="Posix_Release">
Expand Down Expand Up @@ -234,15 +226,7 @@
</sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
<externalSettings containerId="KeLibTxt_Work;cdt.managedbuild.config.gnu.cross.lib.release.455464804" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier">
<externalSetting>
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/KeLibTxt_Work"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/KeLibTxt_Work/Release"/>
<entry flags="RESOLVED" kind="libraryFile" name="KeLibTxt_Work" srcPrefixMapping="" srcRootPath=""/>
</externalSetting>
</externalSettings>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
Expand Down
1 change: 0 additions & 1 deletion TxtSmartFactoryLib/.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<name>TxtSmartFactoryLib</name>
<comment></comment>
<projects>
<project>KeLibTxt_Work</project>
</projects>
<buildSpec>
<buildCommand>
Expand Down
Binary file modified bin/TxtFactoryHBW
View file
Binary file not shown.
Binary file modified bin/TxtFactoryMPO
View file
Binary file not shown.
Binary file modified bin/TxtFactoryMain.cloud
View file
Binary file not shown.
Binary file modified bin/TxtFactorySLD
View file
Binary file not shown.
Binary file modified bin/TxtFactoryVGR
View file
Binary file not shown.
Binary file modified bin/TxtParkPosHBW
View file
Binary file not shown.
Binary file modified bin/TxtParkPosMPO
View file
Binary file not shown.
Binary file modified bin/TxtParkPosSSC
View file
Binary file not shown.
Binary file modified bin/TxtParkPosVGR
View file
Binary file not shown.
Empty file modified deps/lib/libKeLibTxt.so
100755 → 100644
View file
Empty file.
Binary file modified deps/lib/libMotorIOLib.so
View file
Binary file not shown.
Binary file modified deps/lib/libROBOProLib.so
100755 → 100644
View file
Binary file not shown.
Binary file modified deps/lib/libSDLWidgetsLib.so
View file
Binary file not shown.

0 comments on commit 5d2b60b

Please sign in to comment.