Commit 4207b882 authored by Peter Zumbruch's avatar Peter Zumbruch
Browse files

merged in 4.6.1 including new SPI interface, CAN changes, global fixes

parent 71978752
......@@ -23,7 +23,7 @@
<builder id="org.eclipse.cdt.build.core.settings.default.builder.1408240114" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1491519979" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.259046369" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1286898020" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1286898020" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="/opt/cross/avr/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/lib/gcc/avr/4.3.3/include"/>
......@@ -31,7 +31,7 @@
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.974436993" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.1538976891" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.847140887" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.847140887" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="/opt/cross/avr/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/lib/gcc/avr/4.3.3/include"/>
......@@ -39,7 +39,7 @@
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.480429370" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.124781639" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1767058096" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1767058096" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="/opt/cross/avr/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/lib/gcc/avr/4.3.3/include"/>
......@@ -52,6 +52,55 @@
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
<cconfiguration id="0.156350869.190855603">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.156350869.190855603" moduleId="org.eclipse.cdt.core.settings" name="API-Slave (__AVR_AT90CAN128__)">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.VCErrorParser" 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"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration buildProperties="" description="" id="0.156350869.190855603" name="API-Slave (__AVR_AT90CAN128__)" parent="org.eclipse.cdt.build.core.prefbase.cfg">
<folderInfo id="0.156350869.190855603." name="/" resourcePath="">
<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.906979406" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.906979406.1050668764" name=""/>
<builder id="org.eclipse.cdt.build.core.settings.default.builder.1427962297" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1880576456" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.15831852" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.827192496" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="/opt/cross/avr/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/lib/gcc/avr/4.3.3/include"/>
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.169984826" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.488262384" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1783573149" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="/opt/cross/avr/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/lib/gcc/avr/4.3.3/include"/>
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1394305769" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.1874306191" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1922189582" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="/opt/cross/avr/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/include"/>
<listOptionValue builtIn="false" value="/opt/cross/avr/lib/gcc/avr/4.3.3/include"/>
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1185048645" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="API-Slave.git.null.912774011" name="API-Slave.git"/>
......
......@@ -7,4 +7,5 @@
obj_hadcon_*/
.dep/
*.hex
/echo
/HADCON_VERSION=1 TARGET=api_hadcon1 make -f Makefile_HadconX program
#Thu Jul 07 13:39:54 CEST 2011
eclipse.preferences.version=1
org.eclipse.cdt.codan.checkers.errnoreturn=Warning
org.eclipse.cdt.codan.checkers.errnoreturn.params={implicit\=>false}
org.eclipse.cdt.codan.checkers.errnoreturn=Error
org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
org.eclipse.cdt.codan.checkers.errreturnvalue=Error
org.eclipse.cdt.codan.checkers.errreturnvalue.params={}
org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.checkers.noreturn=Error
org.eclipse.cdt.codan.checkers.noreturn.params={implicit\=>false}
org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={}
org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={}
org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={unknown\=>false,exceptions\=>()}
org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning
org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={}
org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={}
org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={}
org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=Warning
org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={macro\=>true,exceptions\=>()}
org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={paramNot\=>false}
org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={else\=>false,afterelse\=>false}
org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={}
org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={}
org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={exceptions\=>("@(\#)","$Id")}
org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
useParentScope=false
eclipse.preferences.version=1
environment/project/0.156350869.190855603/TESTING_ENABLE/delimiter=\:
environment/project/0.156350869.190855603/TESTING_ENABLE/operation=replace
environment/project/0.156350869.190855603/TESTING_ENABLE/value=
environment/project/0.156350869.190855603/__AVR_AT90CAN128__/delimiter=\:
environment/project/0.156350869.190855603/__AVR_AT90CAN128__/operation=replace
environment/project/0.156350869.190855603/__AVR_AT90CAN128__/value=1
environment/project/0.156350869.190855603/append=true
environment/project/0.156350869.190855603/appendContributed=true
environment/project/0.156350869/append=true
environment/project/0.156350869/appendContributed=true
environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1529452256/HADCON_VERSION/delimiter=\:
environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1529452256/HADCON_VERSION/operation=remove
environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1529452256/HADCON_VERSION/value=2
......
......@@ -18,11 +18,12 @@ HADCON_TARGET_SUFFIX ?= _hadcon_
ifndef HADCON_VERSION
all: both
else
all: $(foreach hadcon, $(HADCON_VERSION), all$(HADCON_TARGET_SUFFIX)$(hadcon))
all: all$(HADCON_TARGET_SUFFIX)$(HADCON_VERSION)
endif
all_hadcon_%:
HADCON_VERSION=$(*F) TARGET=$(HADCON_TARGET_BASE)_hadcon$(*F) $(MAKE) -f $(HADCON_MAKEFILE) $(subst $(HADCON_TARGET_SUFFIX)$(*F),,$@)
#all_hadcon_%:
all$(HADCON_TARGET_SUFFIX)%:
@HADCON_VERSION=$(*F) TARGET=$(HADCON_TARGET_BASE)_hadcon$(*F) $(MAKE) -f $(HADCON_MAKEFILE) $(subst $(HADCON_TARGET_SUFFIX)$(*F),,$@)
both: $(foreach hadcon, $(HADCON_TYPES), all$(HADCON_TARGET_SUFFIX)$(hadcon))
......@@ -57,7 +58,7 @@ set_fuses: $(foreach hadcon, $(HADCON_VERSION), set_fuses$(HADCON_TARGET_SUFFIX)
endif
set_fuses_hadcon_%:
HADCON_VERSION=$(*F) TARGET=$(HADCON_TARGET_BASE)_hadcon$(*F) $(MAKE) -f $(HADCON_MAKEFILE) $(subst $(HADCON_TARGET_SUFFIX)$(*F),,$@)
@HADCON_VERSION=$(*F) TARGET=$(HADCON_TARGET_BASE)_hadcon$(*F) $(MAKE) -f $(HADCON_MAKEFILE) $(subst $(HADCON_TARGET_SUFFIX)$(*F),,$@)
# Program the device.
ifndef HADCON_VERSION
......@@ -131,18 +132,18 @@ COFFCONVERT += --change-section-address .eeprom-0x810000
coff: $(foreach hadcon, $(HADCON_TYPES), coff$(HADCON_TARGET_SUFFIX)$(hadcon))
coff_hadcon_%:
HADCON_VERSION=$(*F) TARGET=$(HADCON_TARGET_BASE)_hadcon$(*F) $(MAKE) -f $(HADCON_MAKEFILE) $(subst $(HADCON_TARGET_SUFFIX)$(*F),,$@)
@HADCON_VERSION=$(*F) TARGET=$(HADCON_TARGET_BASE)_hadcon$(*F) $(MAKE) -f $(HADCON_MAKEFILE) $(subst $(HADCON_TARGET_SUFFIX)$(*F),,$@)
extcoff: $(foreach hadcon, $(HADCON_TYPES), extcoff$(HADCON_TARGET_SUFFIX)$(hadcon))
extcoff_hadcon_%:
HADCON_VERSION=$(*F) TARGET=$(HADCON_TARGET_BASE)_hadcon$(*F) $(MAKE) -f $(HADCON_MAKEFILE) $(subst $(HADCON_TARGET_SUFFIX)$(*F),,$@)
@HADCON_VERSION=$(*F) TARGET=$(HADCON_TARGET_BASE)_hadcon$(*F) $(MAKE) -f $(HADCON_MAKEFILE) $(subst $(HADCON_TARGET_SUFFIX)$(*F),,$@)
# Target: clean project.
clean: $(foreach hadcon, $(HADCON_TYPES), clean$(HADCON_TARGET_SUFFIX)$(hadcon))
clean_hadcon_%:
HADCON_VERSION=$(*F) TARGET=$(HADCON_TARGET_BASE)_hadcon$(*F) $(MAKE) -f $(HADCON_MAKEFILE) $(subst $(HADCON_TARGET_SUFFIX)$(*F),,$@)
@HADCON_VERSION=$(*F) TARGET=$(HADCON_TARGET_BASE)_hadcon$(*F) $(MAKE) -f $(HADCON_MAKEFILE) $(subst $(HADCON_TARGET_SUFFIX)$(*F),,$@)
# Listing of phony targets.
.PHONY : all begin finish end sizebefore sizeafter gccversion \
......
......@@ -106,7 +106,15 @@ SRC += twi_mpx_functions.c
SRC += twi_ow_functions.c
SRC += help_twis.c
SRC += waveform_generator_registers.c
SRC += spi.c
SRC += spiApi.c
ifdef TESTING_ENABLE
SRC += testing.c
ifdef FB_SPI_TEST
SRC += spiTest.c
endif
endif
# List C++ source files here. (C dependencies are automatically generated.)
CPPSRC =
......@@ -124,8 +132,8 @@ ASRC =
# Optimization level, can be [0, 1, 2, 3, s].
# 0 = turn off optimization. s = optimize for size.
# (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
#OPT = s
OPT = 2
OPT = s
#OPT = 2
# Debugging format.
# Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
......
......@@ -37,6 +37,8 @@
#include "twi_mpx_functions.h"
#include "twi_ow_functions.h"
static const char filename[] PROGMEM = __FILE__;
/* not used *
void OWI_ResetPulse(unsigned char pins)
{
......
......@@ -41,6 +41,8 @@
#include "OWIHighLevelFunctions.h"
#include "OWIBitFunctions.h"
static const char filename[] PROGMEM = __FILE__;
#define ADC_CYCLES 3 /*the number of ADC conversions done to get an average voltage value*/
#define ADC_TIMEOUT 1000 /*wait ADC_TIMEOUT clock cycles for a single ADC conversion*/
......@@ -62,7 +64,7 @@ void atmelReadADCs( struct uartStruct *ptr_uartStruct)
break;
case 1:
{
printDebug_p(debugLevelEventDebug, debugSystemADC, __LINE__, PSTR(__FILE__), PSTR(""));
printDebug_p(debugLevelEventDebug, debugSystemADC, __LINE__, filename, PSTR(""));
/* read single channel */
......@@ -88,7 +90,7 @@ void atmelReadADCs( struct uartStruct *ptr_uartStruct)
uint8_t atmelCollectSingleADCChannel( int8_t channelIndex, uint8_t quiet )
{
printDebug_p(debugLevelEventDebug, debugSystemADC, __LINE__, PSTR(__FILE__), PSTR("channel index %i"), channelIndex);
printDebug_p(debugLevelEventDebug, debugSystemADC, __LINE__, filename, PSTR("channel index %i"), channelIndex);
for ( uint8_t i = 0 ; i <= 1 ; i++ )
{
......@@ -159,7 +161,7 @@ uint8_t atmelCollectSingleADCChannel( int8_t channelIndex, uint8_t quiet )
CommunicationError_p(ERRG, dynamicMessage_ErrorIndex, TRUE, PSTR("error accessing ADC channel %i"), ptr_uartStruct->Uart_Message_ID);
return status;
}
printDebug_p(debugLevelEventDebug, debugSystemADC, __LINE__, PSTR(__FILE__), PSTR("value %i"), atmelAdcValues[channelIndex]) ;
printDebug_p(debugLevelEventDebug, debugSystemADC, __LINE__, filename, PSTR("value %i"), atmelAdcValues[channelIndex]) ;
if ( ! quiet )
{
......@@ -225,7 +227,7 @@ int8_t atmelReadSingleADCChannelVoltage( unsigned int channel_nr )
if ( Timeout == 0 )
{
printDebug_p(debugLevelEventDebug, debugSystemADC, __LINE__, PSTR(__FILE__), PSTR("Timeout"));
printDebug_p(debugLevelEventDebug, debugSystemADC, __LINE__, filename, PSTR("Timeout"));
return eADCTimeout;
}
......@@ -239,7 +241,7 @@ int8_t atmelReadSingleADCChannelVoltage( unsigned int channel_nr )
/*save results*/
atmelAdcValues[channel_nr] = (uint16_t) TotalValue;
printDebug_p(debugLevelEventDebug, debugSystemADC, __LINE__, PSTR(__FILE__), PSTR("value = %i"), TotalValue) ;
printDebug_p(debugLevelEventDebug, debugSystemADC, __LINE__, filename, PSTR("value = %i"), TotalValue) ;
return eNoError;
}// END of atmelReadSingleADCChannelVoltage function
......
This diff is collapsed.
......@@ -6,6 +6,7 @@
#include <stdint.h>
#include <stdarg.h>
#include <stdbool.h>
#include "api_define.h"
#include "api_global.h"
......@@ -30,6 +31,8 @@ typedef struct uartStruct
extern struct uartStruct uartFrame;
extern struct uartStruct *ptr_uartStruct;
extern bool uartInputBufferExceeded;
/* Implemented functions
* and
* corresponding function pointers*/
......@@ -46,7 +49,7 @@ void apiConvertUartDataToCanUartStruct( uint8_t offset ); /*converting the decom
void keep_alive( struct uartStruct *PtrFrame ); /*this function checks the functionality of the software*/
int8_t uartSplitUartString( void ); /*CPU-cutting format in various parameters */
int8_t uartSplitUartString( char inputUartString[] ); /*CPU-cutting format in various parameters */
void Initialization( void ); /*this function initialize all init functions again and actives the interrupt*/
......@@ -61,12 +64,17 @@ int8_t UART0_Init( void ); /* initialize serial communication */
void UART0_Transmit( unsigned char c );/* function send data direction to cpu */
extern void (*UART0_Transmit_p)( uint8_t );
int16_t UART0_Send_Message_String( char *tmp_str, uint16_t maxSize );/* help function for the output of register contents in CPU */
int16_t UART0_Send_Message_String( char *outputString, uint16_t maxSize );/* help function for the output of register contents in CPU */
extern int16_t (*UART0_Send_Message_String_p)( char *, uint16_t );
int8_t UART0_Send_Message_String_woLF( char *tmp_str, uint32_t maxSize );/* help function for the output of register contents in CPU */
int8_t UART0_Send_Message_String_woLF( char *outputString, uint32_t maxSize );/* help function for the output of register contents in CPU */
int8_t apiFindCommandKeywordIndex(const char string[], PGM_P commandKeywords[], size_t commandMaximumIndex ); /* find matching command keyword and return its index*/
int Parse_Keyword( char string[] ); /* find matching command keyword and return its index*/
static inline bool isKeywordIndex( int index, int maximumIndex )
{
return ( -1 < index && index < maximumIndex);
}
void Reset_SetParameter( void ); /* resets/clears all values of setParameter */
......@@ -91,9 +99,11 @@ uint8_t createReceiveHeader( struct uartStruct *ptr_uartStruct, char message_str
void createExtendedSubCommandReceiveResponseHeader(struct uartStruct * ptr_uartStruct, int8_t keyNumber, int8_t index, PGM_P commandKeyword[]);
uint16_t getNumericLength(const char string[], const uint16_t maxLenght);
uint16_t getNumberOfHexDigits(const char string[], const uint16_t maxLenght);
bool isNumericArgument(const char string[], const uint16_t maxLength);
int8_t getNumericValueFromParameter(uint8_t parameterIndex, uint32_t *ptr_value);
int8_t getUnsignedNumericValueFromParameterIndex(uint8_t parameterIndex, uint64_t *ptr_value);
int8_t getUnsignedNumericValueFromParameterString(const char string[], uint64_t *ptr_value);
void reset(struct uartStruct *ptr_uartStruct);
void init(struct uartStruct *ptr_uartStruct);
......@@ -104,6 +114,11 @@ size_t getMaximumStringArrayLength(const char* array[], size_t maxIndex, size_t
void determineAndHandleResetSource(void);
bool isNumericalConstantOne(const char string[]);
bool isNumericalConstantZero(const char string[]);
#ifndef API_CONSTANTS_H_
extern const char *general_error[] PROGMEM;
......@@ -117,7 +132,7 @@ enum ge_index
GENERAL_ERROR_undefined_bus,
GENERAL_ERROR_channel_undefined,
GENERAL_ERROR_value_has_invalid_type,
GENERAL_ERROR_adress_has_invalid_type,
GENERAL_ERROR_address_has_invalid_type,
GENERAL_ERROR_undefined_family_code,
GENERAL_ERROR_invalid_argument,
GENERAL_ERROR_MAXIMUM_INDEX
......@@ -128,38 +143,15 @@ extern const char *serial_error[] PROGMEM;
enum se_index
{
SERIAL_ERROR_no_valid_command_name = 0,
SERIAL_ERROR_ID_is_too_long,
SERIAL_ERROR_mask_is_too_long,
SERIAL_ERROR_rtr_is_too_long,
SERIAL_ERROR_length_is_too_long,
SERIAL_ERROR_data_0_is_too_long,
SERIAL_ERROR_data_1_is_too_long,
SERIAL_ERROR_data_2_is_too_long,
SERIAL_ERROR_data_3_is_too_long,
SERIAL_ERROR_data_4_is_too_long,
SERIAL_ERROR_data_5_is_too_long,
SERIAL_ERROR_data_6_is_too_long,
SERIAL_ERROR_data_7_is_too_long,
SERIAL_ERROR_command_is_too_long,
SERIAL_ERROR_argument_has_invalid_type,
SERIAL_ERROR_ID_has_invalid_type,
SERIAL_ERROR_mask_has_invalid_type,
SERIAL_ERROR_rtr_has_invalid_type,
SERIAL_ERROR_length_has_invalid_type,
SERIAL_ERROR_data_0_has_invalid_type,
SERIAL_ERROR_data_1_has_invalid_type,
SERIAL_ERROR_data_2_has_invalid_type,
SERIAL_ERROR_data_3_has_invalid_type,
SERIAL_ERROR_data_4_has_invalid_type,
SERIAL_ERROR_data_5_has_invalid_type,
SERIAL_ERROR_data_6_has_invalid_type,
SERIAL_ERROR_data_7_has_invalid_type,
SERIAL_ERROR_undefined_error_type,
SERIAL_ERROR_first_value_is_too_long,
SERIAL_ERROR_second_value_is_too_long,
SERIAL_ERROR_arguments_have_invalid_type,
SERIAL_ERROR_arguments_exceed_boundaries,
SERIAL_ERROR_too_many_arguments,
SERIAL_ERROR_too_few_arguments,
SERIAL_ERROR_invalid_sub_command_name,
SERIAL_ERROR_argument_string_too_long,
SERIAL_ERROR_MAXIMUM_INDEX
};
......
......@@ -31,6 +31,8 @@
#include "api_show.h"
#include "api_help.h"
static const char filename[] PROGMEM = __FILE__;
/* max length defined by MAX_LENGTH_PARAMETER */
static const char commandDebugKeyword00[] PROGMEM = "all";
static const char commandDebugKeyword01[] PROGMEM = "level";
......@@ -78,6 +80,7 @@ static const char debugSystemName19[] PROGMEM = "TIMER1";
static const char debugSystemName20[] PROGMEM = "TIMER0A";
static const char debugSystemName21[] PROGMEM = "TIMER0AScheduler";
static const char debugSystemName22[] PROGMEM = "TWI";
static const char debugSystemName23[] PROGMEM = "SPI";
const char *debugSystemNames[] PROGMEM =
{
......@@ -85,7 +88,7 @@ const char *debugSystemNames[] PROGMEM =
debugSystemName06, debugSystemName07, debugSystemName08, debugSystemName09, debugSystemName10,
debugSystemName11, debugSystemName12, debugSystemName13, debugSystemName14, debugSystemName15,
debugSystemName16, debugSystemName17, debugSystemName18, debugSystemName19, debugSystemName20,
debugSystemName21, debugSystemName22
debugSystemName21, debugSystemName22, debugSystemName23
};
int8_t apiDebug(struct uartStruct *ptr_uartStruct)
......@@ -99,11 +102,14 @@ int8_t apiDebug(struct uartStruct *ptr_uartStruct)
hasSubCommand = FALSE;
break;
default:
if (0 == getNumericLength(&setParameter[1][0], MAX_LENGTH_PARAMETER))
if ( FALSE == isNumericArgument(&setParameter[1][0], MAX_LENGTH_PARAMETER))
{
hasSubCommand = TRUE;
}
else
{
hasSubCommand = FALSE;
}
break;
}
......@@ -157,34 +163,19 @@ int8_t apiDebug(struct uartStruct *ptr_uartStruct)
int8_t apiDebugSubCommands(struct uartStruct *ptr_uartStruct, int16_t subCommandIndex)
{
uint32_t status = 0;
uint32_t value = 0;
int8_t status = 0;
uint64_t value = 0;
if ( 0 > subCommandIndex )
{
subCommandIndex = 0;
// find matching command keyword
while ( subCommandIndex < commandDebugKeyNumber_MAXIMUM_NUMBER )
{
if ( 0 == strncmp_P(setParameter[1], (const char*) ( pgm_read_word( &(commandDebugKeywords[subCommandIndex])) ), MAX_LENGTH_PARAMETER) )
{
printDebug_p(debugLevelEventDebug, debugSystemDEBUG, __LINE__, PSTR(__FILE__), PSTR("keyword %s matches"), &setParameter[1][0]);
break;
}
else
{
printDebug_p(debugLevelEventDebug, debugSystemDEBUG, __LINE__, PSTR(__FILE__), PSTR("keyword %s doesn't match"), &setParameter[1][0]);
}
subCommandIndex++;
}
subCommandIndex = apiFindCommandKeywordIndex(setParameter[1], commandDebugKeywords, commandDebugKeyNumber_MAXIMUM_NUMBER);
}
/* TODO: relayThresholdMiscSubCommandsChooseFunction(ptr_uartStruct, index)*/
switch ( ptr_uartStruct->number_of_arguments - 1 /* arguments of argument */)
{
case 0:
{
{
/* printout status*/
/* generate message */
......@@ -226,7 +217,7 @@ int8_t apiDebugSubCommands(struct uartStruct *ptr_uartStruct, int16_t subCommand
case 1:
{
/* set values*/
status = getNumericValueFromParameter(2, &value);
status = getUnsignedNumericValueFromParameterIndex(2, &value);
if ( 0 != status ) { return -1 ; }
switch ( subCommandIndex )
{
......@@ -254,7 +245,7 @@ int8_t apiDebugSubCommands(struct uartStruct *ptr_uartStruct, int16_t subCommand
break;
case 2:
{
status = getNumericValueFromParameter(3, &value);
status = getUnsignedNumericValueFromParameterIndex(3, &value);
if ( 0 != status ) { return -1 ; }
switch ( subCommandIndex )
{
......@@ -297,7 +288,7 @@ void apiDebugReadModifyDebugLevelAndMask(struct uartStruct *ptr_uartStruct)
* set response: ...
* get response: RECV DEBG level mask*/
uint32_t value = 0;
uint64_t value = 0;
int8_t status = 0;
switch (ptr_uartStruct->number_of_arguments)
{
......@@ -311,7 +302,7 @@ void apiDebugReadModifyDebugLevelAndMask(struct uartStruct *ptr_uartStruct)
apiDebugReadModifyDebugLevel(ptr_uartStruct);
break;
case 2: /*write debug and mask*/
status = getNumericValueFromParameter(2, &value);
status = getUnsignedNumericValueFromParameterIndex(2, &value);
if ( 0 != status ) { return; }
apiDebugReadModifyDebugLevel(ptr_uartStruct);
status = apiDebugSetDebugMask(value);
......@@ -343,7 +334,7 @@ void apiDebugReadModifyDebugLevel(struct uartStruct *ptr_uartStruct)
/*TODO: change CAN naming to more general */
uint32_t value = 0;
uint64_t value = 0;
int8_t status = 0;
switch (ptr_uartStruct->number_of_arguments)
......@@ -356,7 +347,7 @@ void apiDebugReadModifyDebugLevel(struct uartStruct *ptr_uartStruct)
UART0_Send_Message_String_p(NULL,0);
break;
case 1: /*write debug*/
status = getNumericValueFromParameter(1, &value);
status = getUnsignedNumericValueFromParameterIndex(1, &value);
if ( 0 != status ) { return; }
status = apiDebugSetDebugLevel(value);
if ( 0 != status ) { return; }
......@@ -387,7 +378,7 @@ void apiDebugReadModifyDebugMask(struct uartStruct *ptr_uartStruct)
* get response: RECV DBGM level*/
int8_t status;
uint32_t value;
uint64_t value;
switch (ptr_uartStruct->number_of_arguments)
{
......@@ -399,7 +390,7 @@ void apiDebugReadModifyDebugMask(struct uartStruct *ptr_uartStruct)
UART0_Send_Message_String_p(NULL,0);
break;
case 1: /*write debug*/
status = getNumericValueFromParameter(1, &value);
status = getUnsignedNumericValueFromParameterIndex(1, &value);
if ( 0 != status ) { return; }
status = apiDebugSetDebugMask(value);
if ( 0 != status ) { return; }
......
......@@ -52,6 +52,7 @@ enum debugSystems