therm-ng Changeset - e81c09ec6423 · protofusion repositories

Changeset - e81c09ec6423

Parent rev.

Child rev.

[Not reviewed]

Merge default

20 4 31

Ethan Zonca - 8 years ago 2017-07-24 19:31:42
ez@ethanzonca.com

Merge

39 files changed with 1852 insertions and 337 deletions:

.cproject

.settings/language.settings.xml

inc/buttons.h

inc/config.h

inc/display.h

inc/dma.h

inc/pid.h

inc/pwmout.h

inc/states.h

104

inc/system/error.h

rename

inc/system/flash.h

inc/system/gpio.h

inc/system/interrupts.h

rename

inc/system/stm32f3xx_hal_conf.h

rename

inc/system/stringhelpers.h

inc/system/system.h

rename

inc/system/watchdog.h

rename

inc/tempsense.h

inc/thermostat.h

lib/max31856/max31856.c

148

lib/max31856/max31856.h

lib/ssd1306/ssd1306.c

105

lib/ssd1306/ssd1306.h

src/buttons.c

src/display.c

748

src/dma.c

src/main.c

src/pid.c

109

src/pwmout.c

src/system/error.c

rename

src/system/flash.c

src/system/gpio.c

src/system/interrupts.c

rename

src/system/sbrk.c

rename

src/system/stringhelpers.c

src/system/system.c

rename

src/system/watchdog.c

rename

src/tempsense.c

src/thermostat.c

0 comments (0 inline, 0 general)

.cproject

➞

Show inline comments

@@ @@ -8,91 +8,97 @@ @@
 					<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.GLDErrorParser" 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 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.debug" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.1538442532" name="Debug" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug">
 					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.1538442532." name="/" resourcePath="">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.debug.1849706153" name="Cross ARM GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.debug">
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.1898847267" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.debug" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.1803427167" name="Message length (-fmessage-length=0)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.1920457501" name="'char' is signed (-fsigned-char)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.321897226" name="Function sections (-ffunction-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections.1782401255" name="Data sections (-fdata-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level.407850642" name="Debug level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level.max" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format.485776751" name="Debug format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.1154107227" name="ARM family" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn.1932872609" name="Enable all common warnings (-Wall)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.extrawarn.747789546" name="Enable extra warnings (-Wextra)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.extrawarn" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.freestanding.1360639253" name="Assume freestanding environment (-ffreestanding)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.freestanding" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nomoveloopinvariants.1265121449" name="Disable loop invariant move (-fno-move-loop-invariants)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nomoveloopinvariants" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto.2018930176" name="Link-time optimizer (-flto)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name.149408563" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name" value="GNU Tools for ARM Embedded Processors" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.929516986" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.architecture" value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.1562917164" name="Instruction set" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.thumb" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.392227972" name="Prefix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix" value="arm-none-eabi-" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.c.2121007191" name="C compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.c" value="gcc" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp.1652498155" name="C++ compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp" value="g++" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar.544972784" name="Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar" value="ar" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy.1005994348" name="Hex/Bin converter" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy" value="objcopy" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump.1204092853" name="Listing generator" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump" value="objdump" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.size.894265291" name="Size command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.size" value="size" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.make.886060440" name="Build command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.make" value="make" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm.153446908" name="Remove command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm" value="rm" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash.2133363735" name="Create flash image" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.737083294" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.1898847267" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.size" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.1803427167" name="Message length (-fmessage-length=0)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.1920457501" name="'char' is signed (-fsigned-char)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.321897226" name="Function sections (-ffunction-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections.1782401255" name="Data sections (-fdata-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level.407850642" name="Debug level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level.max" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format.485776751" name="Debug format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format" useByScannerDiscovery="true"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.1154107227" name="ARM family" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn.1932872609" name="Enable all common warnings (-Wall)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.extrawarn.747789546" name="Enable extra warnings (-Wextra)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.extrawarn" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.freestanding.1360639253" name="Assume freestanding environment (-ffreestanding)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.freestanding" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nomoveloopinvariants.1265121449" name="Disable loop invariant move (-fno-move-loop-invariants)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nomoveloopinvariants" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto.2018930176" name="Link-time optimizer (-flto)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name.149408563" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name" useByScannerDiscovery="false" value="GNU Tools for ARM Embedded Processors" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.929516986" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.architecture" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.1562917164" name="Instruction set" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.thumb" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.392227972" name="Prefix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix" useByScannerDiscovery="false" value="arm-none-eabi-" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.c.2121007191" name="C compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.c" useByScannerDiscovery="false" value="gcc" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp.1652498155" name="C++ compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp" useByScannerDiscovery="false" value="g++" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar.544972784" name="Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar" useByScannerDiscovery="false" value="ar" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy.1005994348" name="Hex/Bin converter" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy" useByScannerDiscovery="false" value="objcopy" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump.1204092853" name="Listing generator" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump" useByScannerDiscovery="false" value="objdump" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.size.894265291" name="Size command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.size" useByScannerDiscovery="false" value="size" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.make.886060440" name="Build command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.make" useByScannerDiscovery="false" value="make" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm.153446908" name="Remove command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm" useByScannerDiscovery="false" value="rm" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash.2133363735" name="Create flash image" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.737083294" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1641379360" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
 							<builder buildPath="${workspace_loc:/S3467-MiniBuoy-BT-Sensor-Software}/Debug" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1145700756" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder">
 								<outputEntries>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="Debug"/>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="Release"/>
 								</outputEntries>
 							</builder>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1885536253" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1335843010" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.119815874" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1335843010" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.119815874" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/lib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Device/ST/STM32F3xx/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/inc/system&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ldscripts/STM32F302K8_FLASH.ld}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/STM32F3xx_HAL_Driver/Inc}&quot;"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.2115290648" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" valueType="definedSymbols">
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.2115290648" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F302x8"/>
 								</option>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1515695785" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1368546832" name="Cross ARM C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.1718280814" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/lib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Device/ST/STM32F3xx/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/inc/system&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ldscripts/STM32F302K8_FLASH.ld}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/STM32F3xx_HAL_Driver/Inc}&quot;"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.2029242032" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F302x8"/>
 								</option>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.1631434836" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.1466486850" name="Cross ARM C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths.1649547949" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/lib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/inc/system&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Device/ST/STM32F3xx/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ldscripts/STM32F302K8_FLASH.ld}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/STM32F3xx_HAL_Driver/Inc}&quot;"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.noexceptions.2001834700" name="Do not use exceptions (-fno-exceptions)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.noexceptions" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nortti.464976546" name="Do not use RTTI (-fno-rtti)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nortti" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nousecxaatexit.1192802280" name="Do not use _cxa_atexit() (-fno-use-cxa-atexit)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nousecxaatexit" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nothreadsafestatics.575366037" name="Do not use thread-safe statics (-fno-threadsafe-statics)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nothreadsafestatics" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs.324180980" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F302x8"/>
 								</option>
@@ @@ -107,48 +113,48 @@ @@
 									<listOptionValue builtIn="false" value="mem.ld"/>
 									<listOptionValue builtIn="false" value="libs.ld"/>
 									<listOptionValue builtIn="false" value="sections.ld"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.nostart.400141392" name="Do not use standard start files (-nostartfiles)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.nostart" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano.467289463" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano" value="true" valueType="boolean"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.input.108872583" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.226210550" name="Cross ARM C++ Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections.1592260261" name="Remove unused sections (-Xlinker --gc-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.paths.1684527273" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.paths"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.scriptfile.2056115086" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.scriptfile" valueType="stringList">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections.1592260261" name="Remove unused sections (-Xlinker --gc-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.paths.1684527273" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.paths" useByScannerDiscovery="false"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.scriptfile.2056115086" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ldscripts/STM32F302K8_FLASH.ld}&quot;"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostart.337377349" name="Do not use standard start files (-nostartfiles)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostart" value="false" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.usenewlibnano.444480985" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.usenewlibnano" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.useprintffloat.472439722" name="Use float with nano printf (-u _printf_float)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.useprintffloat" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostart.337377349" name="Do not use standard start files (-nostartfiles)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostart" useByScannerDiscovery="false" value="false" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.usenewlibnano.444480985" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.usenewlibnano" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.useprintffloat.472439722" name="Use float with nano printf (-u _printf_float)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.useprintffloat" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input.490763083" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver.332346290" name="Cross ARM GNU Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash.1648619972" name="Cross ARM GNU Create Flash Image" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting.731655118" name="Cross ARM GNU Create Listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source.1121096001" name="Display source (--source|-S)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.allheaders.280002586" name="Display all headers (--all-headers|-x)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.allheaders" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.demangle.2041584170" name="Demangle names (--demangle|-C)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.demangle" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.linenumbers.1742317312" name="Display line numbers (--line-numbers|-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.linenumbers" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.wide.1198581919" name="Wide lines (--wide|-w)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.wide" value="true" valueType="boolean"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize.343129499" name="Cross ARM GNU Print Size" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format.1881178891" name="Size format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format"/>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format.1881178891" name="Size format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format" useByScannerDiscovery="false"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
 					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.1538442532.1912708046" name="/" resourcePath="lib">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.debug.1347394226" name="Cross ARM GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.debug" unusedChildren="">
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.1898847267.1471493984" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.1898847267"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.1803427167.635978958" name="Message length (-fmessage-length=0)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.1803427167"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.1920457501.961251816" name="'char' is signed (-fsigned-char)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.1920457501"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.321897226.1940096064" name="Function sections (-ffunction-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.321897226"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections.1782401255.1204192384" name="Data sections (-fdata-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections.1782401255"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level.407850642.1683914542" name="Debug level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level.407850642"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format.485776751.559374423" name="Debug format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format.485776751"/>
@@ @@ -212,24 +218,25 @@ @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.1562917164.1500755928" name="Instruction set" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.1562917164"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.392227972.519215394" name="Prefix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.392227972"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.c.2121007191.688989960" name="C compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.c.2121007191"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp.1652498155.1812447570" name="C++ compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp.1652498155"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar.544972784.492168223" name="Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar.544972784"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy.1005994348.1876114876" name="Hex/Bin converter" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy.1005994348"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump.1204092853.522113362" name="Listing generator" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump.1204092853"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.size.894265291.949790795" name="Size command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.size.894265291"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.make.886060440.614747399" name="Build command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.make.886060440"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm.153446908.2047149393" name="Remove command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm.153446908"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash.2133363735.798650567" name="Create flash image" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash.2133363735"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.737083294.931072004" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.737083294"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.896192688" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1885536253">
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1392942558" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1343120550" name="Cross ARM C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1368546832">
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.1474783201" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.879830072" name="Cross ARM C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.1466486850">
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.507769430" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.21903117" name="Cross ARM C Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.353998236"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.422125258" name="Cross ARM C++ Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.226210550"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver.1484827782" name="Cross ARM GNU Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver.332346290"/>

.settings/language.settings.xml

➞

Show inline comments

 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
 	<configuration id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.1538442532" name="Debug">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1039910129683149700" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-796171634606229038" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 		</extension>
 	</configuration>
 	<configuration id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1229152259" name="Release">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1105339482864355034" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-786907217906447192" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 		</extension>
 	</configuration>
 </project>

inc/buttons.h

➞

Show inline comments

deleted file

inc/config.h

➞

Show inline comments

 #ifndef CONFIG_H
 #define CONFIG_H
 //////////////////////////////////////////////////////
 // Sensor Type
 //////////////////////////////////////////////////////
 //#define MAX31855_TC_SENSOR
 //#define MAX31865_RTD_SENSOR
 #define MAX_WHATEVERTHENEWONEIS
 //////////////////////////////////////////////////////
 // USB
 //////////////////////////////////////////////////////
 // Virtual serial port transmit rate
 #define VCP_TX_FREQ 1000
 // Solid-state relay maximum on-time
 #define SSR_PERIOD 200
 // Interval of PID calculations
 #define PID_PERIOD 120
 //////////////////////////////////////////////////////
 // Other settings
 //////////////////////////////////////////////////////
 // Add bootloader option to top of idle screen menu
 #define BOOTLOADER_SHORTCUT
 //////////////////////////////////////////////////////
 // Default Settings
 //////////////////////////////////////////////////////
 #define DEFAULT_BOOT_TO_BREW 0
 #define DEFAULT_TEMP_UNITS TEMP_UNITS_FAHRENHEIT
 #define DEFAULT_WINDUP_GUARD 10
 #define DEFAULT_K_P 10
 #define DEFAULT_K_I 1
 #define DEFAULT_K_D 1
 #define DEFAULT_TEMP_OFFSET 0
 #define DEFAULT_IGNORE_ERROR 0
 #define DEFAULT_SETPOINT_BREW 70
 #define DEFAULT_SETPOINT_STEAM 70
 #define DEFAULT_HYSTERESIS 1
 //////////////////////////////////////////////////////
 // Watchdog Settings
 //////////////////////////////////////////////////////
 //#define WATCHDOG_ENABLE
 // Internal macros
 #define hal_init HAL_Init
 #define MAKE32(by3,by2,by1,by0) ((uint32_t)((((((by3<<8)+by2)<<8)+by1)<<8)+by0))
 #endif

inc/display.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef DISPLAY_H
 #define DISPLAY_H
 #include "states.h"
 #ifdef MAX31865_RTD_SENSOR
 #include "max31865.h"
 #endif
 void display_startup_screen(void);
 void display_1hz(void);
 void display_process(void);
 #endif

inc/dma.h

➞

Show inline comments

deleted file

inc/pid.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef PIDS_H
 #define PIDS_H
 #include "stm32f3xx_hal.h"
 #include "states.h"
 typedef struct {
 	int16_t last_pid_temp;
 	uint8_t last_pid_temp_frac;
 	int32_t i_state;
 } pid_state_t;
 void pid_init(void);
 float pid_process(void);
 int16_t pid_update(void);
 #endif

inc/pwmout.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef PWMOUT_H
 #define PWMOUT_H
 #define SSR_PIN GPIO_PIN_7
 #define SSR_GPIO_Port GPIOB
 #define SSR SSR_GPIO_Port, SSR_PIN
 void pwmout_init(void);
 void pwmout_process(float duty);
 #endif

inc/states.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef STATES_H
 #define STATES_H
 #include "stm32f3xx_hal.h"
 #include "config.h"
 typedef struct {
     float temp;
     uint8_t state_resume;
     uint8_t state;
     float setpoint;
     uint8_t pid_enabled;
     uint8_t error_code;
 } therm_status_t;
 typedef union
+{
      struct {
         uint32_t boottobrew;
         uint32_t temp_units;
         uint32_t windup_guard;
         uint32_t k_p;
         uint32_t k_i;
         uint32_t k_d;
         int32_t temp_offset;
         uint32_t ignore_error;
         int32_t setpoint_brew;
         int32_t setpoint_steam;
         uint32_t control_mode;
         uint32_t sensor_type;
         uint32_t plant_type;
         uint32_t hysteresis;
     } val;
     uint16_t data[128];
 } therm_settings_t;
 enum tempunits {
     TEMP_UNITS_CELSIUS = 0,
     TEMP_UNITS_FAHRENHEIT,
 };
 enum state {
     STATE_IDLE = 0,
 	STATE_SETSENSORTYPE,
     STATE_SETMODE,
     STATE_SETPLANTTYPE,
     STATE_SETHYSTERESIS,
     STATE_SETP,
     STATE_SETI,
     STATE_SETD,
     STATE_SETSTEPS,
     STATE_SETWINDUP,
     STATE_SETBOOTTOBREW,
     STATE_SETUNITS,
     STATE_SETTEMPOFFSET,
     STATE_PREHEAT,
     STATE_MAINTAIN,
     STATE_TC_ERROR,
 	STATE_RESET,
 };
 enum control_mode {
     MODE_PID = 0,
     MODE_THERMOSTAT,
 };
 enum plant_type {
     PLANT_HEATER = 0,
     PLANT_COOLER,
 };
 enum GOTO_MODE {
 	#ifdef BOOTLOADER_SHORTCUT
 	MODE_BOOTLOADER,
 	#endif
 	MODE_HEAT,
 	MODE_SETUP,
 	MODE_RESET,
 	MODE_SIZE,
 };
 enum RESET_MODE {
 	RESET_REBOOT = 0,
 	RESET_DEFAULTS,
 	RESET_BOOTLOADER,
 	RESET_EXIT,
 	RESET_SIZE,
 };
 enum SENSOR_TYPE {
 	SENSOR_NTC = 0,
 	SENSOR_TC_K,
 	SENSOR_TC_E,
 	SENSOR_TC_N,
 	SENSOR_TC_R,
 	SENSOR_TC_S,
 	SENSOR_TC_T,
 };
 #endif

inc/system/error.h

➞

Show inline comments

file renamed from inc/error.h to inc/system/error.h

inc/system/flash.h

➞

Show inline comments

@@ file renamed from inc/flash.h to inc/system/flash.h @@
 #ifndef flash_h
 #define flash_h
 #include "states.h"
 #define FLASH_MAGIC_LOC 511
 #define FLASH_MAGIC_VALUE 0xbeef
 typedef union
+{
 	struct _values {
 		uint16_t can_id;
 		uint16_t tx_period;
 	} values;
 	uint16_t data[128];
 } settings_t;
 void flash_init(void);
 void flash_savesettings(void);
 void flash_restoresettings(void);
 settings_t* flash_getsettings(void);
 therm_settings_t* flash_getsettings(void);
 therm_status_t* runtime_status(void);
 #endif // flash_h

inc/system/gpio.h

➞

Show inline comments

@@ file renamed from inc/gpio.h to inc/system/gpio.h @@
 #ifndef __gpio_H
 #define __gpio_H
 #include "stm32f3xx_hal.h"
 // Define button push
 #define SW_D_Pin GPIO_PIN_4
 #define SW_D_GPIO_Port GPIOA
 #define SW_RIGHT SW_D_GPIO_Port, SW_D_Pin
 #define SW_B_Pin GPIO_PIN_5
 #define SW_B_GPIO_Port GPIOA
 #define SW_UP SW_B_GPIO_Port, SW_B_Pin
 #define SW_A_Pin GPIO_PIN_6
 #define SW_A_GPIO_Port GPIOA
 #define SW_LEFT SW_A_GPIO_Port, SW_A_Pin
 #define SW_C_Pin GPIO_PIN_7
 #define SW_C_GPIO_Port GPIOA
 #define SW_DOWN SW_C_GPIO_Port, SW_C_Pin
 #define SW_BTN_Pin GPIO_PIN_0
 #define SW_BTN_GPIO_Port GPIOB
 #define SW_BTN SW_BTN_GPIO_Port , SW_BTN_Pin
 #define LED_PIN GPIO_PIN_6
 #define LED_GPIO_Port GPIOB
 #define LED LED_GPIO_Port, LED_PIN
 void user_input(uint16_t* to_modify);
 void user_input_signed(int32_t* to_modify);
 void gpio_init(void);
 void gpio_led_blueblink(uint8_t num_blinks);
 #endif

inc/system/interrupts.h

➞

Show inline comments

file renamed from inc/interrupts.h to inc/system/interrupts.h

inc/system/stm32f3xx_hal_conf.h

➞

Show inline comments

file renamed from inc/stm32f3xx_hal_conf.h to inc/system/stm32f3xx_hal_conf.h

inc/system/stringhelpers.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef STRINGHELPERS_H
 #define STRINGHELPERS_H
 char* zitoa(int16_t i, char b[]);
 char* itoa_fp(int16_t i, uint8_t frac, char b[]);
 #endif

inc/system/system.h

➞

Show inline comments

file renamed from inc/system.h to inc/system/system.h

inc/system/watchdog.h

➞

Show inline comments

file renamed from inc/watchdog.h to inc/system/watchdog.h

inc/tempsense.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef TEMPSENSE_H
 #define TEMPSENSE_H
 #define TEMPSENSE_MAX_CS_PIN GPIO_PIN_15
 #define TEMPSENSE_MAX_CS_PORT GPIOA
 void tempsense_init(void);
 float tempsense_readtemp(void);
 #endif

inc/thermostat.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef THERMOSTAT_H
 #define THERMOSTAT_H
 #include "stm32f3xx_hal.h"
 float thermostat_process(void);
 #endif

lib/max31856/max31856.c

➞

Show inline comments

@@ new file 100644 @@
 //
 // MAX31856: Driver to configure and read temperature from the MAX31856 thermoouple-to-Digital IC
 //
 #include "max31856.h"
 #include "states.h"
 #include "error.h"
 // Private variables
 static float temp_latest = 0.0;
 static float temp_avg = 0.0;
 static SPI_HandleTypeDef* spiport;
 static GPIO_TypeDef* csport;
 static uint32_t cspin;
 // Private prototypes
 static void __cs_assert(void);
 static void __cs_deassert(void);
 static void __write_reg(uint8_t reg, uint8_t data);
 static void __read_reg(uint8_t reg, uint8_t* rxbuf, uint8_t len);
 // Initialize the MAX31856 driver
 void max31856_init(SPI_HandleTypeDef* spi_port, GPIO_TypeDef* cs_port, uint32_t cs_pin, uint32_t sensor_type)
+{
 	// Set CS pin references
 	csport = cs_port;
 	cspin = cs_pin;
 	// Set SPI port reference
 	spiport = spi_port;
 	// Configure the CS pin for output
 	GPIO_InitTypeDef GPIO_InitStruct;
 	GPIO_InitStruct.Pin = cs_pin;
 	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
 	GPIO_InitStruct.Pull = GPIO_NOPULL;
 	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
 	HAL_GPIO_Init(cs_port, &GPIO_InitStruct);
 	// MAX31856
 	// - set to continuous conversion mode
 	// - probably no filtering, we'll do that on this side of things
 	// - set up to read the typical open/short faults but not the high/low alarms
 	// TODO: Enable open/short detection
 	// Enables auto conv
 	__write_reg(MAX31856_CR0_REG, MAX31856_CR0_OCFAULT0 | MAX31856_CR0_AUTOCONVERT);
 	// Averaging set to 1 sample, TC type set to K
 	__write_reg(MAX31856_CR1_REG, MAX31856_TCTYPE_K);
 	// sensor type - could we just mask bits off? maybe optimize the enum for this
+}
 // Pull reading from the MAX31856 IC
 void max31856_process(void)
+{
 	uint8_t tempbuf[4];
 	__read_reg(MAX31856_LTCBH_REG, tempbuf, 3);
 	int32_t temp24 = tempbuf[0] << 16 | tempbuf[1] << 8 | tempbuf[0];
 	if (temp24 & 0x800000) {
 		temp24 |= 0xFF000000;  // fix sign
+	}
 	temp24 >>= 5;  // bottom 5 bits are unused
 	float tempfloat = temp24;
 	tempfloat *= 0.0078125;
 	return tempfloat;
 	// Read temperature from the MAX31856 (approx 10hz optimally)
 	uint8_t data[] = {0,0,0,0};
 	HAL_SPI_Transmit(spiport, data, 1, 100);
+}
 // Return latest temperature reading (unaveraged, deg C)
 float max31856_latest_temp(void)
+{
 	return temp_latest;
+}
 // Return average temperature reading (deg C)
 float max31856_avg_temp(void)
+{
 	return temp_latest;
+}
 static void __write_reg(uint8_t reg, uint8_t data)
+{
 	// Set write bit
 	reg |= MAX31856_WRITE_BIT;
 	uint8_t outarr[2] = {reg, data};
 	// Assert the bus
 	__cs_assert();
 	// Write data
 	HAL_SPI_Transmit(spiport, outarr, 2, 100);
 	// Release the bus
 	__cs_deassert();
+}
 static void __read_reg(uint8_t reg, uint8_t* rxbuf, uint8_t len)
+{
 	// Transmit buffer only uses first item for reg addr
 	uint8_t regarr[1] = {reg};
 	// Assert the bus
 	__cs_assert();
 	// Send address
 	HAL_SPI_Transmit(spiport, regarr, 1, 100);
 	// Receive data
 	HAL_SPI_Receive(spiport, rxbuf, len, 100);
 	// Release bus
 	__cs_deassert();
+}
 static void __cs_assert(void)
+{
 	HAL_GPIO_WritePin(csport, cspin, 0);
+}
 static void __cs_deassert(void)
+{
 	HAL_GPIO_WritePin(csport, cspin, 1);
+}

lib/max31856/max31856.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef MAX31856_H
 #define MAX31856_H
 #include "stm32f3xx_hal.h"
 void max31856_init(SPI_HandleTypeDef* spi_port, GPIO_TypeDef* cs_port, uint32_t cs_pin, uint32_t sensor_type);
 void max31856_process(void);
 float max31856_latest_temp(void);
 float max31856_avg_temp(void);
 // Thanks to Adafruit:
 #define MAX31856_CR0_REG           0x00
 #define MAX31856_CR0_AUTOCONVERT   0x80
 #define MAX31856_CR0_1SHOT         0x40
 #define MAX31856_CR0_OCFAULT1      0x20
 #define MAX31856_CR0_OCFAULT0      0x10
 #define MAX31856_CR0_CJ            0x08
 #define MAX31856_CR0_FAULT         0x04
 #define MAX31856_CR0_FAULTCLR      0x02
 #define MAX31856_CR1_REG           0x01
 #define MAX31856_MASK_REG          0x02
 #define MAX31856_CJHF_REG          0x03
 #define MAX31856_CJLF_REG          0x04
 #define MAX31856_LTHFTH_REG        0x05
 #define MAX31856_LTHFTL_REG        0x06
 #define MAX31856_LTLFTH_REG        0x07
 #define MAX31856_LTLFTL_REG        0x08
 #define MAX31856_CJTO_REG          0x09
 #define MAX31856_CJTH_REG          0x0A
 #define MAX31856_CJTL_REG          0x0B
 #define MAX31856_LTCBH_REG         0x0C
 #define MAX31856_LTCBM_REG         0x0D
 #define MAX31856_LTCBL_REG         0x0E
 #define MAX31856_SR_REG            0x0F
 #define MAX31856_FAULT_CJRANGE     0x80
 #define MAX31856_FAULT_TCRANGE     0x40
 #define MAX31856_FAULT_CJHIGH      0x20
 #define MAX31856_FAULT_CJLOW       0x10
 #define MAX31856_FAULT_TCHIGH      0x08
 #define MAX31856_FAULT_TCLOW       0x04
 #define MAX31856_FAULT_OVUV        0x02
 #define MAX31856_FAULT_OPEN        0x01
 #define MAX31856_WRITE_BIT		   0x80
 typedef enum
+{
   MAX31856_TCTYPE_B  = 0b0000,
   MAX31856_TCTYPE_E  = 0b0001,
   MAX31856_TCTYPE_J  = 0b0010,
   MAX31856_TCTYPE_K  = 0b0011,
   MAX31856_TCTYPE_N  = 0b0100,
   MAX31856_TCTYPE_R  = 0b0101,
   MAX31856_TCTYPE_S  = 0b0110,
   MAX31856_TCTYPE_T  = 0b0111,
   MAX31856_VMODE_G8  = 0b1000,
   MAX31856_VMODE_G32 = 0b1100,
 } max31856_thermocoupletype_t;
 #endif

lib/ssd1306/ssd1306.c

➞

Show inline comments

@@ file renamed from src/ssd1306.c to lib/ssd1306/ssd1306.c @@
 #include "stm32f3xx_hal.h"
 #include "ssd1306.h"
 SPI_HandleTypeDef hspi1;
+// SPI handle accessor
 SPI_HandleTypeDef* spi_get()
+{
     return &hspi1;
+}
 // Write command to OLED
 static void WriteCommand(unsigned char command)
+{
   SSD_CS_Low();
   SSD_A0_Low();
   SPI_SendByte(command);
@@ @@ -24,98 +24,97 @@ static void WriteCommand(unsigned char c @@
 // Write data to OLED
 static void WriteData(unsigned char data)
+{
   SSD_CS_Low();
   SSD_A0_High();
   SPI_SendByte(data);
   SSD_CS_High();
+}
 // Initialize OLED
 void ssd1306_init(void)
+{
     __SPI3_CLK_ENABLE();
     __GPIOA_CLK_ENABLE();
     __GPIOB_CLK_ENABLE();
     GPIO_InitTypeDef GPIO_InitStruct;
 	__SPI3_CLK_ENABLE();
 	__GPIOA_CLK_ENABLE();
 	__GPIOB_CLK_ENABLE();
 	GPIO_InitTypeDef GPIO_InitStruct;
     /*Configure GPIO pins : OLED_CS_Pin OLED_RESET_Pin OLED_DC_Pin */
     GPIO_InitStruct.Pin = OLED_CS_Pin|OLED_RESET_Pin|OLED_DC_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
     HAL_GPIO_Init(OLED_DC_GPIO_Port, &GPIO_InitStruct);
 	/*Configure GPIO pins : OLED_CS_Pin OLED_RESET_Pin OLED_DC_Pin */
 	GPIO_InitStruct.Pin = OLED_CS_Pin|OLED_RESET_Pin|OLED_DC_Pin;
 	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
 	GPIO_InitStruct.Pull = GPIO_NOPULL;
 	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
 	HAL_GPIO_Init(OLED_DC_GPIO_Port, &GPIO_InitStruct);
 	// Set up MOSI/MISO/SCK
     GPIO_InitStruct.Pin = GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
     GPIO_InitStruct.Alternate = GPIO_AF6_SPI3;
     HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 	GPIO_InitStruct.Pin = GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5;
 	GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
 	GPIO_InitStruct.Pull = GPIO_NOPULL;
 	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
 	GPIO_InitStruct.Alternate = GPIO_AF6_SPI3;
 	HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 	// Set up SPI port for OLED
     hspi1.Instance = SPI3;
     hspi1.Init.Mode = SPI_MODE_MASTER;
     hspi1.Init.Direction = SPI_DIRECTION_2LINES;
     hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
     hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
     hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
     hspi1.Init.NSS = SPI_NSS_SOFT;
     hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16;
     hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
     hspi1.Init.TIMode = SPI_TIMODE_DISABLED;
     hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLED;
     hspi1.Init.NSSPMode = SPI_NSS_PULSE_ENABLED;
     HAL_SPI_Init(&hspi1);
 	hspi1.Instance = SPI3;
 	hspi1.Init.Mode = SPI_MODE_MASTER;
 	hspi1.Init.Direction = SPI_DIRECTION_2LINES;
 	hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
 	hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
 	hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
 	hspi1.Init.NSS = SPI_NSS_SOFT;
 	hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16;
 	hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
 	hspi1.Init.TIMode = SPI_TIMODE_DISABLED;
 	hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLED;
 	hspi1.Init.NSSPMode = SPI_NSS_PULSE_ENABLED;
 	HAL_SPI_Init(&hspi1);
   /* Generate a reset */
   SSD_Reset_Low();
   uint32_t i;
   for(i=5000; i>1; i--)
   SSD_Reset_High();
 	// Generate a reset
 	SSD_Reset_Low();
 	uint32_t i;
 	for(i=5000; i>1; i--)
 	SSD_Reset_High();
   WriteCommand(0xAE);
   WriteCommand(0xD5);
   WriteCommand(0x80);
   WriteCommand(0xA8);
   WriteCommand(0x1F);
   WriteCommand(0xD3);
   WriteCommand(0x00);
   WriteCommand(0x40 | 0x00); // line #0
   WriteCommand(0x8D);
   WriteCommand(0x14); //10 or 14 if not externalvcc
   WriteCommand(0x20);
   WriteCommand(0x00);
 //  WriteCommand(0xA0 | 0x1); // segremap (normal)
   WriteCommand(0xA0); // segremap (flip)
 //  WriteCommand(0xC8); // comscandec (normal)
   WriteCommand(0xC0); // comscandec (flip)
   WriteCommand(0xDA); // setcompins
   WriteCommand(0x02);
   WriteCommand(0x81); // contrast
   WriteCommand(0x0F); // contrast value. 8f is a good one.
   WriteCommand(0xD9);
   WriteCommand(0xF1); //22 or F1 if not externalvcc
   WriteCommand(0xDB);
   WriteCommand(0x40);
   WriteCommand(0xA4); // dispalyallon_resume
   WriteCommand(0xA6); // normaldisplay
 	WriteCommand(0xAE);
 	WriteCommand(0xD5);
 	WriteCommand(0x80);
 	WriteCommand(0xA8);
 	WriteCommand(0x1F);
 	WriteCommand(0xD3);
 	WriteCommand(0x00);
 	WriteCommand(0x40 | 0x00); // line #0
 	WriteCommand(0x8D);
 	WriteCommand(0x14); //10 or 14 if not externalvcc
 	WriteCommand(0x20);
 	WriteCommand(0x00);
 	//  WriteCommand(0xA0 | 0x1); // segremap (normal)
 	WriteCommand(0xA0); // segremap (flip)
 	//  WriteCommand(0xC8); // comscandec (normal)
 	WriteCommand(0xC0); // comscandec (flip)
 	WriteCommand(0xDA); // setcompins
 	WriteCommand(0x02);
 	WriteCommand(0x81); // contrast
 	WriteCommand(0x0F); // contrast value. 8f is a good one.
 	WriteCommand(0xD9);
 	WriteCommand(0xF1); //22 or F1 if not externalvcc
 	WriteCommand(0xDB);
 	WriteCommand(0x40);
 	WriteCommand(0xA4); // dispalyallon_resume
 	WriteCommand(0xA6); // normaldisplay
-  WriteCommand(0xAF); // display on
+	WriteCommand(0xAF); // display on
+}
 // Times New Roman font
 static const char fontData[][5] =
 {                                       // Refer to "Times New Roman" Font Database
                                         //   Basic Characters
     {0x00,0x00,0x00,0x00,0x00},         //   (  0)    - 0x0020 No-Break Space
     {0x00,0x00,0x4F,0x00,0x00},         //   (  1)  ! - 0x0021 Exclamation Mark
     {0x00,0x07,0x00,0x07,0x00},         //   (  2)  " - 0x0022 Quotation Mark
     {0x14,0x7F,0x14,0x7F,0x14},         //   (  3)  # - 0x0023 Number Sign
     {0x24,0x2A,0x7F,0x2A,0x12},         //   (  4)  $ - 0x0024 Dollar Sign
@@ @@ -200,85 +199,98 @@ static const char fontData[][5] = @@
     {0x48,0x54,0x54,0x54,0x20},         //   ( 83)  s - 0x0073 Latin Small Letter S
     {0x04,0x3F,0x44,0x40,0x20},         //   ( 84)  t - 0x0074 Latin Small Letter T
     {0x3C,0x40,0x40,0x20,0x7C},         //   ( 85)  u - 0x0075 Latin Small Letter U
     {0x1C,0x20,0x40,0x20,0x1C},         //   ( 86)  v - 0x0076 Latin Small Letter V
     {0x3C,0x40,0x30,0x40,0x3C},         //   ( 87)  w - 0x0077 Latin Small Letter W
     {0x44,0x28,0x10,0x28,0x44},         //   ( 88)  x - 0x0078 Latin Small Letter X
     {0x0C,0x50,0x50,0x50,0x3C},         //   ( 89)  y - 0x0079 Latin Small Letter Y
     {0x44,0x64,0x54,0x4C,0x44},         //   ( 90)  z - 0x007A Latin Small Letter Z
     {0x00,0x08,0x36,0x41,0x00},         //   ( 91)  { - 0x007B Left Curly Bracket
     {0x00,0x00,0x7F,0x00,0x00},         //   ( 92)  | - 0x007C Vertical Line
     {0x00,0x41,0x36,0x08,0x00},         //   ( 93)  } - 0x007D Right Curly Bracket
     {0x02,0x01,0x02,0x04,0x02},         //   ( 94)  ~ - 0x007E Tilde
-    {0x08,0x14,0x2A,0x14,0x22},         //   ( 95) << - 0x00AB Left-Pointing Double Angle Quotation Mark
+	{0x08,0x14,0x2A,0x14,0x22},         //   ( 95) << - 0x00AB Left-Pointing Double Angle Quotation Mark
     {0x00,0x02,0x05,0x02,0x00},         //   ( 96)    - 0x00B0 Degree Sign
 //    {0x44,0x44,0x5F,0x44,0x44},         //   ( 97) +- - 0x00B1 Plus-Minus Sign
 //    {0x7E,0x20,0x20,0x10,0x3E},         //   ( 98)  u - 0x00B5 Micro Sign
 //    {0x22,0x14,0x2A,0x14,0x08},         //   ( 99) >> - 0x00BB Right-Pointing Double Angle Quotation Mark
 //    {0x30,0x48,0x45,0x40,0x20},         //   (100)  ? - 0x00BF Inverted Question Mark
 //    {0x22,0x14,0x08,0x14,0x22},         //   (101)  x - 0x00D7 Multiplcation Sign
 //    {0x08,0x08,0x2A,0x08,0x08},         //   (102)  + - 0x00F7 Division Sign
 //    {0x18,0x14,0x08,0x14,0x0C},         //   (103)    - 0x221E Infinity
 //    {0x44,0x4A,0x4A,0x51,0x51},         //   (104)  < - 0x2264 Less-Than or Equal to
 //    {0x51,0x51,0x4A,0x4A,0x44},         //   (105)  > - 0x2265 Greater-Than or Equal to
 //    {0x54,0x14,0x64,0x08,0x70},         //   (106)  .: - RF Symbol
 //    {0x70,0x7C,0x72,0x7C,0x70},         //   (107)  ^ - Lock symbol
 //    {0x70,0x5C,0x52,0x54,0x70},         //   (108)  / - Unlock symbol
 //    {0x0C,0x1E,0x3C,0x1E,0x0C},         //   (109)  <3 - Heart Symbol
 //    {0x18,0x22,0xFF,0x12,0x0C},         //   (110)  U - USB Symbol
     {0x44,0x44,0x5F,0x44,0x44},         //   ( 97) +- - 0x00B1 Plus-Minus Sign
     {0x7E,0x20,0x20,0x10,0x3E},         //   ( 98)  u - 0x00B5 Micro Sign
     {0x22,0x14,0x2A,0x14,0x08},         //   ( 99) >> - 0x00BB Right-Pointing Double Angle Quotation Mark
     {0x30,0x48,0x45,0x40,0x20},         //   (100)  ? - 0x00BF Inverted Question Mark
     {0x22,0x14,0x08,0x14,0x22},         //   (101)  x - 0x00D7 Multiplication Sign
     {0x08,0x08,0x2A,0x08,0x08},         //   (102)  + - 0x00F7 Division Sign
     {0x18,0x14,0x08,0x14,0x0C},         //   (103)    - 0x221E Infinity
     {0x44,0x4A,0x4A,0x51,0x51},         //   (104)  < - 0x2264 Less-Than or Equal to
     {0x51,0x51,0x4A,0x4A,0x44},         //   (105)  > - 0x2265 Greater-Than or Equal to
     {0x54,0x14,0x64,0x08,0x70},         //   (106)  .: - RF Symbol
     {0x70,0x7C,0x72,0x7C,0x70},         //   (107)  ^ - Lock symbol
     {0x70,0x5C,0x52,0x54,0x70},         //   (108)  / - Unlock symbol
     {0x0C,0x1E,0x3C,0x1E,0x0C},         //   (109)  <3 - Heart Symbol
     {0x18,0x22,0xFF,0x12,0x0C},         //   (110)  U - USB Symbol
 	{0x22,0x5d,0x22,0x00,0x00},			//   (111) ez updown
 	{0x14,0x3e,0x14,0x00,0x00},         //   (112) ez updown short
 };
 /*
 */
 // Set start page
 static void setStartPage(unsigned char d)
+{
     WriteCommand(0xB0|d);       // Set Page Start Address for Page Addressing Mode
                                 // Default => 0xB0 (0x00)
+}
 /* Below are functions used to configure the OLED */
 // Set start column
 static void setStartColumn(unsigned char d)
+{
     WriteCommand(0x00+d%16);    // Set Lower Column Start Address for Page Addressing Mode
     WriteCommand(0x10+d/16);    // Set Higher Column Start Address for Page Addressing Mode
                                 // Default => 0x10
+}
 // Therm logo
 const uint8_t row[4][32] = {
 	{0x00,0x00,0x01,0x03,0x07,0x0F,0x1E,0x3C,0x3C,0x7C,0x7C,0x7C,0xFC,0xFF,0xFF,0xFC,0xFC,0xFC,0xFC,0xFF,0x7F,0x7F,0x7F,0x3C,0x3C,0x1C,0x0C,0x06,0x03,0x01,0x00,0x00},
 	{0x0F,0x7F,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0x3F,0x3F,0x7F,0xFF,0xFF,0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x7F,0x0F},
 	{0xF0,0xFE,0xFF,0xFF,0xFF,0xC7,0x00,0x00,0x00,0x00,0x87,0xC7,0xC7,0xFF,0xFF,0x00,0x00,0x00,0x00,0x87,0x87,0xC7,0xC3,0x03,0x07,0x07,0x0F,0x7F,0xFF,0xFF,0xFE,0xF0},
 	{0x00,0x00,0x80,0xC0,0xE0,0xF0,0xF8,0xFC,0xFC,0xFE,0xFE,0xFE,0xFF,0xFF,0xFF,0x1F,0x1F,0x1F,0x1F,0xFF,0xFE,0xFE,0xFE,0xFC,0xFC,0xF8,0xF0,0xE0,0xC0,0x80,0x00,0x00},
 };
 // Clear the screen
 void ssd1306_clearscreen()
+{
     uint8_t i = 0;
     uint8_t page = 0;
     for(page = 0; page<4; page++)
+    {
         setStartPage(page);
         setStartColumn(0);
         for(i = 0; i<128; i++)
+        {
             WriteData(0x00);
+        }
+    }
     WriteData(0x00);
+}
 // Draw the therm logo on the left side of the OLED
 void ssd1306_drawlogo()
+{
     uint8_t i = 0;
     setStartPage(3);
     setStartColumn(0);
     for(i = 0; i<32; i++)
+    {
         WriteData(row[0][i]);
+    }
     WriteData(0x00);
@@ @@ -298,43 +310,46 @@ void ssd1306_drawlogo() @@
+    }
     WriteData(0x00);
     setStartPage(0);
     setStartColumn(0);
     for(i = 0; i < 32; i++)
+    {
         WriteData(row[3][i]);
+    }
     WriteData(0x00);
+}
 /* Print a single character from font.cpp */
 void ssd1306_drawchar(char ascii, unsigned char row, unsigned char xPos)
 // Print a single character
 void ssd1306_drawchar(unsigned char ascii, unsigned char row, unsigned char xPos)
+{
     const char *srcPointer = (char*)-1;
+    const unsigned char *srcPointer = (char*)-1;
     srcPointer = &fontData[(ascii-32)][0];
     setStartPage(row);
     setStartColumn(xPos);
     for(uint8_t i = 0; i < 5; i++)
+    {
         WriteData(*srcPointer);
         srcPointer++;
+    }
     WriteData(0x00);
+}
 void ssd1306_drawcharbig(char ascii, unsigned char row, unsigned char xPos)
 // Print a single large character
 void ssd1306_drawcharbig(unsigned char ascii, unsigned char row, unsigned char xPos)
+{
     const char *srcPointer = (char*)-1;
     srcPointer = &fontData[(ascii-32)][0];
     setStartPage(row-1);
     setStartColumn(xPos);
     // Write first row
     for(uint8_t i = 0; i < 5; i++)
+    {
         uint8_t data = 0;
@@ @@ -378,42 +393,45 @@ void ssd1306_drawcharbig(char ascii, uns @@
         data |= ((*srcPointer) & 0b00010000) >> 3; // get top 4 bits
         data |= ((*srcPointer) & 0b00010000) >> 4; // get top 4 bits
         WriteData(data);
         WriteData(data);
         srcPointer++;
+    }
     WriteData(0x00);
+}
 void ssd1306_drawstring(const char *dataPtr, unsigned char row, unsigned char xPos)
 // Print a string to the display
 void ssd1306_drawstring(const unsigned char *dataPtr, unsigned char row, unsigned char xPos)
+{
     char *srcPointer;
+    unsigned char *srcPointer;
     srcPointer = (char*)dataPtr;
+    srcPointer = (unsigned char*)dataPtr;
     ssd1306_drawchar(' ',row,xPos); // NBSP must be written first before the string start
     while(1)
+    {
         ssd1306_drawchar(*srcPointer,row,xPos);
         srcPointer++;
         xPos+=6;
         if(*srcPointer == 0) break;
+    }
+}
 void ssd1306_drawstringbig(const char *dataPtr, unsigned char row, unsigned char xPos)
 // Print a string to the display, big font
 void ssd1306_drawstringbig(const unsigned char *dataPtr, unsigned char row, unsigned char xPos)
+{
     char *srcPointer;
     srcPointer = (char*)dataPtr;
     ssd1306_drawcharbig(' ',row,xPos); // NBSP must be written first before the string start
     while(1)
+    {
         ssd1306_drawcharbig(*srcPointer,row,xPos);
         srcPointer++;
         xPos+=12;
         if(*srcPointer == 0) break;

lib/ssd1306/ssd1306.h

➞

Show inline comments

@@ file renamed from inc/ssd1306.h to lib/ssd1306/ssd1306.h @@
@@ @@ -22,23 +22,25 @@ @@
 #define   SSD_CS_Low()      HAL_GPIO_WritePin(SSD_CS, 0)
 #define   SSD_CS_High()     HAL_GPIO_WritePin(SSD_CS, 1)
 // EMZ FIXME this won't really work
 #define   SPI_SendByte(data)  HAL_SPI_Transmit(spi_get(), &data, 1, 100)
 //#define SPI_SendByte(data)
 #define SPI_Wait()
 //#define   SPI_SendByte(data)  SPI_I2S_SendData(SPI1,data)
 //#define   SPI_Wait()       while(!(SPI1->SR&SPI_FLAG_TXE));while(SPI1->SR&SPI_FLAG_BSY);
 SPI_HandleTypeDef* spi_get();
 void ssd1306_init(void);
 void ssd1306_drawchar(char ascii, unsigned char row, unsigned char xPos);
 void ssd1306_drawcharbig(char ascii, unsigned char row, unsigned char xPos);
 void ssd1306_drawstring(const char *dataPtr, unsigned char row, unsigned char xPos);
 void ssd1306_drawstringbig(const char *dataPtr, unsigned char row, unsigned char xPos);
 void ssd1306_drawchar(unsigned char ascii, unsigned char row, unsigned char xPos);
 void ssd1306_drawcharbig(unsigned char ascii, unsigned char row, unsigned char xPos);
 void ssd1306_drawstring(const unsigned char *dataPtr, unsigned char row, unsigned char xPos);
 void ssd1306_drawstringbig(const unsigned char *dataPtr, unsigned char row, unsigned char xPos);
 void ssd1306_drawlogo();
 void ssd1306_clearscreen();
 #endif
 // vim:softtabstop=4 shiftwidth=4 expandtab

src/buttons.c

➞

Show inline comments

deleted file

src/display.c

➞

Show inline comments

@@ new file 100644 @@
 //
 // Display: render menus on OLED display
 //
 #include "display.h"
 #include "gpio.h"
 #include "ssd1306/ssd1306.h"
 #include "system/stringhelpers.h"
 #include "flash.h"
 // Private function prototypes
 static void draw_setpoint(therm_status_t* status);
 // Button transition variables
 static uint8_t sw_btn_last = 0;
 static uint8_t sw_up_last = 0;
 static uint8_t sw_down_last = 0;
 static uint8_t sw_left_last = 0;
 static uint8_t sw_right_last = 0;
 // Buttonpress macros
 #define SW_BTN_PRESSED (sw_btn_last == 0 && sw_btn == 1) // rising edge on buttonpress
 #define SW_UP_PRESSED (sw_up_last == 0 && sw_up == 1)
 #define SW_DOWN_PRESSED (sw_down_last == 0 && sw_down == 1)
 #define SW_LEFT_PRESSED (sw_left_last == 0 && sw_left == 1)
 #define SW_RIGHT_PRESSED (sw_right_last == 0 && sw_right == 1)
 // States
 static uint8_t trigger_drawsetpoint = 1;
 static int16_t last_temp = 21245;
 static int16_t last_temp_frac = 21245;
 static int16_t last_state = 123;
 static uint8_t goto_mode = MODE_HEAT;
 static uint8_t reset_mode = RESET_REBOOT;
 static char* sensor_lookup[] = {"NTC", "K  ", "E  ", "N  ", "R  ", "S  ", "T  "};
 static uint8_t toggle = 0;
 void display_1hz(void)
+{
 	toggle = !toggle;
+}
 static char updown(void)
+{
 	if(toggle)
 		return '\x8f';
 	else
 		return '\x90';
+}
 // Display state machine
 void display_process(void)
+{
 	therm_status_t* status = runtime_status();
 	therm_settings_t* set = flash_getsettings();
     uint8_t state_changed = status->state != last_state;
     last_state = status->state;
     uint8_t temp_changed = status->temp != last_temp;
     last_temp = status->temp;
     uint8_t sw_btn = !HAL_GPIO_ReadPin(SW_BTN);
     uint8_t sw_up = !HAL_GPIO_ReadPin(SW_UP);
     uint8_t sw_down = !HAL_GPIO_ReadPin(SW_DOWN);
     uint8_t sw_left = !HAL_GPIO_ReadPin(SW_LEFT);
     uint8_t sw_right = !HAL_GPIO_ReadPin(SW_RIGHT);
     switch(status->state)
+    {
         // Idle state
         case STATE_IDLE:
+        {
             // Write text to OLED
             // [ therm :: idle ]
             ssd1306_drawstring("therm \x87 idle ", 0, 40);
             status->pid_enabled = 0;
             if(temp_changed || state_changed) {
                 char tempstr[16];
                 snprintf(tempstr, 16, "Temp: %g", status->temp);
                 ssd1306_drawstring("             ", 3, 40);
                 ssd1306_drawstring(tempstr, 3, 40);
+            }
             if (state_changed) {
             	ssd1306_drawlogo();
+            }
             switch(goto_mode) {
                 case MODE_HEAT:
+                {
 					if(set->val.plant_type == PLANT_HEATER)
 						ssd1306_drawstring("\x83 heat      ", 1, 40);
 					else
 						ssd1306_drawstring("\x83 cool      ", 1, 40);
                 } break;
                 case MODE_SETUP:
+                {
                     ssd1306_drawstring("\x83 setup    ", 1, 40);
                 } break;
                 case MODE_RESET:
+                {
                     ssd1306_drawstring("\x83 reset    ", 1, 40);
                 } break;
 				#ifdef BOOTLOADER_SHORTCUT
                 case MODE_BOOTLOADER:
+                {
                     ssd1306_drawstring("\x83 dfu      ", 1, 40);
+                }
 				#endif
+            }
             // Button handler
             if(SW_BTN_PRESSED) {
                 switch(goto_mode) {
                     case MODE_HEAT:
                         status->state = STATE_PREHEAT;
                         break;
                     case MODE_SETUP:
                         status->state = STATE_SETSENSORTYPE;
                         break;
                     case MODE_RESET:
                         status->state = STATE_RESET;
                         reset_mode = RESET_REBOOT;
                         break;
 					#ifdef BOOTLOADER_SHORTCUT
                     case MODE_BOOTLOADER:
                         ssd1306_clearscreen();
                         ssd1306_drawstring("Bootloader Entered", 0, 0);
                         ssd1306_drawstring("Device won't boot", 2, 0);
                         ssd1306_drawstring("until reflashed!", 3, 0);
 //                        bootloader_enter(); // Resets into bootloader
                         status->state = STATE_RESET; // Just in case
                         break;
 					#endif
                     default:
                         status->state = STATE_PREHEAT;
+                }
+            }
             else if(SW_DOWN_PRESSED && goto_mode < (MODE_SIZE - 1)) {
                 goto_mode++;
+            }
             else if(SW_UP_PRESSED && goto_mode > 0) {
                 goto_mode--;
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETSENSORTYPE:
+        {
             // Write text to OLED
             // [ therm :: set mode ]
             // [ m =          ]
             ssd1306_drawstring("Sensor Type", 0, 40);
             ssd1306_drawlogo();
             ssd1306_drawchar(updown(), 1, 52);
 			ssd1306_drawstring(sensor_lookup[set->val.sensor_type], 1, 60);
             ssd1306_drawstring("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_SETMODE;
+            }
             else
+            {
             	user_input((uint16_t*)&set->val.sensor_type);
                 if(set->val.sensor_type > 6)
                 	set->val.sensor_type = 6;
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETMODE:
+        {
             // Write text to OLED
             // [ therm :: set mode ]
             // [ m =          ]
             ssd1306_drawstring("Control Mode", 0, 40);
             ssd1306_drawlogo();
             ssd1306_drawchar(updown(), 1, 52);
             if(set->val.control_mode == MODE_PID)
                 ssd1306_drawstring("PID       ", 1, 60);
             else
                 ssd1306_drawstring("Thermostat", 1, 60);
             ssd1306_drawstring("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_SETPLANTTYPE;
+            }
             else if (!HAL_GPIO_ReadPin(SW_UP)) {
                 set->val.control_mode = MODE_PID;
+            }
             else if(!HAL_GPIO_ReadPin(SW_DOWN)) {
                 set->val.control_mode = MODE_THERMOSTAT;
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETPLANTTYPE:
+        {
             // Write text to OLED
             // [ therm :: set mode ]
             // [ m =          ]
             ssd1306_drawstring("Plant Type", 0, 40);
             ssd1306_drawlogo();
             ssd1306_drawchar(updown(), 1, 52	);
             if(set->val.plant_type == PLANT_HEATER)
                 ssd1306_drawstring("Heater", 1, 60);
             else
                 ssd1306_drawstring("Cooler", 1, 60);
             ssd1306_drawstring("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
                 if(set->val.control_mode == MODE_PID)
                     status->state = STATE_SETP;
                 else
                     status->state = STATE_SETHYSTERESIS;
+            }
             else if (!HAL_GPIO_ReadPin(SW_UP)) {
                 set->val.plant_type = PLANT_COOLER;
+            }
             else if(!HAL_GPIO_ReadPin(SW_DOWN)) {
                 set->val.plant_type = PLANT_HEATER;
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETP:
+        {
             // Write text to OLED
             // [ therm :: set p ]
             // [ p = 12         ]
             ssd1306_drawstring("Proportional", 0, 40);
             ssd1306_drawlogo();
             ssd1306_drawchar(updown(), 1, 52);
             char tempstr[12];
             snprintf(tempstr, 12, "P=%d", set->val.k_p);
             ssd1306_drawstring(tempstr, 1, 60);
             ssd1306_drawstring("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_SETI;
+            }
             else {
                 user_input((uint16_t*)&set->val.k_p);
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETI:
+        {
             // Write text to OLED
             // [ therm :: set i ]
             // [ i = 12         ]
             ssd1306_drawstring("Integral", 0, 40);
             ssd1306_drawlogo();
             ssd1306_drawchar(updown(), 1, 52);
             char tempstr[12];
             snprintf(tempstr, 12, "I=%d", set->val.k_i);
             ssd1306_drawstring(tempstr, 1, 60);
             ssd1306_drawstring("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_SETD;
+            }
             else {
                 user_input((uint16_t*)&set->val.k_i);
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETD:
+        {
             // Write text to OLED
             // [ therm :: set d ]
             // [ d = 12         ]
             ssd1306_drawstring("Derivative", 0, 40);
             ssd1306_drawlogo();
             ssd1306_drawchar(updown(), 1, 52);
             char tempstr[12];
             snprintf(tempstr, 12, "D=%d", set->val.k_d);
             ssd1306_drawstring(tempstr, 1, 60);
             ssd1306_drawstring("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_SETWINDUP;
+            }
             else {
                 user_input((uint16_t*)&set->val.k_d);
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETHYSTERESIS:
+        {
             // Write text to OLED
             ssd1306_drawstring("Hysteresis", 0, 40);
             ssd1306_drawlogo();
             ssd1306_drawchar(updown(), 1, 52);
             char tempstr[12];
             snprintf(tempstr, 12, "H=%d", set->val.hysteresis);
             ssd1306_drawstring(tempstr, 1, 60);
             ssd1306_drawstring("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_SETBOOTTOBREW;
+            }
             else {
                 user_input((uint16_t*)&set->val.hysteresis);
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETWINDUP:
+        {
             // Write text to OLED
             // [ therm :: set windup ]
             // [ g = 12         ]
             ssd1306_drawstring("Windup Guard", 0, 40);
             ssd1306_drawlogo();
             ssd1306_drawchar(updown(), 1, 52);
             char tempstr[12];
             snprintf(tempstr, 12, "G=%d", set->val.windup_guard);
             ssd1306_drawstring(tempstr, 1, 60);
             ssd1306_drawstring("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_SETBOOTTOBREW;
+            }
             else {
                 user_input((uint16_t*)&set->val.windup_guard);
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETBOOTTOBREW:
+        {
             // Write text to OLED
             // [ therm :: set windup ]
             // [ g = 12         ]
             ssd1306_drawstring("Start on Boot", 0, 40);
             ssd1306_drawlogo();
             ssd1306_drawstring("sob=", 1, 50);
             ssd1306_drawchar(updown(), 1, 43);
             if(set->val.boottobrew)
                 ssd1306_drawstring("Enable ", 1, 75);
             else
                 ssd1306_drawstring("Disable", 1, 75);
             ssd1306_drawstring("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_SETUNITS;
+            }
             else if(!HAL_GPIO_ReadPin(SW_UP)) {
                 set->val.boottobrew = 1;
+            }
             else if(!HAL_GPIO_ReadPin(SW_DOWN)) {
                 set->val.boottobrew = 0;
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETUNITS:
+        {
             // Write text to OLED
             // [ therm :: set windup ]
             // [ g = 12         ]
             ssd1306_drawstring("Units: ", 0, 40);
             ssd1306_drawlogo();
             ssd1306_drawchar(updown(), 1, 52);
             if(set->val.temp_units == TEMP_UNITS_FAHRENHEIT)
                 ssd1306_drawstring("Fahrenheit", 1, 60);
             else
                 ssd1306_drawstring("Celsius   ", 1, 60);
             ssd1306_drawstring("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_SETTEMPOFFSET;
+            }
             else if(!HAL_GPIO_ReadPin(SW_UP)) {
                 set->val.temp_units = TEMP_UNITS_FAHRENHEIT;
+            }
             else if(!HAL_GPIO_ReadPin(SW_DOWN)) {
                 set->val.temp_units = TEMP_UNITS_CELSIUS;
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETTEMPOFFSET:
+        {
             // Write text to OLED
             // [ therm :: set temp offset ]
             // [ g = 12         ]
             ssd1306_drawstring("Temp Cal Offset", 0, 40);
             ssd1306_drawlogo();
             ssd1306_drawchar(updown(), 1, 52);
             char tempstr[12];
             snprintf(tempstr, 12, "O=%d", set->val.temp_offset);
             ssd1306_drawstring(tempstr, 1, 60);
             ssd1306_drawstring("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
 //                flash_save(set);
                 status->state = STATE_IDLE;
+            }
             else {
                 user_input_signed(&set->val.temp_offset);
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_PREHEAT:
+        {
             // Write text to OLED
             // [ therm : preheating brew ]
             // [ 30 => 120 C             ]
             if(set->val.plant_type == PLANT_HEATER)
                 ssd1306_drawstring("Preheating...", 0, 0);
             else
                 ssd1306_drawstring("Precooling...", 0, 0);
             //ssd1306_drawlogo();
             draw_setpoint(status);
             status->pid_enabled = 1;
             status->setpoint = set->val.setpoint_brew;
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_IDLE;
+            }
             else {
                 user_input_signed(&set->val.setpoint_brew);
+            }
             // Event Handler
             if(status->temp >= status->setpoint) {
                 status->state = STATE_MAINTAIN;
+            }
         } break;
         case STATE_MAINTAIN:
+        {
             // Write text to OLED
             // [ therm : ready to brew ]
             // [ 30 => 120 C           ]
             if(set->val.plant_type == PLANT_HEATER)
                 ssd1306_drawstring("Preheated!", 0, 0);
             else
                 ssd1306_drawstring("Precooled!", 0, 0);
             draw_setpoint(status);
             status->pid_enabled = 1;
             status->setpoint = set->val.setpoint_brew;
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_IDLE;
+            }
             else {
                 user_input_signed(&set->val.setpoint_brew);
+            }
             // Event Handler
             // N/A
         } break;
         // Thermocouple error
         case STATE_TC_ERROR:
+        {
             // Write text to OLED
             // [ therm : ready to steam ]
             // [ 30 => 120 C            ]
             ssd1306_drawstring("Error:              ", 0, 0);
             char tempstr[6];
             itoa(status->error_code, tempstr, 10);
             ssd1306_drawstring(tempstr, 0, 57);
             //TODO: add RTD error codes
             if(status->error_code == 1)
                 ssd1306_drawstring("    TC Open Circuit", 1, 0);
             else if(status->error_code == 4)
                 ssd1306_drawstring("    TC Short to GND", 1, 0);
             else if(status->error_code == 8)
                 ssd1306_drawstring("    TC Short to VCC", 1, 0);
             else
                 ssd1306_drawstring("#?, Unknown Error", 1, 0);
             ssd1306_drawstring("                    ", 2, 0);
             ssd1306_drawstring("-> to ignore all or", 2, 0);
             ssd1306_drawstring("press to continue", 3, 0);
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_IDLE;
 				#ifdef MAX31865_RTD_SENSOR
 				max31865_clear_errors(spi_get());
 				#endif
+            }
             else if(SW_RIGHT_PRESSED) {
                 set->val.ignore_error = 1;
                 status->state = STATE_IDLE;
+            }
             // Event Handler
             // Maybe handle if TC is plugged in
             // N/A
         } break;
         // Reset state
         case STATE_RESET:
+        {
             // Write text to OLED
             // [ therm :: reset ]
             ssd1306_drawstring("therm :: reset ", 0, 40);
             status->pid_enabled = 0;
             ssd1306_drawlogo();
             switch(reset_mode) {
 				case RESET_DEFAULTS:
+				{
 					ssd1306_drawstring("-> defaults   ", 1, 40);
 				} break;
                 case RESET_BOOTLOADER:
+                {
                     ssd1306_drawstring("-> bootloader ", 1, 40);
                 } break;
                 case RESET_REBOOT:
+                {
                     ssd1306_drawstring("-> reboot     ", 1, 40);
                 } break;
                 case RESET_EXIT:
+                {
                     ssd1306_drawstring("-> exit       ", 1, 40);
                 } break;
+            }
             // Button handler
             if(SW_BTN_PRESSED) {
                 switch(reset_mode) {
                     case RESET_BOOTLOADER:
+                    {
                         ssd1306_clearscreen();
                         ssd1306_drawstring("Bootloader Entered", 0, 0);
                         ssd1306_drawstring("Device won't boot", 2, 0);
                         ssd1306_drawstring("until reflashed!", 3, 0);
                         HAL_Delay(1000);
 //                        bootloader_enter(); // Resets into bootloader
                         status->state = STATE_RESET; // Just in case
                     } break;
                     case RESET_DEFAULTS:
+                    {
                         status->state = STATE_RESET;
 //                        flash_load_defaults(set);
 //                        flash_save(set);
                         NVIC_SystemReset();
                     } break;
                     case RESET_REBOOT:
+                    {
                         status->state = STATE_RESET;
                         NVIC_SystemReset();
                     } break;
                     case RESET_EXIT:
+                    {
                         status->state = STATE_IDLE;
                     } break;
+                }
+            }
             else if(SW_DOWN_PRESSED && reset_mode < (RESET_SIZE-1)) {
                 reset_mode++;
+            }
             else if(SW_UP_PRESSED && reset_mode > 0) {
                 reset_mode--;
+            }
             // Event Handler
             // N/A
         } break;
         // Something is terribly wrong
         default:
+        {
             status->state = STATE_IDLE;
             status->pid_enabled = 0;
         } break;
+    }
     if(last_state != status->state) {
         // Clear screen on state change
         goto_mode = MODE_HEAT;
         trigger_drawsetpoint = 1;
         ssd1306_clearscreen();
+    }
     // Last buttonpress
     sw_btn_last = sw_btn;
     sw_up_last = sw_up;
     sw_down_last = sw_down;
     sw_left_last = sw_left;
     sw_right_last = sw_right;
+}
 static float temp_last = 43002.0;
 static float setpoint_last = 10023.0;
 // Draw current setpoint on display
 static void draw_setpoint(therm_status_t* status) {
     // FIXME: need to do this when switching modes too
     if(status->temp != temp_last || trigger_drawsetpoint) {
         char tempstr[8];
         snprintf(tempstr, 8, "%g     ", status->temp);
         ssd1306_drawstringbig(tempstr, 3, 0);
+    }
     if(trigger_drawsetpoint)
         ssd1306_drawstringbig(">", 3, 74);
     if(status->setpoint != setpoint_last || trigger_drawsetpoint) {
         char tempstr[4];
         snprintf(tempstr, 4, "%g     ", status->setpoint);
         ssd1306_drawstringbig(tempstr, 3, 90);
+    }
     trigger_drawsetpoint = 0;
     setpoint_last = status->setpoint;
     temp_last = status->temp;
+}
 void display_startup_screen() {
     ssd1306_clearscreen();
     ssd1306_drawstring("therm v0.4", 1, 40);
     ssd1306_drawstring("protofusion.org/therm", 3, 0);
+}
 // vim:softtabstop=4 shiftwidth=4 expandtab

src/dma.c

➞

Show inline comments

deleted file

src/main.c

➞

Show inline comments

 //
 // Therm Firmware
 // Copyright 2017 Ethan Zonca
 // Author(s): Ethan Zonca
 //
 #include "stm32f3xx_hal.h"
 #include "config.h"
 #include "watchdog.h"
 #include "system.h"
 #include "display.h"
 #include "thermostat.h"
 #include "gpio.h"
 #include "tempsense.h"
 #include "pid.h"
 #include "error.h"
 #include "flash.h"
 #include "ssd1306.h"
 #include "dma.h"
 #include "interrupts.h"
 #include "buttons.h"
 #include "ssd1306/ssd1306.h"
 #include "pwmout.h"
 int main(void)
+{
 	sysclock_init();
 	hal_init();
 	gpio_init();
 	ssd1306_init();
 	ssd1306_clearscreen();
 	// Startup screen
     display_startup_screen();
     HAL_Delay(2000);
     ssd1306_clearscreen();
 	ssd1306_drawlogo();
 	HAL_Delay(2000);
 	flash_init();
 	watchdog_init();
 	//just some example code for getting flash values
 //	flash_getsettings()->values.can_id = 67;
 //
 //	if(flash_getsettings()->values.can_id == 12);
     // Default status
 	runtime_status()->temp = 0.0;
 	runtime_status()->state_resume = 0;
 	runtime_status()->state = STATE_IDLE;
 	runtime_status()->setpoint = 70;
 	runtime_status()->pid_enabled = 0;
 //	ssd1306_drawstring(const char *dataPtr, unsigned char row, unsigned char xPos)
 //	ssd1306_drawstring("[ ProtoFuse ]", 0, 0);
     pid_init();
     pwmout_init();
     flash_init();
 	watchdog_init();
 	tempsense_init();
 	float temp_counter = 0;
 	// Software timers
 	uint32_t last_screen_update_time = HAL_GetTick();
 	// Soft timers
     uint32_t last_pid = 0;
     uint32_t last_thermostat = 0;
     uint32_t last_1hz = 0;
     uint32_t last_5hz = 0;
 	while (1)
+	{
 		// function that checks all the buttons
 		freaking_debounce();
 		float duty = 0.0;
 		// Grab and transmit data
 		if(HAL_GetTick() - last_screen_update_time > 100)
 		if(HAL_GetTick() - last_1hz > 750)
+		{
 			HAL_GPIO_TogglePin(LED_GPIO_Port, LED_PIN);
 			char buffer[256];
 			snprintf(buffer, 256, "Counter: %.1f", temp_counter);
 			ssd1306_drawstring(buffer, 3, 45);
 			ssd1306_drawstring("Therm 0.4", 0, 40);
 			temp_counter = temp_counter + 0.1;
 			last_screen_update_time = HAL_GetTick();
 			display_1hz();
 			last_1hz = HAL_GetTick();
+		}
 		if(HAL_GetTick() - last_5hz > 200)
+		{
 			tempsense_readtemp();
 //			runtime_status = tempsense_gettemp();
 			last_5hz = HAL_GetTick();
+		}
 		watchdog_feed();
         if(flash_getsettings()->val.control_mode == MODE_PID && (HAL_GetTick() - last_pid > PID_PERIOD))
+        {
 //        	runtime_status()->temp = tempsense_readtemp();
         	duty = pid_process();
             last_pid = HAL_GetTick();
+        }
         // Thermostatic control
         if(flash_getsettings()->val.control_mode == MODE_THERMOSTAT && HAL_GetTick() - last_thermostat > SSR_PERIOD)
+        {
 //        	runtime_status()->temp = tempsense_readtemp();
         	duty = thermostat_process();
             last_thermostat = HAL_GetTick();
+        }
         pwmout_process(duty);
         display_process();
         watchdog_feed();
 //        // Transmit temperature over USB-CDC on a regular basis
 //        if(HAL_GetTick() - last_vcp_tx > VCP_TX_FREQ)
 //        {
 //            // Print temp to cdc
 //            char tempstr[16];
 //            itoa_fp(status.temp, status.temp_frac, tempstr);
 //            uint8_t numlen = strlen(tempstr);
 //            tempstr[numlen] = '\r';
 //            tempstr[numlen+1] = '\n';
 //
 //    //        if(set.val.usb_plugged)
 //    //            CDC_Transmit_FS(tempstr, numlen+2);
 //           // while(CDC_Transmit_FS("\r\n", 2) == USBD_BUSY);
 //
 //            last_vcp_tx = HAL_GetTick();
 //        }
+	}
+}

src/pid.c

➞

Show inline comments

@@ new file 100644 @@
 //
 // PID: proportional/integral/derivative controller
 //
 #include "pid.h"
 #include "flash.h"
 // PID implementation
 static pid_state_t state;
 void pid_init()
+{
 	state.i_state = 0;
 	state.last_pid_temp = 0;
 	state.last_pid_temp_frac = 0;
+}
 float pid_process(void)
+{
 //            #ifdef MAX31865_RTD_SENSOR
 //            max31865_readtemp(spi_get(), &set, &status);
 //			#else
 //			max31855_readtemp(spi_get(), &set, &status); // Read MAX31855
 //			#endif
 	float ssr_output = 0;
 	if(runtime_status()->pid_enabled)
+	{
 		// Get ssr output for next time
 		int16_t power_percent = pid_update();
 		if(flash_getsettings()->val.plant_type == PLANT_HEATER)
 			power_percent *= -1;
 		//power-percent is 0-1000?
 		ssr_output = power_percent; //(((uint32_t)SSR_PERIOD * (uint32_t)10 * (uint32_t)100) * power_percent) / (uint32_t)1000000;
 		// put ssr output on display
 		ssd1306_drawstring("      ", 0, 90); //fixme: this is bad, but I can't get the old digits to clear otherwise
 		char tempstr[6];
 		snprintf(tempstr, 6, "%g", ssr_output);
 		ssd1306_drawstring(tempstr, 0, 90);
+	}
 	else
+	{
 		ssr_output = 0.0;
+	}
 	return ssr_output;
+}
 int16_t pid_update(void)
+{
 	therm_status_t* status = runtime_status();
 	therm_settings_t* set = flash_getsettings();
 	// Convert temperature to fixed point number with 1/10th resolution
 	float temp = status->temp;
 	// Calculate instantaneous error
 	int16_t error = status->setpoint * 10 - temp; // TODO: Use fixed point fraction
 	// Proportional component
 	int32_t p_term = set->val.k_p * error;
 	// Error accumulator (integrator)
 	state.i_state += error;
 	// to prevent the iTerm getting huge from lots of
 	//  error, we use a "windup guard"
 	// (this happens when the machine is first turned on and
 	// it cant help be cold despite its best efforts)
 	// not necessary, but this makes windup guard values
 	// relative to the current iGain
 	int32_t windup_guard_res = (set->val.windup_guard * 10) / set->val.k_i;
 	// Calculate integral term with windup guard
 	if (state.i_state > windup_guard_res)
 	  state.i_state = windup_guard_res;
 	else if (state.i_state < -windup_guard_res)
 	  state.i_state = -windup_guard_res;
 	int32_t i_term = set->val.k_i * state.i_state;
 	// Calculate differential term (slope since last iteration)
 	int32_t d_term = (set->val.k_d * (temp - state.last_pid_temp));
 	// Save temperature for next iteration
 	state.last_pid_temp = temp;
 	int16_t result = (p_term + i_term - d_term) / 10;
 	// Put out tenths of percent, 0-1000.
 	if(result > 1000)
 	result = 1000;
 	else if(result < -1000)
 	result = -1000;
 	// Return feedback
 	return result;
+}

src/pwmout.c

➞

Show inline comments

@@ new file 100644 @@
 //
 // PWM Out: generate PWM waveform to control factory
 //
 #include "pwmout.h"
 #include "gpio.h"
 #include "flash.h"
 static uint32_t last_ssr_on = 0;
 void pwmout_init(void)
+{
 	GPIO_InitTypeDef GPIO_InitStruct;
 	// Configure LED GPIO pins
 	GPIO_InitStruct.Pin = SSR_PIN;
 	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
 	GPIO_InitStruct.Pull = GPIO_NOPULL;
 	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
 	HAL_GPIO_Init(SSR_GPIO_Port, &GPIO_InitStruct);
+}
 // freaking integral term isn't compatible with both heating and cooling... due to the discard
 // functionality. this is a problem.
 // also duty cycling isn't working correctly...
 void pwmout_process(float duty)
+{
 	uint32_t ssr_output = duty; // meh
 	// Kill SSR once the desired on-time has elapsed
 	if(flash_getsettings()->val.control_mode == MODE_PID && ((HAL_GetTick() - last_ssr_on > ssr_output) || ssr_output <= 0))
+	{
 		HAL_GPIO_WritePin(SSR, 0);
 		HAL_GPIO_WritePin(LED, 0);
+	}
 	// Every 200ms, set the SSR on unless output is 0
 	if(flash_getsettings()->val.control_mode == MODE_PID && HAL_GetTick() - last_ssr_on > SSR_PERIOD)
+	{
 		// Heat or cool, if we need to
 		if(ssr_output > 0)
+		{
 			HAL_GPIO_WritePin(SSR, 1);
 			HAL_GPIO_WritePin(LED, 1);
 			last_ssr_on = HAL_GetTick();
+		}
 		else {
 			// Make sure everything is off
 			HAL_GPIO_WritePin(SSR, 0);
 			HAL_GPIO_WritePin(LED, 0);
+		}
+	}
+}

src/system/error.c

➞

Show inline comments

file renamed from src/error.c to src/system/error.c

src/system/flash.c

➞

Show inline comments

@@ file renamed from src/flash.c to src/system/flash.c @@
 //
 // Flash: Nonvolatile storage for settings / etc
 //
 #include "stm32f3xx_hal.h"
 #include "flash.h"
 #include "config.h"
 // Takes up 1 page (1k size)
 static __attribute__((__section__(".eeprom"))) uint16_t eeprom_emulation[512];
 settings_t settings;
 therm_settings_t settings;
 therm_status_t status;
 // Initialize flash and restore settings
 void flash_init(void)
+{
 	flash_restoresettings();
+}
 // Save settings to flash memory
-void flash_savesettings(void)
 void flash_savesettings()
+{
 	// Unlock flash memory
 	HAL_FLASH_Unlock();
 	// Initialize eraser to erase one page of flash
 	FLASH_EraseInitTypeDef eraser =
+	{
 			.TypeErase = TYPEERASE_PAGES,
 			.PageAddress = eeprom_emulation,
 			.NbPages = 1,
 	};
 	uint32_t errvar = 0;
@@ @@ -59,22 +60,32 @@ void flash_restoresettings(void) @@
 	if(eeprom_emulation[FLASH_MAGIC_LOC] == FLASH_MAGIC_VALUE)
+	{
 		// Read page of flash into settings structure
 		uint16_t readctr = 0;
 		for(readctr = 0; readctr < 128; readctr++)
+		{
 			settings.data[readctr] = eeprom_emulation[readctr];
+		}
+	}
 	// No data in flash! Set defaults here
 	else
+	{
 		settings.values.can_id = 22;
 		settings.val.k_p = 10;
 		settings.val.k_i = 0;
 		settings.val.k_d = 0;
 		settings.val.windup_guard = 300;
 		//torestore.values.can_id = 22;
+	}
+}
 // Accessor to retrieve settings structure
-inline settings_t* flash_getsettings(void)
+inline therm_settings_t* flash_getsettings(void)
+{
 	return &settings;
+}
 inline therm_status_t* runtime_status(void)
+{
 	return &status;
+}

src/system/gpio.c

➞

Show inline comments

@@ file renamed from src/gpio.c to src/system/gpio.c @@
 //
 // GPIO: configure general-purpose inputs/outputs
 //
 #include "stm32f3xx_hal.h"
 #include "gpio.h"
 #define CHANGE_PERIOD_MS 100
 #define CHANGE_ELAPSED (HAL_GetTick() - change_time_reset) > CHANGE_PERIOD_MS
 #define CHANGE_RESET change_time_reset = HAL_GetTick()
 // Increase on each press, and increase at a fast rate after duration elapsed of continuously holding down... somehow...
 static uint32_t change_time_reset = 0;
 // Increment/decrement unsigned variable with up/down buttons
 void user_input(uint16_t* to_modify)
+{
     if(CHANGE_ELAPSED) {
         if(!HAL_GPIO_ReadPin(SW_UP) ) {
             CHANGE_RESET;
             (*to_modify)++;
+        }
         else if(!HAL_GPIO_ReadPin(SW_DOWN) && (*to_modify) > 0) {
             CHANGE_RESET;
             (*to_modify)--;
+        }
+    }
+}
 // Increment/decrement signed variable with up/down buttons
 void user_input_signed(int32_t* to_modify)
+{
 	//fixme: need to cast to 16/32 bits correctly
     if(CHANGE_ELAPSED) {
         if(!HAL_GPIO_ReadPin(SW_UP) ) {
             CHANGE_RESET;
             if (*to_modify < 32768)
             	(*to_modify)++;
+        }
         else if(!HAL_GPIO_ReadPin(SW_DOWN)) {
             CHANGE_RESET;
             if (*to_modify >= -32768)
             	(*to_modify)--;
+        }
+    }
+}
 // Initialize GPIOs
 void gpio_init(void)
+{
 	GPIO_InitTypeDef GPIO_InitStruct;
 	// GPIO Ports Clock Enable
 	__GPIOA_CLK_ENABLE();
 	__GPIOB_CLK_ENABLE();
 	__GPIOF_CLK_ENABLE();

src/system/interrupts.c

➞

Show inline comments

file renamed from src/interrupts.c to src/system/interrupts.c

src/system/sbrk.c

➞

Show inline comments

file renamed from src/sbrk.c to src/system/sbrk.c

src/system/stringhelpers.c

➞

Show inline comments

@@ new file 100644 @@
 #include <inttypes.h>
 char const digit[] = "0123456789";
 char* zitoa(int16_t i, char b[]){
     char* p = b;
     if(i<0){
         *p++ = '-';
         i *= -1;
+    }
     uint16_t shifter = i;
     do{ //Move to where representation ends
         ++p;
         shifter = shifter/10;
     }while(shifter);
     *p = '\0';
     do{ //Move back, inserting digits as you go
         *--p = digit[i%10];
         i = i/10;
     }while(i);
     return b;
+}
 char* itoa_fp(int16_t i, uint8_t frac, char b[]){
     // set p to beginning of char array
     char* p = b;
     // If negative, set current char to '-' and inc, unnegate number
     if(i<0){
         *p++ = '-';
         i *= -1;
+    }
     // Init shifter to numeric value
     uint16_t shifter = i;
     uint16_t frac_shifter = frac;
     // Iterate through 10s places, incrementing text pointer as we go
     do{
         ++p;
         shifter = shifter/10;
     }while(shifter);
     ++p; // increment for decimal point
     do{
         ++p;
         frac_shifter = frac_shifter/10;
     }while(frac_shifter);
     // Null-terminate the string
     *p = '\0';
     // Go backwards and write out fractional digits
     do{
         *--p = digit[frac%10];
         frac = frac/10;
     }while(frac);
     *--p = '.'; // insert decimal point
     // Go backwards and write out remaining digits
     do{
         *--p = digit[i%10];
         i = i/10;
     }while(i);
     return b;
+}

src/system/system.c

➞

Show inline comments

file renamed from src/system.c to src/system/system.c

src/system/watchdog.c

➞

Show inline comments

file renamed from src/watchdog.c to src/system/watchdog.c

src/tempsense.c

➞

Show inline comments

@@ new file 100644 @@
 //
 // TempSense: read temperature from TC, RTD, or NTC
 //
 #include "tempsense.h"
 #include "flash.h"
 #include "ssd1306/ssd1306.h"
 #include "max31856/max31856.h"
 void tempsense_init(void)
+{
 	// TODO: Rework SPI stuff... init the port in a sharedlib then pass ref to display and tempsense
 	max31856_init(spi_get(), TEMPSENSE_MAX_CS_PORT, TEMPSENSE_MAX_CS_PIN, 0);
 	// Maybe don't perform temp sensor setup in here, but in readtemp?
 	// what happens if the user changes the tempsense type while running?
 	// we need to re-init...
+}
 // Returns the latest reading from the configured temperature sensor
 float tempsense_readtemp(void)
+{
 	switch(flash_getsettings()->val.sensor_type)
+	{
 		case SENSOR_TC_K:
 		case SENSOR_TC_E:
 		case SENSOR_TC_N:
 		case SENSOR_TC_R:
 		case SENSOR_TC_S:
 		case SENSOR_TC_T:
+		{
 			// Read MAX31856
 		} break;
 		case SENSOR_NTC:
+		{
 			// Read analog value from internal ADC, linearize the reading, etc
 		} break;
+	}
 	// either return latest reading from DMA loop (NTC, etc)
 	// or initiate a blocking read and return it.
 	// Need to gracefully handle the timeout...
+}

src/thermostat.c

➞

Show inline comments

@@ new file 100644 @@
 //
 // Thermostat: Thermostatic controller
 //
 #include "thermostat.h"
 #include "flash.h"
 #include "gpio.h"
 // PID implementation
 float thermostat_process(void)
+{
 //            #ifdef MAX31865_RTD_SENSOR
 //            max31865_readtemp(spi_get(), &set, &status);
 //			#else
 //			max31855_readtemp(spi_get(), &set, &status); // Read MAX31855
 //			#endif
 			float ssr_output = 0.0;
 			uint8_t thermostat_plant_on = 0;
 			// TODO: Migrate this FxP conversion to the readtemp code or similar
 			float temp = runtime_status()->temp;
 			// EMZ FIXME: This could be way simpler
 			if(flash_getsettings()->val.plant_type == PLANT_HEATER && runtime_status()->setpoint * 10 < temp - flash_getsettings()->val.hysteresis * 10)
 				thermostat_plant_on = 1;
 			else if(flash_getsettings()->val.plant_type == PLANT_HEATER && runtime_status()->setpoint * 10 > temp + flash_getsettings()->val.hysteresis * 10)
 				thermostat_plant_on = 0;
 			if(flash_getsettings()->val.plant_type == PLANT_COOLER && runtime_status()->setpoint * 10 > temp + flash_getsettings()->val.hysteresis * 10)
 				thermostat_plant_on = 1;
 			else if(flash_getsettings()->val.plant_type == PLANT_COOLER && runtime_status()->setpoint * 10 < temp - flash_getsettings()->val.hysteresis * 10)
 				thermostat_plant_on = 0;
 			// EMZ: TODO: Refactor to output_enabled or something
 			if(runtime_status()->pid_enabled && thermostat_plant_on)
+			{
 				// EMZ TODO: functionalize this
 				// put ssr output on display
 				ssd1306_drawstring("      ", 0, 90); //fixme: this is bad, but I can't get the old digits to clear otherwise
 				char tempstr[6];
 				itoa(ssr_output, tempstr, 10);
 				ssd1306_drawstring(tempstr, 0, 90);
 //                HAL_GPIO_WritePin(SSR_PIN, 1);
 				HAL_GPIO_WritePin(LED, 1);
+			}
 			else
+			{
 //                HAL_GPIO_WritePin(SSR_PIN, 0);
 				HAL_GPIO_WritePin(LED, 0);
+			}
 			return ssr_output;
+}

0 comments (0 inline, 0 general)