sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Merge branch 'testing-temp-rework' into ci-codeship

Browse Source
This commit is contained in:
Ben V. Brown
2019-12-23 18:46:00 +11:00
parent cc79fcb4cf 51420829f0
commit aee37d4c5d
7 changed files with 314 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
workspace/TS100/.cproject
View File

@@ -31,7 +31,7 @@
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths.1236938233" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="../"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1567896324" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1567896324" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
<listOptionValue builtIn="false" value="MODEL_TS100"/>
<listOptionValue builtIn="false" value="STM32F103xB"/>
@@ -99,11 +99,11 @@
</inputType>
</tool>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1902507185" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.752998" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" useByScannerDiscovery="false" value="/home/ralim/source/ts100/workspace/TS100/LinkerScript.ld" valueType="string"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.752998" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" useByScannerDiscovery="false" value="C:\Users\Ralim.DESKTOP-R877O7F\Documents\GitHub\ts100\workspace\TS100\LinkerScript.ld" valueType="string"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags.329644110" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
<listOptionValue builtIn="false" value="-flto"/>
</option>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref.145186443" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref.145186443" name="Add symbol cross reference table to map file (-Wl,--cref)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input.1684195922" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -129,6 +129,134 @@
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551" moduleId="org.eclipse.cdt.core.settings" name="TS80">
<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="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="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551" name="TS80" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551." name="/" resourcePath="">
<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.119279677" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.849152425" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.159605979" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1536164180" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="false" value="STM32F103T8Ux" valueType="string"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1370739571" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.295605019" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.973266354" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.464348240" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.0 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32F103T8Ux || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3 || ../ || || USE_HAL_DRIVER | STM32F103xB || || Startup || Drivers | Middlewares | Core || || ${workspace_loc:/${ProjName}/STM32F103T8UX_FLASH.ld} || true" valueType="string"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1607101911" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1970014216" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
<builder buildPath="${workspace_loc:/TS100}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1807978370" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.832589290" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.2021461351" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths.1740040757" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="../"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1866744147" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
<listOptionValue builtIn="false" value="MODEL_TS80"/>
<listOptionValue builtIn="false" value="STM32F103xB"/>
</option>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1978031483" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
</tool>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1462185687" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1548601111" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.457682077" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1260353799" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
<listOptionValue builtIn="false" value="MODEL_TS80"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
<listOptionValue builtIn="false" value="STM32F103xB"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.540768214" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Core/Inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
</option>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra.1574359913" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1077707594" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
<listOptionValue builtIn="false" value="-Wno-write-strings"/>
</option>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1813870546" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
</tool>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1660249714" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.16251983" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1224833714" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.1599760897" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
<listOptionValue builtIn="false" value="MODEL_TS80"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
<listOptionValue builtIn="false" value="STM32F103xB"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths.925084011" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Core/Inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
</option>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra.110760609" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags.834159935" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
<listOptionValue builtIn="false" value="-fno-rtti"/>
<listOptionValue builtIn="false" value="-Wno-write-strings"/>
<listOptionValue builtIn="false" value="-fno-exceptions"/>
<listOptionValue builtIn="false" value="-fno-non-call-exceptions"/>
<listOptionValue builtIn="false" value="-fno-use-cxa-atexit"/>
<listOptionValue builtIn="false" value="-fno-strict-aliasing"/>
</option>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1576964672" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
</tool>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1130643119" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.215123120" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32F103T8UX_FLASH.ld}" valueType="string"/>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.300729142" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.227435340" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.830347551" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" useByScannerDiscovery="false" value="C:\Users\Ralim.DESKTOP-R877O7F\Documents\GitHub\ts100\workspace\TS100\LinkerScript.ld" valueType="string"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags.2106114007" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
<listOptionValue builtIn="false" value="-flto"/>
</option>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref.1223102617" name="Add symbol cross reference table to map file (-Wl,--cref)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input.1693496005" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1793875206" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.2031511845" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1883149988" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1503571164" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1574630014" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.948380741" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.260468267" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.984915652" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
</toolChain>
</folderInfo>
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Startup"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
</sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="TS100.null.5136256" name="TS100"/>

2
workspace/TS100/Core/Src/GUIThread.cpp
View File

@@ -710,7 +710,7 @@ void startGUITask(void const *argument __unused) {
gui_solderingMode(1);
}
#if ACCELDEBUG
#ifdef ACCELDEBUG
for (;;) {
HAL_IWDG_Refresh(&hiwdg);

268
workspace/TS100/Core/Src/TipThermoModel.cpp
View File

@@ -69,240 +69,6 @@ uint32_t TipThermoModel::convertTipRawADCToDegF(uint16_t rawADC) {
//Table that is designed to be walked to find the best sample for the lookup
struct HakkoThermocoupleLookup {
// 0 is the uV reading
// 1 is the deg C X10
// This was created from numbers transcribed from the patent by <Kuba Sztandera>
constexpr HakkoThermocoupleLookup() :
values() {
values[0][0] = 0;
values[0][1] = 0;
values[1][0] = 0;
values[1][1] = 0;
values[2][0] = 175;
values[2][1] = 100;
values[3][0] = 381;
values[3][1] = 200;
values[4][0] = 587;
values[4][1] = 300;
values[5][0] = 804;
values[5][1] = 400;
values[6][0] = 1005;
values[6][1] = 500;
values[7][0] = 1007;
values[7][1] = 600;
values[8][0] = 1107;
values[8][1] = 700;
values[9][0] = 1310;
values[9][1] = 800;
values[10][0] = 1522;
values[10][1] = 900;
values[11][0] = 1731;
values[11][1] = 1000;
values[12][0] = 1939;
values[12][1] = 1100;
values[13][0] = 2079;
values[13][1] = 1200;
values[14][0] = 2265;
values[14][1] = 1300;
values[15][0] = 2470;
values[15][1] = 1400;
values[16][0] = 2676;
values[16][1] = 1500;
values[17][0] = 2899;
values[17][1] = 1600;
values[18][0] = 3081;
values[18][1] = 1700;
values[19][0] = 3186;
values[19][1] = 1800;
values[20][0] = 3422;
values[20][1] = 1900;
values[21][0] = 3622;
values[21][1] = 2000;
values[22][0] = 3830;
values[22][1] = 2100;
values[23][0] = 4044;
values[23][1] = 2200;
values[24][0] = 4400;
values[24][1] = 2300;
values[25][0] = 4691;
values[25][1] = 2400;
values[26][0] = 4989;
values[26][1] = 2500;
values[27][0] = 5289;
values[27][1] = 2600;
values[28][0] = 5583;
values[28][1] = 2700;
values[29][0] = 5879;
values[29][1] = 2800;
values[30][0] = 6075;
values[30][1] = 2900;
values[31][0] = 6332;
values[31][1] = 3000;
values[32][0] = 6521;
values[32][1] = 3100;
values[33][0] = 6724;
values[33][1] = 3200;
values[34][0] = 6929;
values[34][1] = 3300;
values[35][0] = 7132;
values[35][1] = 3400;
values[36][0] = 7356;
values[36][1] = 3500;
values[37][0] = 7561;
values[37][1] = 3600;
values[38][0] = 7774;
values[38][1] = 3700;
values[39][0] = 7992;
values[39][1] = 3800;
values[40][0] = 8200;
values[40][1] = 3900;
values[41][0] = 8410;
values[41][1] = 4000;
values[42][0] = 8626;
values[42][1] = 4100;
values[43][0] = 8849;
values[43][1] = 4200;
values[44][0] = 9060;
values[44][1] = 4300;
values[45][0] = 9271;
values[45][1] = 4400;
values[46][0] = 9531;
values[46][1] = 4500;
values[47][0] = 9748;
values[47][1] = 4600;
values[48][0] = 10210;
values[48][1] = 4700;
values[49][0] = 10219;
values[49][1] = 4800;
values[50][0] = 10429;
values[50][1] = 4900;
values[51][0] = 10649;
values[51][1] = 5000;
}
uint32_t count = 52;
uint32_t values[52][2];
};
struct MiniwareThermocoupleLookup {
// 0 is the uV reading
// 1 is the deg C X10
// This was created from numbers transcribed from the patent by <Kuba Sztandera>
constexpr MiniwareThermocoupleLookup() :
values() {
values[0][0] = 0;
values[0][1] = 0;
values[1][0] = 0;
values[1][1] = 0;
values[2][0] = 0;
values[2][1] = 100;
values[3][0] = 192;
values[3][1] = 200;
values[4][0] = 490;
values[4][1] = 300;
values[5][0] = 791;
values[5][1] = 400;
values[6][0] = 373;
values[6][1] = 500;
values[7][0] = 612;
values[7][1] = 600;
values[8][0] = 874;
values[8][1] = 700;
values[9][0] = 1590;
values[9][1] = 800;
values[10][0] = 1882;
values[10][1] = 900;
values[11][0] = 2081;
values[11][1] = 1000;
values[12][0] = 2466;
values[12][1] = 1100;
values[13][0] = 2977;
values[13][1] = 1200;
values[14][0] = 3196;
values[14][1] = 1300;
values[15][0] = 3311;
values[15][1] = 1400;
values[16][0] = 3707;
values[16][1] = 1500;
values[17][0] = 3889;
values[17][1] = 1600;
values[18][0] = 4072;
values[18][1] = 1700;
values[19][0] = 4271;
values[19][1] = 1800;
values[20][0] = 4550;
values[20][1] = 1900;
values[21][0] = 4753;
values[21][1] = 2000;
values[22][0] = 4975;
values[22][1] = 2100;
values[23][0] = 5112;
values[23][1] = 2200;
values[24][0] = 5605;
values[24][1] = 2300;
values[25][0] = 5734;
values[25][1] = 2400;
values[26][0] = 5855;
values[26][1] = 2500;
values[27][0] = 5959;
values[27][1] = 2600;
values[28][0] = 6130;
values[28][1] = 2700;
values[29][0] = 6352;
values[29][1] = 2800;
values[30][0] = 6481;
values[30][1] = 2900;
values[31][0] = 6700;
values[31][1] = 3000;
values[32][0] = 6882;
values[32][1] = 3100;
values[33][0] = 7247;
values[33][1] = 3200;
values[34][0] = 7466;
values[34][1] = 3300;
values[35][0] = 7633;
values[35][1] = 3400;
values[36][0] = 7749;
values[36][1] = 3500;
values[37][0] = 8391;
values[37][1] = 3600;
values[38][0] = 8600;
values[38][1] = 3700;
values[39][0] = 8804;
values[39][1] = 3800;
values[40][0] = 8999;
values[40][1] = 3900;
values[41][0] = 9183;
values[41][1] = 4000;
values[42][0] = 9362;
values[42][1] = 4100;
values[43][0] = 9548;
values[43][1] = 4200;
values[44][0] = 9727;
values[44][1] = 4300;
values[45][0] = 9911;
values[45][1] = 4400;
values[46][0] = 10086;
values[46][1] = 4500;
values[47][0] = 10247;
values[47][1] = 4600;
values[48][0] = 10403;
values[48][1] = 4700;
values[49][0] = 10566;
values[49][1] = 4800;
values[50][0] = 10744;
values[50][1] = 4900;
values[51][0] = 10935;
values[51][1] = 5000;
}
uint32_t count = 52;
uint32_t values[52][2];
};
//constexpr auto ThermalTable = MiniwareThermocoupleLookup();
//Extrapolate between two points
// [x1, y1] = point 1
// [x2, y2] = point 2
@@ -319,25 +85,6 @@ uint32_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) {
tipuVDelta *= TIP_GAIN;
tipuVDelta /= 10000;
return tipuVDelta;
//Perform lookup on table of values to find the closest two measurement points, and then linearly interpolate these
//This assumes results in the table are increasing order
// TODO -> Should this be made into a binary search? Is it much faster??
// for (uint32_t i = 1; i < ThermalTable.count; i++) {
// if (((uint32_t) ThermalTable.values[i][0]) > tipuVDelta) {
// //Then extrapolate
// //Where i= the lower raw sample, i-1 is the higher raw sample
// return LinearInterpolate( //
// ThermalTable.values[i][0], // x1
// ThermalTable.values[i][1], // y1
// ThermalTable.values[i - 1][0], // x2
// ThermalTable.values[i - 1][1], // y2
// tipuVDelta) / 10; // raw sample to be interpolated
//
// }
// }
// return 500; // fail high -> will turn off heater
}
uint32_t TipThermoModel::convertuVToDegF(uint32_t tipuVDelta) {
@@ -345,21 +92,6 @@ uint32_t TipThermoModel::convertuVToDegF(uint32_t tipuVDelta) {
tipuVDelta /= 1000;
return ((tipuVDelta * 9) / 50) + 32;
//(Y °C × 9/5) + 32 =Y°F
// for (uint32_t i = 1; i < ThermalTable.count; i++) {
// if (((uint32_t) ThermalTable.values[i][0]) < tipuVDelta) {
// //Then extrapolate
// //Where i= the lower raw sample, i-1 is the higher raw sample
// return ((LinearInterpolate( //
// ThermalTable.values[i][0], // x1
// ThermalTable.values[i][1], // y1
// ThermalTable.values[i - 1][0], // x2
// ThermalTable.values[i - 1][1], // y2
// tipuVDelta) // raw sample to be interpolated
// * 9) / 50) + 32; // Convert C ->> F for 'mericans
//
// }
// }
// return 932; // fail high -> will turn off heater
}
uint32_t TipThermoModel::convertCtoF(uint32_t degC) {

50
workspace/TS100/Core/Src/Translation.cpp
View File

@@ -238,7 +238,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x3B\x03\x02\x3B\x03\x0B",//07-10-19
"\x04\x05\x3B\x03\x04\x3B\x03\x0B",//23-12-19
"\x2A\x31\x0D\x40\x0D",//HW G
"\x2A\x31\x0D\x2C\x0D",//HW M
"\x2A\x31\x0D\x26\x0D",//HW P
@@ -617,7 +617,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x5E\x03\x02\x5E\x03\x0B",//07-10-19
"\x04\x05\x5E\x03\x04\x5E\x03\x0B",//23-12-19
"\x43\x42\x0C\x68\x0C",//HW G
"\x43\x42\x0C\x4A\x0C",//HW M
"\x43\x42\x0C\x52\x0C",//HW P
@@ -936,7 +936,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x47\x03\x02\x47\x03\x0B",//07-10-19
"\x04\x05\x47\x03\x04\x47\x03\x0B",//23-12-19
"\x2A\x36\x0C\x4E\x0C",//HW G
"\x2A\x36\x0C\x31\x0C",//HW M
"\x2A\x36\x0C\x21\x0C",//HW P
@@ -1227,7 +1227,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x3E\x03\x02\x3E\x03\x0B",//07-10-19
"\x04\x05\x3E\x03\x04\x3E\x03\x0B",//23-12-19
"\x28\x2F\x0C\x43\x0C",//HW G
"\x28\x2F\x0C\x23\x0C",//HW M
"\x28\x2F\x0C\x25\x0C",//HW P
@@ -1526,7 +1526,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x25\x03\x02\x25\x03\x0B",//07-10-19
"\x04\x05\x25\x03\x04\x25\x03\x0B",//23-12-19
"\x37\x3A\x0E\x46\x0E",//HW G
"\x37\x3A\x0E\x34\x0E",//HW M
"\x37\x3A\x0E\x45\x0E",//HW P
@@ -1831,7 +1831,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x3E\x03\x02\x3E\x03\x0B",//07-10-19
"\x04\x05\x3E\x03\x04\x3E\x03\x0B",//23-12-19
"\x37\x36\x0C\x43\x0C",//HW G
"\x37\x36\x0C\x23\x0C",//HW M
"\x37\x36\x0C\x24\x0C",//HW P
@@ -2126,7 +2126,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x2E\x03\x02\x2E\x03\x0B",//07-10-19
"\x04\x05\x2E\x03\x04\x2E\x03\x0B",//23-12-19
"\x2A\x2F\x10\x43\x10",//HW G
"\x2A\x2F\x10\x36\x10",//HW M
"\x2A\x2F\x10\x31\x10",//HW P
@@ -2419,7 +2419,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x36\x03\x02\x36\x03\x0B",//07-10-19
"\x04\x05\x36\x03\x04\x36\x03\x0B",//23-12-19
"\x2C\x3D\x0D\x3A\x0D",//HW G
"\x2C\x3D\x0D\x32\x0D",//HW M
"\x2C\x3D\x0D\x23\x0D",//HW P
@@ -2718,7 +2718,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x3F\x03\x02\x3F\x03\x0B",//07-10-19
"\x04\x05\x3F\x03\x04\x3F\x03\x0B",//23-12-19
"\x37\x3D\x0D\x46\x0D",//HW G
"\x37\x3D\x0D\x39\x0D",//HW M
"\x37\x3D\x0D\x23\x0D",//HW P
@@ -3035,7 +3035,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x4A\x03\x02\x4A\x03\x0B",//07-10-19
"\x04\x05\x4A\x03\x04\x4A\x03\x0B",//23-12-19
"\x1D\x44\x0C\x32\x0C",//HW G
"\x1D\x44\x0C\x36\x0C",//HW M
"\x1D\x44\x0C\x4C\x0C",//HW P
@@ -3330,7 +3330,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x3D\x03\x02\x3D\x03\x0B",//07-10-19
"\x04\x05\x3D\x03\x04\x3D\x03\x0B",//23-12-19
"\x35\x38\x0C\x44\x0C",//HW G
"\x35\x38\x0C\x27\x0C",//HW M
"\x35\x38\x0C\x30\x0C",//HW P
@@ -3637,7 +3637,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x26\x03\x02\x26\x03\x0B",//07-10-19
"\x04\x05\x26\x03\x04\x26\x03\x0B",//23-12-19
"\x3A\x3C\x0E\x2C\x0E",//HW G
"\x3A\x3C\x0E\x24\x0E",//HW M
"\x3A\x3C\x0E\x3B\x0E",//HW P
@@ -3922,7 +3922,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x25\x03\x02\x25\x03\x0B",//07-10-19
"\x04\x05\x25\x03\x04\x25\x03\x0B",//23-12-19
"\x2E\x35\x0D\x2A\x0D",//HW G
"\x2E\x35\x0D\x2F\x0D",//HW M
"\x2E\x35\x0D\x2D\x0D",//HW P
@@ -4209,7 +4209,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x26\x03\x02\x26\x03\x0B",//07-10-19
"\x04\x05\x26\x03\x04\x26\x03\x0B",//23-12-19
"\x2F\x35\x0E\x24\x0E",//HW G
"\x2F\x35\x0E\x33\x0E",//HW M
"\x2F\x35\x0E\x28\x0E",//HW P
@@ -4494,7 +4494,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x2F\x03\x02\x2F\x03\x0B",//07-10-19
"\x04\x05\x2F\x03\x04\x2F\x03\x0B",//23-12-19
"\x26\x33\x0C\x42\x0C",//HW G
"\x26\x33\x0C\x2A\x0C",//HW M
"\x26\x33\x0C\x2D\x0C",//HW P
@@ -4809,7 +4809,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x49\x03\x02\x49\x03\x0B",//07-10-19
"\x04\x05\x49\x03\x04\x49\x03\x0B",//23-12-19
"\x3C\x27\x0C\x3D\x0C",//HW G
"\x3C\x27\x0C\x2A\x0C",//HW M
"\x3C\x27\x0C\x23\x0C",//HW P
@@ -5114,7 +5114,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x3E\x03\x02\x3E\x03\x0B",//07-10-19
"\x04\x05\x3E\x03\x04\x3E\x03\x0B",//23-12-19
"\x35\x36\x0D\x41\x0D",//HW G
"\x35\x36\x0D\x21\x0D",//HW M
"\x35\x36\x0D\x24\x0D",//HW P
@@ -5485,7 +5485,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x25\x03\x02\x25\x03\x0B",//07-10-19
"\x04\x05\x25\x03\x04\x25\x03\x0B",//23-12-19
"\x3A\x36\x0C\x5C\x0C",//HW G
"\x3A\x36\x0C\x4D\x0C",//HW M
"\x3A\x36\x0C\x47\x0C",//HW P
@@ -5778,7 +5778,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x42\x03\x02\x42\x03\x0B",//07-10-19
"\x04\x05\x42\x03\x04\x42\x03\x0B",//23-12-19
"\x32\x35\x0C\x45\x0C",//HW G
"\x32\x35\x0C\x25\x0C",//HW M
"\x32\x35\x0C\x21\x0C",//HW P
@@ -6067,7 +6067,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x40\x03\x02\x40\x03\x0B",//07-10-19
"\x04\x05\x40\x03\x04\x40\x03\x0B",//23-12-19
"\x2B\x39\x0D\x46\x0D",//HW G
"\x2B\x39\x0D\x32\x0D",//HW M
"\x2B\x39\x0D\x2C\x0D",//HW P
@@ -6424,7 +6424,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x4B\x03\x02\x4B\x03\x0B",//07-10-19
"\x04\x05\x4B\x03\x04\x4B\x03\x0B",//23-12-19
"\x3B\x46\x0D\x57\x0D",//HW G
"\x3B\x46\x0D\x43\x0D",//HW M
"\x3B\x46\x0D\x54\x0D",//HW P
@@ -6725,7 +6725,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x44\x03\x02\x44\x03\x0B",//07-10-19
"\x04\x05\x44\x03\x04\x44\x03\x0B",//23-12-19
"\x35\x3F\x0D\x45\x0D",//HW G
"\x35\x3F\x0D\x38\x0D",//HW M
"\x35\x3F\x0D\x23\x0D",//HW P
@@ -7024,7 +7024,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x22\x03\x02\x22\x03\x0B",//07-10-19
"\x04\x05\x22\x03\x04\x22\x03\x0B",//23-12-19
"\x29\x34\x0C\x3E\x0C",//HW G
"\x29\x34\x0C\x2B\x0C",//HW M
"\x29\x34\x0C\x2C\x0C",//HW P
@@ -7331,7 +7331,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x46\x03\x02\x46\x03\x0B",//07-10-19
"\x04\x05\x46\x03\x04\x46\x03\x0B",//23-12-19
"\x38\x37\x0C\x34\x0C",//HW G
"\x38\x37\x0C\x25\x0C",//HW M
"\x38\x37\x0C\x2C\x0C",//HW P
@@ -7698,7 +7698,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
"\x02\x09\x20\x03\x02\x20\x03\x0B",//07-10-19
"\x04\x05\x20\x03\x04\x20\x03\x0B",//23-12-19
"\x3B\x42\x0C\x59\x0C",//HW G
"\x3B\x42\x0C\x46\x0C",//HW M
"\x3B\x42\x0C\x55\x0C",//HW P

2
workspace/TS100/Core/Src/main.cpp
View File

@@ -229,7 +229,7 @@ void startMOVTask(void const *argument __unused) {
int32_t avgx = 0, avgy = 0, avgz = 0;
if (systemSettings.sensitivity > 9)
systemSettings.sensitivity = 9;
#if ACCELDEBUG
#ifdef ACCELDEBUG
uint32_t max = 0;
#endif
Orientation rotation = ORIENTATION_FLAT;

4
workspace/TS100/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h vendored
View File

@@ -26,7 +26,7 @@
*
*----------------------------------------------------------------------------
*
* Portions Copyright <20> 2016 STMicroelectronics International N.V. All rights reserved.
* Portions Copyright <20> 2016 STMicroelectronics International N.V. All rights reserved.
* Portions Copyright (c) 2013 ARM LIMITED
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
@@ -462,7 +462,7 @@ const osThreadDef_t os_thread_def_##name = \
#define osThreadStaticDef(name, thread, priority, instances, stacksz, buffer, control) \
const osThreadDef_t os_thread_def_##name = \
{ #name, (thread), (priority), (instances), (stacksz), (buffer), (control) }
{(char*) #name, (thread), (priority), (instances), (stacksz), (buffer), (control) }
#else //configSUPPORT_STATIC_ALLOCATION == 0
#define osThreadDef(name, thread, priority, instances, stacksz) \

8
workspace/TS100/build.sh
View File

@@ -133,7 +133,9 @@ then
checkLastCommand
echo "Cleaning previous builds"
make clean 1>/dev/null
rm -rf Hexfile/ >/dev/null
rm -rf Objects/ >/dev/null
make clean >/dev/null
checkLastCommand
for model in "${BUILD_MODELS[@]}"
@@ -141,9 +143,9 @@ then
for lang in "${BUILD_LANGUAGES[@]}"
do
echo "Building firmware for $model in $lang"
make -j16 lang="$lang" model="$model" 1>/dev/null
make -j lang="$lang" model="$model" >/dev/null
checkLastCommand
rm -rf Objects/src 1>/dev/null
rm -rf Objects/src>/dev/null
done
done
else