Update power indicator

Fixes and closes #211 Final 2.04 release coming up :)
Add showing the tip temp on idle (#226 )
2018-04-27 15:25:58 +10:00 · 2018-04-27 14:46:59 +10:00 · 2018-04-20 12:44:07 +10:00 · 2018-04-14 18:05:13 +10:00 · 2018-04-14 17:58:28 +10:00 · 2018-04-14 17:05:26 +10:00
22 changed files with 528 additions and 349 deletions
--- a/Resources/TS100/TS100.ioc
+++ b/Resources/TS100/TS100.ioc
@@ -34,36 +34,36 @@ ADC1.SamplingTime-4\#ChannelInjectedConversion=ADC_SAMPLETIME_239CYCLES_5
 ADC1.SamplingTime-5\#ChannelInjectedConversion=ADC_SAMPLETIME_71CYCLES_5
 ADC1.ScanConvMode=ADC_SCAN_ENABLE
 ADC1.master=1
-Dma.ADC1.2.Direction=DMA_PERIPH_TO_MEMORY
-Dma.ADC1.2.Instance=DMA1_Channel1
-Dma.ADC1.2.MemDataAlignment=DMA_MDATAALIGN_HALFWORD
-Dma.ADC1.2.MemInc=DMA_MINC_ENABLE
-Dma.ADC1.2.Mode=DMA_CIRCULAR
-Dma.ADC1.2.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
-Dma.ADC1.2.PeriphInc=DMA_PINC_DISABLE
-Dma.ADC1.2.Priority=DMA_PRIORITY_VERY_HIGH
-Dma.ADC1.2.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
-Dma.I2C1_RX.0.Direction=DMA_PERIPH_TO_MEMORY
-Dma.I2C1_RX.0.Instance=DMA1_Channel7
-Dma.I2C1_RX.0.MemDataAlignment=DMA_MDATAALIGN_BYTE
-Dma.I2C1_RX.0.MemInc=DMA_MINC_ENABLE
-Dma.I2C1_RX.0.Mode=DMA_NORMAL
-Dma.I2C1_RX.0.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
-Dma.I2C1_RX.0.PeriphInc=DMA_PINC_DISABLE
-Dma.I2C1_RX.0.Priority=DMA_PRIORITY_LOW
-Dma.I2C1_RX.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
-Dma.I2C1_TX.1.Direction=DMA_MEMORY_TO_PERIPH
-Dma.I2C1_TX.1.Instance=DMA1_Channel6
-Dma.I2C1_TX.1.MemDataAlignment=DMA_MDATAALIGN_BYTE
-Dma.I2C1_TX.1.MemInc=DMA_MINC_ENABLE
-Dma.I2C1_TX.1.Mode=DMA_NORMAL
-Dma.I2C1_TX.1.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
-Dma.I2C1_TX.1.PeriphInc=DMA_PINC_DISABLE
-Dma.I2C1_TX.1.Priority=DMA_PRIORITY_LOW
-Dma.I2C1_TX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
-Dma.Request0=I2C1_RX
-Dma.Request1=I2C1_TX
-Dma.Request2=ADC1
+Dma.ADC1.0.Direction=DMA_PERIPH_TO_MEMORY
+Dma.ADC1.0.Instance=DMA1_Channel1
+Dma.ADC1.0.MemDataAlignment=DMA_MDATAALIGN_HALFWORD
+Dma.ADC1.0.MemInc=DMA_MINC_ENABLE
+Dma.ADC1.0.Mode=DMA_CIRCULAR
+Dma.ADC1.0.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
+Dma.ADC1.0.PeriphInc=DMA_PINC_DISABLE
+Dma.ADC1.0.Priority=DMA_PRIORITY_VERY_HIGH
+Dma.ADC1.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.I2C1_RX.1.Direction=DMA_PERIPH_TO_MEMORY
+Dma.I2C1_RX.1.Instance=DMA1_Channel7
+Dma.I2C1_RX.1.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.I2C1_RX.1.MemInc=DMA_MINC_ENABLE
+Dma.I2C1_RX.1.Mode=DMA_NORMAL
+Dma.I2C1_RX.1.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.I2C1_RX.1.PeriphInc=DMA_PINC_DISABLE
+Dma.I2C1_RX.1.Priority=DMA_PRIORITY_MEDIUM
+Dma.I2C1_RX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.I2C1_TX.2.Direction=DMA_MEMORY_TO_PERIPH
+Dma.I2C1_TX.2.Instance=DMA1_Channel6
+Dma.I2C1_TX.2.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.I2C1_TX.2.MemInc=DMA_MINC_ENABLE
+Dma.I2C1_TX.2.Mode=DMA_NORMAL
+Dma.I2C1_TX.2.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.I2C1_TX.2.PeriphInc=DMA_PINC_DISABLE
+Dma.I2C1_TX.2.Priority=DMA_PRIORITY_MEDIUM
+Dma.I2C1_TX.2.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.Request0=ADC1
+Dma.Request1=I2C1_RX
+Dma.Request2=I2C1_TX
 Dma.RequestsNb=3
 FREERTOS.FootprintOK=true
 FREERTOS.INCLUDE_vTaskDelete=0
@@ -74,8 +74,9 @@ FREERTOS.configMINIMAL_STACK_SIZE=256
 FREERTOS.configTICK_RATE_HZ=100
 FREERTOS.configTOTAL_HEAP_SIZE=10240
 File.Version=6
+I2C1.DutyCycle=I2C_DUTYCYCLE_2
 I2C1.I2C_Mode=I2C_Fast
-I2C1.IPParameters=I2C_Mode
+I2C1.IPParameters=I2C_Mode,DutyCycle
 IWDG.IPParameters=Prescaler
 IWDG.Prescaler=IWDG_PRESCALER_256
 KeepUserPlacement=false
@@ -88,8 +89,9 @@ Mcu.IP4=IWDG
 Mcu.IP5=NVIC
 Mcu.IP6=RCC
 Mcu.IP7=SYS
-Mcu.IP8=TIM3
-Mcu.IPNb=9
+Mcu.IP8=TIM2
+Mcu.IP9=TIM3
+Mcu.IPNb=10
 Mcu.Name=STM32F103T(8-B)Ux
 Mcu.Package=VFQFPN36
 Mcu.Pin0=PA6
@@ -100,9 +102,12 @@ Mcu.Pin12=PB7
 Mcu.Pin13=VP_FREERTOS_VS_ENABLE
 Mcu.Pin14=VP_IWDG_VS_IWDG
 Mcu.Pin15=VP_SYS_VS_tim1
-Mcu.Pin16=VP_TIM3_VS_ClockSourceINT
-Mcu.Pin17=VP_TIM3_VS_no_output4
+Mcu.Pin16=VP_TIM2_VS_ClockSourceINT
+Mcu.Pin17=VP_TIM2_VS_no_output1
+Mcu.Pin18=VP_TIM2_VS_no_output3
+Mcu.Pin19=VP_TIM3_VS_ClockSourceINT
 Mcu.Pin2=PB0
+Mcu.Pin20=VP_TIM3_VS_no_output4
 Mcu.Pin3=PB1
 Mcu.Pin4=PA8
 Mcu.Pin5=PA9
@@ -110,28 +115,31 @@ Mcu.Pin6=PA13
 Mcu.Pin7=PA14
 Mcu.Pin8=PB3
 Mcu.Pin9=PB4
-Mcu.PinsNb=18
+Mcu.PinsNb=21
+Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103T8Ux
-MxCube.Version=4.22.0
-MxDb.Version=DB.4.0.220
-NVIC.ADC1_2_IRQn=true\:5\:0\:false\:false\:true\:true
-NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false
-NVIC.DMA1_Channel1_IRQn=true\:5\:0\:false\:false\:true\:true
-NVIC.DMA1_Channel6_IRQn=true\:5\:0\:false\:false\:true\:true
-NVIC.DMA1_Channel7_IRQn=true\:5\:0\:false\:false\:true\:true
-NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false
-NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false
-NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false
-NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false
-NVIC.PendSV_IRQn=true\:15\:0\:false\:false\:false\:true
+MxCube.Version=4.25.0
+MxDb.Version=DB.4.0.250
+NVIC.ADC1_2_IRQn=true\:5\:0\:false\:false\:true\:true\:true
+NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC.DMA1_Channel1_IRQn=true\:5\:0\:false\:false\:true\:true\:true
+NVIC.DMA1_Channel6_IRQn=true\:5\:0\:false\:false\:true\:true\:true
+NVIC.DMA1_Channel7_IRQn=true\:5\:0\:false\:false\:true\:true\:true
+NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC.I2C1_ER_IRQn=true\:5\:0\:false\:false\:true\:true\:true
+NVIC.I2C1_EV_IRQn=true\:5\:0\:false\:false\:true\:true\:true
+NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC.PendSV_IRQn=true\:15\:0\:false\:false\:false\:true\:true
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
-NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:false\:false
-NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:true
-NVIC.TIM1_UP_IRQn=true\:0\:0\:false\:false\:true\:false
+NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:false\:false\:true
+NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:true\:true
+NVIC.TIM1_UP_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.TimeBase=TIM1_UP_IRQn
 NVIC.TimeBaseIP=TIM1
-NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false
+NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 PA13.Locked=true
 PA13.Mode=Serial_Wire
 PA13.Signal=SYS_JTMS-SWDIO
@@ -193,29 +201,30 @@ PCC.Vdd=3.3
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
 ProjectManager.BackupPrevious=false
-ProjectManager.CompilerOptimize=2
+ProjectManager.CompilerOptimize=3
 ProjectManager.ComputerToolchain=false
 ProjectManager.CoupleFile=false
-ProjectManager.CustomerFirmwarePackage=C\:/Users/Ben V. Brown/STM32Cube/Repository/STM32Cube_FW_F1_V1.6.0
+ProjectManager.CustomerFirmwarePackage=C\:/Users/Ralim/STM32Cube/Repository/STM32Cube_FW_F1_V1.6.1
 ProjectManager.DefaultFWLocation=true
 ProjectManager.DeletePrevious=true
 ProjectManager.DeviceId=STM32F103T8Ux
-ProjectManager.FirmwarePackage=STM32Cube FW_F1 V1.6.0
+ProjectManager.FirmwarePackage=STM32Cube FW_F1 V1.6.1
 ProjectManager.FreePins=true
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0x200
 ProjectManager.KeepUserCode=true
 ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=1
+ProjectManager.MainLocation=Src
 ProjectManager.PreviousToolchain=SW4STM32
 ProjectManager.ProjectBuild=false
 ProjectManager.ProjectFileName=TS100.ioc
 ProjectManager.ProjectName=TS100
 ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=SW4STM32
-ProjectManager.ToolChainLocation=C\:\\Users\\Ralim\\Repo\\ts100\\TS100
+ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL,2-MX_DMA_Init-DMA-false-HAL,3-MX_I2C1_Init-I2C1-false-HAL,4-MX_ADC1_Init-ADC1-false-HAL,5-SystemClock_Config-RCC-false-HAL,6-MX_TIM3_Init-TIM3-false-HAL,7-MX_IWDG_Init-IWDG-false-HAL
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-MX_I2C1_Init-I2C1-false-HAL-true,4-MX_ADC1_Init-ADC1-false-HAL-true,5-SystemClock_Config-RCC-false-HAL-true,6-MX_TIM3_Init-TIM3-false-HAL-true,7-MX_IWDG_Init-IWDG-false-HAL-true,8-MX_TIM2_Init-TIM2-false-HAL-true
 RCC.ADCFreqValue=8000000
 RCC.ADCPresc=RCC_ADCPCLK2_DIV8
 RCC.AHBFreq_Value=64000000
@@ -252,6 +261,9 @@ SH.GPXTI5.0=GPIO_EXTI5
 SH.GPXTI5.ConfNb=1
 SH.S_TIM3_CH1.0=TIM3_CH1,PWM Generation1 CH1
 SH.S_TIM3_CH1.ConfNb=1
+TIM2.Channel-PWM\ Generation1\ No\ Output=TIM_CHANNEL_1
+TIM2.Channel-PWM\ Generation3\ No\ Output=TIM_CHANNEL_3
+TIM2.IPParameters=Channel-PWM Generation1 No Output,Channel-PWM Generation3 No Output
 TIM3.Channel-Output\ Compare4\ No\ Output=TIM_CHANNEL_4
 TIM3.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1
 TIM3.ClockDivision=TIM_CLOCKDIVISION_DIV4
@@ -267,6 +279,12 @@ VP_IWDG_VS_IWDG.Mode=IWDG_Activate
 VP_IWDG_VS_IWDG.Signal=IWDG_VS_IWDG
 VP_SYS_VS_tim1.Mode=TIM1
 VP_SYS_VS_tim1.Signal=SYS_VS_tim1
+VP_TIM2_VS_ClockSourceINT.Mode=Internal
+VP_TIM2_VS_ClockSourceINT.Signal=TIM2_VS_ClockSourceINT
+VP_TIM2_VS_no_output1.Mode=PWM Generation1 No Output
+VP_TIM2_VS_no_output1.Signal=TIM2_VS_no_output1
+VP_TIM2_VS_no_output3.Mode=PWM Generation3 No Output
+VP_TIM2_VS_no_output3.Signal=TIM2_VS_no_output3
 VP_TIM3_VS_ClockSourceINT.Mode=Internal
 VP_TIM3_VS_ClockSourceINT.Signal=TIM3_VS_ClockSourceINT
 VP_TIM3_VS_no_output4.Mode=Output Compare4 No Output
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # TS100
 This is a complete rewrite of the open source software for the ts100 soldering iron.
 The version two fork of this code has no shared code with the original firmware from Miniware (E-design) group.
-This project is concidered feature complete for use as a soldering iron, *so please suggest any feature improvements you would like!*
+This project is considered feature complete for use as a soldering iron, *so please suggest any feature improvements you would like!*

 A short(ish) video that goes through every single menu option in the firmware is available [over here](https://www.youtube.com/watch?v=WlnpboYfxNk). 
 This video was created on an earlier 1.x version of the firmware, so alot has changed and a new video will be coming soon for the 2.x fork.
--- a/workspace/TS100/.cproject
+++ b/workspace/TS100/.cproject
@@ -110,120 +110,6 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="fr.ac6.managedbuild.config.gnu.cross.exe.release.723264573">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="fr.ac6.managedbuild.config.gnu.cross.exe.release.723264573" moduleId="org.eclipse.cdt.core.settings" name="Release">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.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 artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="fr.ac6.managedbuild.config.gnu.cross.exe.release.723264573" name="Release" parent="fr.ac6.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary and Printing size information:" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot;; arm-none-eabi-size -B &quot;${BuildArtifactFileName}&quot; ;arm-none-eabi-objcopy -O ihex &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.hex&quot;">
-					<folderInfo id="fr.ac6.managedbuild.config.gnu.cross.exe.release.723264573." name="/" resourcePath="">
-						<toolChain id="fr.ac6.managedbuild.toolchain.gnu.cross.exe.release.1456567544" name="Ac6 STM32 MCU GCC" superClass="fr.ac6.managedbuild.toolchain.gnu.cross.exe.release">
-							<option id="fr.ac6.managedbuild.option.gnu.cross.mcu.67332574" name="Mcu" superClass="fr.ac6.managedbuild.option.gnu.cross.mcu" useByScannerDiscovery="false" value="STM32F103T8Ux" valueType="string"/>
-							<option id="fr.ac6.managedbuild.option.gnu.cross.board.1570943989" name="Board" superClass="fr.ac6.managedbuild.option.gnu.cross.board" useByScannerDiscovery="false" value="ts100" valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="fr.ac6.managedbuild.targetPlatform.gnu.cross.793444160" isAbstract="false" osList="all" superClass="fr.ac6.managedbuild.targetPlatform.gnu.cross"/>
-							<builder buildPath="${workspace_loc:/TS100}/Release" id="fr.ac6.managedbuild.builder.gnu.cross.548236022" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="fr.ac6.managedbuild.builder.gnu.cross"/>
-							<tool id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.1363306495" name="MCU GCC Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler">
-								<option id="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level.1100266163" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.c.optimization.level.more" valueType="enumerated"/>
-								<option id="gnu.c.compiler.option.debugging.level.2139237845" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
-								<option id="gnu.c.compiler.option.include.paths.1770182855" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/core&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/device&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc/Legacy&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3&quot;"/>
-								</option>
-								<option id="gnu.c.compiler.option.preprocessor.def.symbols.1423042308" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="STM32F103T8Ux"/>
-									<listOptionValue builtIn="false" value="STM32F1"/>
-									<listOptionValue builtIn="false" value="STM32"/>
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32F103xB"/>
-									<listOptionValue builtIn="false" value="USE_RTOS_SYSTICK"/>
-								</option>
-								<option id="gnu.c.compiler.option.dialect.std.356859384" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
-								<option id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata.1580070223" name="Place the data in their own section (-fdata-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<option id="gnu.c.compiler.option.misc.pic.1841660469" name="Position Independent Code (-fPIC)" superClass="gnu.c.compiler.option.misc.pic" useByScannerDiscovery="false" value="false" valueType="boolean"/>
-								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.747173367" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/>
-								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.1210653460" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/>
-							</tool>
-							<tool id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.1414722294" name="MCU G++ Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler">
-								<option id="fr.ac6.managedbuild.gnu.cpp.compiler.option.optimization.level.1489744363" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.cpp.optimization.level.more" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.debugging.level.641509376" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.include.paths.105977434" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/core&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/device&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc/Legacy&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3&quot;"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.preprocessor.def.158062035" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="STM32F103T8Ux"/>
-									<listOptionValue builtIn="false" value="STM32F1"/>
-									<listOptionValue builtIn="false" value="STM32"/>
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32F103xB"/>
-									<listOptionValue builtIn="false" value="USE_RTOS_SYSTICK"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.dialect.std.2101054556" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.default" valueType="enumerated"/>
-								<option id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata.1877154487" name="Place the data in their own section (-fdata-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp.688034595" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp"/>
-								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s.6473827" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s"/>
-							</tool>
-							<tool id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.1409185098" name="MCU GCC Linker" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker"/>
-							<tool id="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker.162825548" name="MCU G++ Linker" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker">
-								<option id="gnu.cpp.link.option.strip.459660118" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<option id="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker.gcsections.664103720" name="Discard unused sections (-Wl,--gc-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker.gcsections" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1735005640" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="fr.ac6.managedbuild.tool.gnu.archiver.907512577" name="MCU GCC Archiver" superClass="fr.ac6.managedbuild.tool.gnu.archiver"/>
-							<tool id="fr.ac6.managedbuild.tool.gnu.cross.assembler.1906472572" name="MCU GCC Assembler" superClass="fr.ac6.managedbuild.tool.gnu.cross.assembler">
-								<option id="gnu.both.asm.option.include.paths.1277819409" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/core&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/device&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc/Legacy&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1588000933" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.assembler.input.1118741214" superClass="fr.ac6.managedbuild.tool.gnu.cross.assembler.input"/>
-							</tool>
-							<tool id="fr.ac6.managedbuild.tool.gnu.cross.assembler.exe.release.63862661" name="MCU GCC Assembler" superClass="fr.ac6.managedbuild.tool.gnu.cross.assembler.exe.release">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.983697759" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.assembler.input.1721181053" superClass="fr.ac6.managedbuild.tool.gnu.cross.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry excluding="Src/stm32f1xx_hal_timebase_tim_template.c|Src/stm32f1xx_hal_timebase_rtc_wakeup_template.c|Src/stm32f1xx_hal_timebase_rtc_alarm_template.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="HAL_Driver"/>
-						<entry excluding="Third_Party/FreeRTOS/Source/portable/MemMang/heap_1.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_2.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_3.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_5.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="inc"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="startup"/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="TS100.fr.ac6.managedbuild.target.gnu.cross.exe.1768512215" name="Executable" projectType="fr.ac6.managedbuild.target.gnu.cross.exe"/>
--- a/workspace/TS100/.settings/language.settings.xml
+++ b/workspace/TS100/.settings/language.settings.xml
@@ -6,19 +6,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1349131645423570210" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${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="fr.ac6.managedbuild.config.gnu.cross.exe.release.723264573" 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 copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1349131645423570210" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-283880394950776525" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${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>
--- a/workspace/TS100/TS100.cfg
+++ b/workspace/TS100/TS100.cfg
@@ -0,0 +1,27 @@
+# This is an ts100 board with a single STM32F103T8Ux chip
+#
+# Generated by System Workbench for STM32
+# Take care that such file, as generated, may be overridden without any early notice. Please have a look to debug launch configuration setup(s)
+
+source [find interface/stlink.cfg] 
+
+set WORKAREASIZE 0x5000
+
+transport select "hla_swd"
+
+set CHIPNAME STM32F103T8Ux
+
+# Enable debug when in low power modes
+set ENABLE_LOW_POWER 1
+
+# Stop Watchdog counters when halt
+set STOP_WATCHDOG 1
+
+# STlink Debug clock frequency
+set CLOCK_FREQ 950
+
+# use software system reset
+reset_config none
+set CONNECT_UNDER_RESET 0
+
+source [find target/stm32f1x.cfg]
--- a/workspace/TS100/build.sh
+++ b/workspace/TS100/build.sh
@@ -33,5 +33,5 @@ make -j16 lang=BR
 rm -rf Objects/src
 make -j16 lang=LT
 rm -rf Objects/src
-make -j16 lang=UK
+make -j16 lang=UA
 rm -rf Objects/src
--- a/workspace/TS100/inc/FRToSI2C.hpp
+++ b/workspace/TS100/inc/FRToSI2C.hpp
@@ -0,0 +1,31 @@
+/*
+ * FRToSI2C.hpp
+ *
+ *  Created on: 14Apr.,2018
+ *      Author: Ralim
+ */
+
+#ifndef FRTOSI2C_HPP_
+#define FRTOSI2C_HPP_
+#include "stm32f1xx_hal.h"
+#include "cmsis_os.h"
+
+class FRToSI2C {
+public:
+	FRToSI2C(I2C_HandleTypeDef* i2chandle);
+	void FRToSInit();
+	void CpltCallback(); //Normal Tx Callback
+
+	void Mem_Read(uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize,
+			uint8_t *pData, uint16_t Size);
+	void Mem_Write(uint16_t DevAddress, uint16_t MemAddress,
+			uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
+
+	void Transmit(uint16_t DevAddress, uint8_t *pData, uint16_t Size);
+
+private:
+	I2C_HandleTypeDef* i2c;
+	SemaphoreHandle_t I2CSemaphore;
+};
+
+#endif /* FRTOSI2C_HPP_ */
--- a/workspace/TS100/inc/Font.h
+++ b/workspace/TS100/inc/Font.h
@@ -490,7 +490,6 @@ const uint8_t ExtraFontChars[] = {
 		0x00,0xF0,0x08,0xEE,0xE2,0xFA,0xFA,0xE2,0xEE,0x08,0xF0,0x00,0x00,0x3F,0x40,0x5F,0x5F,0x5F,0x5F,0x5F,0x5F,0x40,0x3F,0x00, // Battery 10*/

 		0x00,0x00,0x38,0xC4,0x00,0x38,0xC4,0x00,0x38,0xC4,0x00,0x00,0x00,0x38,0x3A,0x39,0x38,0x3A,0x39,0x38,0x3A,0x39,0x10,0x10, // heating
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x10,0x10, // cooling
 		0x00,0x60,0xE0,0xFE,0xE0,0xE0,0xE0,0xE0,0xFE,0xE0,0x60,0x00,0x00,0x00,0x00,0x01,0x03,0xFF,0xFF,0x03,0x01,0x00,0x00,0x00, // AC

 		0xFC,0x02,0x02,0x02,0x02,0x02,0x02,0x82,0x62,0x1A,0x02,0xFC,0x3F,0x40,0x42,0x46,0x4C,0x58,0x46,0x41,0x40,0x40,0x40,0x3F, // ☑ (check box on, menu true)
--- a/workspace/TS100/inc/LIS2DH12.hpp
+++ b/workspace/TS100/inc/LIS2DH12.hpp
@@ -8,10 +8,11 @@
 #ifndef LIS2DH12_HPP_
 #define LIS2DH12_HPP_
 #include "stm32f1xx_hal.h"
+#include "FRToSI2C.hpp"
 #include "LIS2DH12_defines.hpp"
 class LIS2DH12 {
 public:
-	LIS2DH12(I2C_HandleTypeDef* i2cHandle);
+	LIS2DH12(FRToSI2C* i2cHandle);
 	void initalize();
 	uint8_t getOrientation();
 	void getAxisReadings(int16_t *x, int16_t *y, int16_t *z);
@@ -21,7 +22,7 @@ private:

 	void I2C_RegisterWrite(uint8_t reg, uint8_t data);
 	uint8_t I2C_RegisterRead(uint8_t reg);
-	I2C_HandleTypeDef* i2c;
+	FRToSI2C* i2c;
 };

 #endif /* LIS2DH12_HPP_ */
--- a/workspace/TS100/inc/MMA8652FC.hpp
+++ b/workspace/TS100/inc/MMA8652FC.hpp
@@ -9,11 +9,12 @@
 #define MMA8652FC_HPP_
 #include "stm32f1xx_hal.h"
 #include "MMA8652FC_defines.h"
+#include "FRToSI2C.hpp"
 class MMA8652FC {

 public:

-	MMA8652FC(I2C_HandleTypeDef* i2cHandle);
+	MMA8652FC(FRToSI2C* i2cHandle);
 	void initalize();		// Initalize the system
 	uint8_t getOrientation();// Reads the I2C register and returns the orientation (true == left)
 	void getAxisReadings(int16_t *x, int16_t *y, int16_t *z);
@@ -23,7 +24,7 @@ private:

 	void I2C_RegisterWrite(uint8_t reg, uint8_t data);
 	uint8_t I2C_RegisterRead(uint8_t reg);
-	I2C_HandleTypeDef* i2c;
+	FRToSI2C* i2c;

 };

--- a/workspace/TS100/inc/OLED.hpp
+++ b/workspace/TS100/inc/OLED.hpp
@@ -12,6 +12,7 @@
 #include <hardware.h>
 #include "stm32f1xx_hal.h"
 #include <stdbool.h>
+#include "FRToSI2C.hpp"
 #include "Font.h"
 #ifdef __cplusplus
 extern "C" {
@@ -25,17 +26,17 @@ extern "C" {

 class OLED {
 public:
-	OLED(I2C_HandleTypeDef* i2cHandle);	// Initialize Driver and store I2C pointer
+	OLED(FRToSI2C* i2cHandle);	// Initialize Driver and store I2C pointer
 	void initialize(); 	// Startup the I2C coms (brings screen out of reset etc)
 	void refresh(); 	// Draw the buffer out to the LCD using the DMA Channel
-	void drawChar(char c, char preCursorCommand = '\0');// Draw a character to a specific location
+	void drawChar(char c, char preCursorCommand = '\0'); // Draw a character to a specific location
 	void displayOnOff(bool on);				// Turn the screen on or not
 	void setRotation(bool leftHanded);  	// Set the rotation for the screen
 	bool getRotation();					// Get the current rotation of the LCD
 	void print(const char* string);	// Draw a string to the current location, with current font
 	void setCursor(int16_t x, int16_t y);   // Set the cursor location by pixels
 	void setCharCursor(int16_t x, int16_t y); //Set cursor location by chars in current font
-	void setFont(uint8_t fontNumber);// (Future) Set the font that is being used
+	void setFont(uint8_t fontNumber); // (Future) Set the font that is being used
 	void drawImage(const uint8_t* buffer, uint8_t x, uint8_t width);
 	// Draws an image to the buffer, at x offset from top to bottom (fixed height renders)
 	void printNumber(uint16_t number, uint8_t places);
@@ -46,13 +47,17 @@ public:
 	void drawSymbol(uint8_t symbolID);//Used for drawing symbols of a predictable width
 	void drawArea(int16_t x, int8_t y, uint8_t wide, uint8_t height,
 			const uint8_t* ptr);
+	void fillArea(int16_t x, int8_t y, uint8_t wide, uint8_t height,
+			const uint8_t value);
+	void drawFilledRect(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1,bool clear);
+	void drawHeatSymbol(uint8_t state);
 private:

 	//Draw a buffer to the screen buffer

-	I2C_HandleTypeDef* i2c;					//i2c Pointer
+	FRToSI2C* i2c;					//i2c Pointer
 	const uint8_t* currentFont;	// Pointer to the current font used for rendering to the buffer
-	uint8_t screenBuffer[12 + 96 + 96 + 10];    // The data buffer
+	uint8_t screenBuffer[14 + 96 + 96 + 10];    // The data buffer
 	uint8_t* firstStripPtr; // Pointers to the strips to allow for buffer having extra content
 	uint8_t* secondStripPtr;	//Pointers to the strips
 	bool inLeftHandedMode; // Whether the screen is in left or not (used for offsets in GRAM)
--- a/workspace/TS100/inc/Setup.h
+++ b/workspace/TS100/inc/Setup.h
@@ -17,9 +17,10 @@ extern "C" {
 extern ADC_HandleTypeDef hadc1;
 extern DMA_HandleTypeDef hdma_adc1;

+extern DMA_HandleTypeDef hdma_i2c1_rx;
+extern DMA_HandleTypeDef hdma_i2c1_tx;
 extern I2C_HandleTypeDef hi2c1;

-
 extern IWDG_HandleTypeDef hiwdg;

 extern TIM_HandleTypeDef htim2;
--- a/workspace/TS100/inc/main.hpp
+++ b/workspace/TS100/inc/main.hpp
@@ -26,10 +26,17 @@ enum ButtonState {
 ButtonState getButtonState();
 void waitForButtonPressOrTimeout(uint32_t timeout);
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
- void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef* hadc);
+void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef* hadc);
+void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
+
 #ifdef __cplusplus
- }
+}
 #endif
 #endif /* __MAIN_H */
--- a/workspace/TS100/src/FRToSI2C.cpp
+++ b/workspace/TS100/src/FRToSI2C.cpp
@@ -0,0 +1,89 @@
+/*
+ * FRToSI2C.cpp
+ *
+ *  Created on: 14Apr.,2018
+ *      Author: Ralim
+ */
+
+#include "FRToSI2C.hpp"
+
+FRToSI2C::FRToSI2C(I2C_HandleTypeDef* i2chandle) {
+	i2c = i2chandle;
+	I2CSemaphore = NULL;
+}
+
+void FRToSI2C::CpltCallback() {
+	BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+
+	if (I2CSemaphore) {
+		xSemaphoreGiveFromISR(I2CSemaphore, &xHigherPriorityTaskWoken);
+		portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+	}
+
+}
+
+void FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t MemAddress,
+		uint16_t MemAddSize, uint8_t* pData, uint16_t Size) {
+	if (xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED
+			|| I2CSemaphore == NULL) {
+		//no RToS, run blocking code
+		HAL_I2C_Mem_Read(i2c, DevAddress, MemAddress, MemAddSize, pData, Size,
+				5000);
+	} else {
+		//RToS is active, run threading
+		//Get the mutex so we can use the I2C port
+		//Wait up to 1 second for the mutex
+		if ( xSemaphoreTake( I2CSemaphore, ( TickType_t ) 1000 ) == pdTRUE) {
+			HAL_I2C_Mem_Read(i2c, DevAddress, MemAddress, MemAddSize, pData,
+					Size, 5000);
+			xSemaphoreGive(I2CSemaphore);
+
+		}
+
+	}
+
+}
+
+void FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress,
+		uint16_t MemAddSize, uint8_t* pData, uint16_t Size) {
+	if (xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED
+			|| I2CSemaphore == NULL) {
+		//no RToS, run blocking code
+		HAL_I2C_Mem_Write(i2c, DevAddress, MemAddress, MemAddSize, pData, Size,
+				5000);
+	} else {
+		//RToS is active, run threading
+		//Get the mutex so we can use the I2C port
+		//Wait up to 1 second for the mutex
+		if ( xSemaphoreTake( I2CSemaphore, ( TickType_t ) 1000 ) == pdTRUE) {
+			HAL_I2C_Mem_Write(i2c, DevAddress, MemAddress, MemAddSize, pData,
+					Size, 5000);
+			xSemaphoreGive(I2CSemaphore);
+
+		}
+
+	}
+
+}
+
+void FRToSI2C::FRToSInit() {
+	I2CSemaphore = xSemaphoreCreateMutex();
+	xSemaphoreGive(I2CSemaphore);
+}
+
+void FRToSI2C::Transmit(uint16_t DevAddress, uint8_t* pData, uint16_t Size) {
+	if (xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED
+			|| I2CSemaphore == NULL) {
+		//no RToS, run blocking code
+		HAL_I2C_Master_Transmit(i2c, DevAddress, pData, Size, 5000);
+	} else {
+		//RToS is active, run threading
+		//Get the mutex so we can use the I2C port
+		//Wait up to 1 second for the mutex
+		if ( xSemaphoreTake( I2CSemaphore, ( TickType_t ) 1000 ) == pdTRUE) {
+			HAL_I2C_Master_Transmit(i2c, DevAddress, pData, Size, 5000);
+			xSemaphoreGive(I2CSemaphore);
+		}
+	}
+
+}
--- a/workspace/TS100/src/LIS2DH12.cpp
+++ b/workspace/TS100/src/LIS2DH12.cpp
@@ -7,7 +7,7 @@

 #include <LIS2DH12.hpp>
 #include "cmsis_os.h"
-LIS2DH12::LIS2DH12(I2C_HandleTypeDef* i2cHandle) {
+LIS2DH12::LIS2DH12(FRToSI2C* i2cHandle) {
 	i2c = i2cHandle;
 }

@@ -33,9 +33,7 @@ void LIS2DH12::initalize() {
 uint8_t LIS2DH12::getOrientation() {
 	// 8=right handed,4=left,16=flat
 	//So we ignore if not 8/4
-	taskENTER_CRITICAL();
 	uint8_t pos = I2C_RegisterRead(LIS_INT2_SRC);
-	taskEXIT_CRITICAL();
 	if (pos == 8)
 		return 1;
 	else if (pos == 4)
@@ -46,12 +44,9 @@ uint8_t LIS2DH12::getOrientation() {

 void LIS2DH12::getAxisReadings(int16_t* x, int16_t* y, int16_t* z) {
 	uint8_t tempArr[6];
-	taskENTER_CRITICAL();
-	while (HAL_I2C_Mem_Read(i2c, LIS2DH_I2C_ADDRESS, 0xA8,
-	I2C_MEMADD_SIZE_8BIT, (uint8_t*) tempArr, 6, 5000) != HAL_OK) {
-		HAL_Delay(5);
-	}
-	taskEXIT_CRITICAL();
+	i2c->Mem_Read(LIS2DH_I2C_ADDRESS, 0xA8, I2C_MEMADD_SIZE_8BIT,
+			(uint8_t*) tempArr, 6);
+
 	(*x) = ((uint16_t) (tempArr[1] << 8 | tempArr[0]));
 	(*y) = ((uint16_t) (tempArr[3] << 8 | tempArr[2]));
 	(*z) = ((uint16_t) (tempArr[5] << 8 | tempArr[4]));
@@ -61,13 +56,12 @@ void LIS2DH12::setSensitivity(uint8_t threshold, uint8_t filterTime) {
 }

 void LIS2DH12::I2C_RegisterWrite(uint8_t reg, uint8_t data) {
-	HAL_I2C_Mem_Write(i2c, LIS2DH_I2C_ADDRESS, reg, I2C_MEMADD_SIZE_8BIT, &data,
-			1, 500);
+	i2c->Mem_Write(LIS2DH_I2C_ADDRESS, reg, I2C_MEMADD_SIZE_8BIT, &data, 1);
+
 }

 uint8_t LIS2DH12::I2C_RegisterRead(uint8_t reg) {
 	uint8_t tx_data[1];
-	HAL_I2C_Mem_Read(i2c, LIS2DH_I2C_ADDRESS, reg, I2C_MEMADD_SIZE_8BIT,
-			tx_data, 1, 500);
+	i2c->Mem_Read( LIS2DH_I2C_ADDRESS, reg, I2C_MEMADD_SIZE_8BIT, tx_data, 1);
 	return tx_data[0];
 }
--- a/workspace/TS100/src/MMA8652FC.cpp
+++ b/workspace/TS100/src/MMA8652FC.cpp
@@ -8,20 +8,18 @@
 #include <MMA8652FC.hpp>
 #include "cmsis_os.h"

-MMA8652FC::MMA8652FC(I2C_HandleTypeDef* i2cHandle) {
+MMA8652FC::MMA8652FC(FRToSI2C* i2cHandle) {
 	i2c = i2cHandle;
 }

 void MMA8652FC::I2C_RegisterWrite(uint8_t reg, uint8_t data) {
-
-	HAL_I2C_Mem_Write(i2c, MMA8652FC_I2C_ADDRESS, reg, I2C_MEMADD_SIZE_8BIT,
-			&data, 1, 500);
+	i2c->Mem_Write( MMA8652FC_I2C_ADDRESS, reg, I2C_MEMADD_SIZE_8BIT, &data, 1);
 }

 uint8_t MMA8652FC::I2C_RegisterRead(uint8_t reg) {
 	uint8_t tx_data[1];
-	HAL_I2C_Mem_Read(i2c, MMA8652FC_I2C_ADDRESS, reg, I2C_MEMADD_SIZE_8BIT,
-			tx_data, 1, 500);
+	i2c->Mem_Read( MMA8652FC_I2C_ADDRESS, reg, I2C_MEMADD_SIZE_8BIT, tx_data,
+			1);

 	return tx_data[0];
 }
@@ -43,44 +41,35 @@ void MMA8652FC::initalize() {
 	I2C_RegisterWrite( HP_FILTER_CUTOFF_REG, 0x03); //select high pass filtered data

 	I2C_RegisterWrite( CTRL_REG1, 0x19);		// ODR=12 Hz, Active mode
-	HAL_Delay(2);		// ~1ms delay

 }

 void MMA8652FC::setSensitivity(uint8_t threshold, uint8_t filterTime) {
 	uint8_t sens = 9 * 2 + 17;
 	sens -= 2 * threshold;
-	taskENTER_CRITICAL();
 	I2C_RegisterWrite( CTRL_REG1, 0);		//  sleep mode
 	I2C_RegisterWrite(FF_MT_THS_REG, (sens & 0x7F));// Set accumulation threshold
 	I2C_RegisterWrite(FF_MT_COUNT_REG, filterTime);    // Set debounce threshold
 	I2C_RegisterWrite( CTRL_REG1, 0x31);		// ODR=12 Hz, Active mode
-	taskEXIT_CRITICAL();
 }

 uint8_t MMA8652FC::getOrientation() {
 	//First read the PL_STATUS register
-	taskENTER_CRITICAL();
 	uint8_t plStatus = I2C_RegisterRead(PL_STATUS_REG);
-	taskEXIT_CRITICAL();
 	if ((plStatus & 0b10000000) == 0b10000000) {
 		plStatus >>= 1;    //We don't need the up/down bit
 		plStatus &= 0x03;    //mask to the two lower bits
 		//0 == left handed
 		//1 == right handed

-		return plStatus==0?2:1;
+		return plStatus == 0 ? 2 : 1;
 	} else
 		return 0;
 }
 void MMA8652FC::getAxisReadings(int16_t *x, int16_t *y, int16_t *z) {
 	uint8_t tempArr[6];
-	taskENTER_CRITICAL();
-	while (HAL_I2C_Mem_Read(i2c, MMA8652FC_I2C_ADDRESS, OUT_X_MSB_REG,
-	I2C_MEMADD_SIZE_8BIT, (uint8_t*) tempArr, 6, 0xFFFF) != HAL_OK) {
-		HAL_Delay(5);
-	}
-	taskEXIT_CRITICAL();
+	i2c->Mem_Read( MMA8652FC_I2C_ADDRESS, OUT_X_MSB_REG,I2C_MEMADD_SIZE_8BIT, (uint8_t*) tempArr, 6);
+
 	(*x) = tempArr[0] << 8 | tempArr[1];
 	(*y) = tempArr[2] << 8 | tempArr[3];
 	(*z) = tempArr[4] << 8 | tempArr[5];
--- a/workspace/TS100/src/OLED.cpp
+++ b/workspace/TS100/src/OLED.cpp
@@ -43,14 +43,14 @@ uint8_t OLED_Setup_Array[] = { /**/
 };
 //Setup based on the SSD1307 and modified for the SSD1306

-OLED::OLED(I2C_HandleTypeDef* i2cHandle) {
+OLED::OLED(FRToSI2C* i2cHandle) {
 	i2c = i2cHandle;
 	cursor_x = cursor_y = 0;
 	currentFont = FONT_12;
 	fontWidth = 12;
 	inLeftHandedMode = false;
-	firstStripPtr = &screenBuffer[13];
-	secondStripPtr = &screenBuffer[13 + 96];
+	firstStripPtr = &screenBuffer[15];
+	secondStripPtr = &screenBuffer[15 + 96];
 	fontHeight = 16;
 	fontWidth = 12;
 	displayOffset = 0;
@@ -60,11 +60,11 @@ OLED::OLED(I2C_HandleTypeDef* i2cHandle) {

 void OLED::initialize() {
 	HAL_Delay(5);
+
 	HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_SET);
 	HAL_Delay(5);
 	//Send the setup settings
-	HAL_I2C_Master_Transmit(i2c, DEVICEADDR_OLED, (uint8_t*) OLED_Setup_Array,
-			configLength, 0xFFFF);
+	i2c->Transmit( DEVICEADDR_OLED, (uint8_t*) OLED_Setup_Array, configLength);
 	//displayOnOff(true);

 }
@@ -77,21 +77,17 @@ void OLED::refresh() {
 	screenBuffer[3] = inLeftHandedMode ? 0 : 32; //display is shifted by 32 in left handed mode as driver ram is 128 wide
 	screenBuffer[4] = 0x80;
 	screenBuffer[5] = inLeftHandedMode ? 95 : 0x7F; //End address of the ram segment we are writing to (96 wide)
-
-	screenBuffer[6] = 0x80;    //Set pages to rollover after 2
-	screenBuffer[7] = 0x22;
-	screenBuffer[8] = 0x80;
-	screenBuffer[9] = 0x00;    //start page 0
+	screenBuffer[6] = 0x80; /*Set COM Scan direction*/
+	screenBuffer[7] = inLeftHandedMode ? 0xC8 : 0xC0;
+	screenBuffer[8] = 0x80;    //Set pages to rollover after 2
+	screenBuffer[9] = 0x22;
 	screenBuffer[10] = 0x80;
-	screenBuffer[11] = 0x01;
+	screenBuffer[11] = 0x00;    //start page 0
+	screenBuffer[12] = 0x80;
+	screenBuffer[13] = 0x01;
+	screenBuffer[14] = 0x40;    //start of data marker

-	screenBuffer[12] = 0x40;    //start of data marker
-	taskENTER_CRITICAL();
-	//Because I2C is shared, we cant task switch in the middle of the xfer
-
-	HAL_I2C_Master_Transmit(i2c, DEVICEADDR_OLED, screenBuffer, 12 + 96 * 2 + 1,
-			500);
-	taskEXIT_CRITICAL();
+	i2c->Transmit( DEVICEADDR_OLED, screenBuffer, 14 + 96 * 2 + 1);

 }

@@ -101,10 +97,9 @@ void OLED::refresh() {
 * Precursor is the command char that is used to select the table.
 */
 void OLED::drawChar(char c, char PrecursorCommand) {
-	if( c=='\n' && cursor_y==0)
-	{
-		cursor_x=0;
-		cursor_y=8;
+	if (c == '\n' && cursor_y == 0) {
+		cursor_x = 0;
+		cursor_y = 8;
 	}
 	if (c < ' ') {
 		return;
@@ -128,10 +123,10 @@ void OLED::drawChar(char c, char PrecursorCommand) {
 			index = (128) + (c);
 			break;
 #if defined(LANG_RU) || defined(LANG_UK) || defined(LANG_SR) || defined(LANG_BG) || defined(LANG_MK)
-		case 0xD0:
+			case 0xD0:
 			index = (192) + (c);
 			break;
-		case 0xD1:
+			case 0xD1:
 			index = (256) + (c);
 			break;
 #else
@@ -164,10 +159,7 @@ void OLED::displayOnOff(bool on) {
 			data[3] = 0x10;
 			data[5] = 0xAE;
 		}
-		taskENTER_CRITICAL();
-
-		HAL_I2C_Master_Transmit(i2c, DEVICEADDR_OLED, data, 6, 0xFFFF);
-		taskEXIT_CRITICAL();
+		i2c->Transmit( DEVICEADDR_OLED, data, 6);
 		displayOnOffState = on;
 	}
 }
@@ -182,11 +174,7 @@ void OLED::setRotation(bool leftHanded) {
 			OLED_Setup_Array[11] = 0xC0;
 			OLED_Setup_Array[19] = 0xA0;
 		}
-		taskENTER_CRITICAL();
-
-		HAL_I2C_Master_Transmit(i2c, DEVICEADDR_OLED,
-				(uint8_t*) OLED_Setup_Array, 50, 0xFFFF);
-		taskEXIT_CRITICAL();
+		i2c->Transmit( DEVICEADDR_OLED, (uint8_t*) OLED_Setup_Array, 50);
 		inLeftHandedMode = leftHanded;
 	}
 }
@@ -278,7 +266,7 @@ void OLED::drawBattery(uint8_t state) {
 	drawSymbol(3 + state);
 }
 void OLED::drawCheckbox(bool state) {
-	drawSymbol((state) ? 17 : 18);
+	drawSymbol((state) ? 16 : 17);
 }
 void OLED::drawSymbol(uint8_t symbolID) {
 	//draw a symbol to the current cursor location
@@ -300,11 +288,11 @@ void OLED::drawArea(int16_t x, int8_t y, uint8_t wide, uint8_t height,
 	uint8_t visibleEnd = wide;

 	// trimming to draw partials
-	if(x < 0) {
-	  visibleStart -= x;  //subtract negative value == add absolute value
+	if (x < 0) {
+		visibleStart -= x;  //subtract negative value == add absolute value
 	}
-	if(x + wide > 96) {
-	  visibleEnd = 96 - x;
+	if (x + wide > 96) {
+		visibleEnd = 96 - x;
 	}

 	if (y == 0) {
@@ -320,3 +308,81 @@ void OLED::drawArea(int16_t x, int8_t y, uint8_t wide, uint8_t height,
 		}
 	}
 }
+void OLED::fillArea(int16_t x, int8_t y, uint8_t wide, uint8_t height,
+		const uint8_t value) {
+	// Splat this from x->x+wide in two strides
+	if (x <= -wide)
+		return;    //cutoffleft
+	if (x > 96)
+		return;    //cutoff right
+
+	uint8_t visibleStart = 0;
+	uint8_t visibleEnd = wide;
+
+	// trimming to draw partials
+	if (x < 0) {
+		visibleStart -= x;  //subtract negative value == add absolute value
+	}
+	if (x + wide > 96) {
+		visibleEnd = 96 - x;
+	}
+
+	if (y == 0) {
+		//Splat first line of data
+		for (uint8_t xx = visibleStart; xx < visibleEnd; xx++) {
+			firstStripPtr[xx + x] = value;
+		}
+	}
+	if (y == 8 || height == 16) {
+		// Splat the second line
+		for (uint8_t xx = visibleStart; xx < visibleEnd; xx++) {
+			secondStripPtr[x + xx] = value;
+		}
+	}
+}
+
+void OLED::drawFilledRect(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1,
+		bool clear) {
+	//Draw this in 3 sections
+	//This is basically a N wide version of vertical line
+
+	//Step 1 : Draw in the top few pixels that are not /8 aligned
+	//LSB is at the top of the screen
+	uint8_t mask = 0xFF;
+	if (y0) {
+		mask = mask << (y0 % 8);
+		for (uint8_t col = x0; col < x1; col++)
+			if (clear)
+				firstStripPtr[(y0 / 8) * 96 + col] &= ~mask;
+			else
+				firstStripPtr[(y0 / 8) * 96 + col] |= mask;
+	}
+	//Next loop down the line the total number of solids
+	if (y0 / 8 != y1 / 8)
+		for (uint8_t col = x0; col < x1; col++)
+			for (uint8_t r = (y0 / 8); r < (y1 / 8); r++) {
+				//This gives us the row index r
+				if (clear)
+					firstStripPtr[(r * 96) + col] = 0;
+				else
+					firstStripPtr[(r * 96) + col] = 0xFF;
+			}
+
+	//Finally draw the tail
+	mask = ~(mask << (y1 % 8));
+	for (uint8_t col = x0; col < x1; col++)
+		if (clear)
+			firstStripPtr[(y1 / 8) * 96 + col] &= ~mask;
+		else
+			firstStripPtr[(y1 / 8) * 96 + col] |= mask;
+}
+
+void OLED::drawHeatSymbol(uint8_t state) {
+	//Draw symbol 14
+//Then draw over it botom 5 pixels always stay. 8 pixels above that are the levels
+	state /= 12; // 0-> 8 range
+	//Then we want to draw down (16-(5+state)
+	uint8_t cursor_x_temp = cursor_x;
+	drawSymbol(14);
+	drawFilledRect(cursor_x_temp, 0, cursor_x_temp + 12, 2 + (8 - state), true);
+}
--- a/workspace/TS100/src/Setup.c
+++ b/workspace/TS100/src/Setup.c
@@ -9,6 +9,8 @@ ADC_HandleTypeDef hadc1;
 DMA_HandleTypeDef hdma_adc1;

 I2C_HandleTypeDef hi2c1;
+DMA_HandleTypeDef hdma_i2c1_rx;
+DMA_HandleTypeDef hdma_i2c1_tx;

 IWDG_HandleTypeDef hiwdg;
 TIM_HandleTypeDef htim2;
@@ -75,7 +77,7 @@ void SystemClock_Config(void) {
 	RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
 	RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
 	RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV16; //TIM 2,3,4,5,6,7,12,13,14
-	RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; //64 mhz to soem peripherals and adc
+	RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; //64 mhz to some peripherals and adc

 	HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2);

--- a/workspace/TS100/src/Translation.cpp
+++ b/workspace/TS100/src/Translation.cpp
@@ -396,22 +396,22 @@ const char* SettingsDescriptions[17] = {
  // These are all the help text for all the settings.
  // No requirements on spacing or length.
  /* Power source (DC or batt)          */ "Käytettävä virtalähde. Asettaa katkaisujänniteen. <DC 10V, 3S=9.9V, 4S=13.2V, 5S=16.5V, 6S=19.8V>",
-  /* Sleep temperature                  */ "Lepotilan lämpötila <C>", //"Lepolämpötila <C>",
-  /* Sleep timeout                      */ "Lepotilan viive <minuuttia/sekuntia>",//"Lepoviive <minuuttia/sekuntia>",
-  /* Shutdown timeout                   */ "Sammutuksen aikaviive <minuuttia>",
-  /* Motion sensitivity level           */ "Liikkeentunnistuksen herkkyys <0=pois, 1=epäherkin, 9=herkin>", //"Liikeherkkyys <0=pois, 1=epäherkin, 9=herkin>",
-  /* Temperature in F and C             */ "Lämpötilan yksikkö <C=celsius, F=fahrenheit>",
-  /* Advanced idle display mode enabled */ "Näytä yksityiskohtaiset tiedot lepotilassa", //"Näyttää tarkemmat tiedot leponäytössä",
-  /* Display rotation mode              */ "Näytön kierto <A=automaattinen O=oikeakätinen V=vasenkätinen>", //"Näytön suunta <A=automaattinen O=oikeakätinen V=vasenkätinen>",
-  /* Boost enabled                      */ "Etupainikeella siirrytään juotettaessa tehostustilaan ",
-  /* Boost temperature                  */ "Tehostustilan lämpötila", //"Tehostuksen lämpötila kun käytetään tehostustilaa",
-  /* Automatic start mode               */ "Aloittaa lämmityksen automaattisesti kun virrat kytketään. T=juotostila, S=Lepotila, F=Ei käytössä", //"Lämmitys käynnistyy automaattisesti kun virrat kytketään. T=juottamiseen, S=lepotilaan, F=ei käytössä",
-  /* Cooldown blink                     */ "Vilkutetaan näytössä lämpötilaa kun juotoskärki jäähtyy, mutta on yhä kuuma",
-  /* Temperature calibration enter menu */ "Kalibroi kärjen lämpötilaero", //"Kalibroidaan juotoskärjen lämpötilaero",
-  /* Settings reset command             */ "Palauta kaikki asetukset oletusarvoihin" //"Palautetaan kaikki asetukset alkuperäisiksi",
-  /* Calibrate input voltage            */ "Tulojännitten kalibrointi (VIN). Painikkeilla säädetään ja pitkään painamalla poistutaan",
-  /* Advanced soldering screen enabled  */ "Näytä yksityiskohtaiset tiedot juotostilassa", //"Näytetään tarkemmat tiedot juottamisen aikana",
-  /* Description Scroll Speed           */ "Näiden ohjetekstien vieritysnopeus" ,//"Tekstin vieritysnopeus näytöllä",
+  /* Sleep temperature                  */ "Lepotilan lämpötila. <C>", //"Lepolämpötila <C>",
+  /* Sleep timeout                      */ "Lepotilan viive. <minuuttia/sekuntia>",//"Lepoviive <minuuttia/sekuntia>",
+  /* Shutdown timeout                   */ "Automaattisen sammutuksen aikaviive. <minuuttia>",
+  /* Motion sensitivity level           */ "Liikkeentunnistuksen herkkyys. <0=pois, 1=epäherkin, 9=herkin>", //"Liikeherkkyys <0=pois, 1=epäherkin, 9=herkin>",
+  /* Temperature in F and C             */ "Lämpötilan yksikkö. <C=celsius, F=fahrenheit>",
+  /* Advanced idle display mode enabled */ "Näyttää yksityiskohtaisemmat tiedot lepotilassa.", //"Näyttää tarkemmat tiedot leponäytössä",
+  /* Display rotation mode              */ "Näytön kierto. <A=automaattinen O=oikeakätinen V=vasenkätinen>", //"Näytön suunta <A=automaattinen O=oikeakätinen V=vasenkätinen>",
+  /* Boost enabled                      */ "Etupainikeella siirrytään juotettaessa tehostustilaan.",
+  /* Boost temperature                  */ "Tehostustilan lämpötila.", //"Tehostuksen lämpötila kun käytetään tehostustilaa",
+  /* Automatic start mode               */ "Käynnistää virrat kytkettäessä juotostilan automaattisesti. T=juotostila, S=Lepotila, F=Ei käytössä", //"Lämmitys käynnistyy automaattisesti kun virrat kytketään. T=juottamiseen, S=lepotilaan, F=ei käytössä",
+  /* Cooldown blink                     */ "Vilkuttaa jäähtyessä juotoskärjen lämpötilaa sen ollessa vielä vaarallisen kuuma.",//"Vilkutetaan näytössä lämpötilaa kun juotoskärki jäähtyy, mutta on yhä kuuma",
+  /* Temperature calibration enter menu */ "Kalibroi kärjen lämpötilaeron.", //"Kalibroidaan juotoskärjen lämpötilaero",
+  /* Settings reset command             */ "Palauta kaikki asetukset oletusarvoihin.", //"Palautetaan kaikki asetukset alkuperäisiksi",
+  /* Calibrate input voltage            */ "Tulojännitten kalibrointi (VIN). Painikkeilla säädetään ja pitkään painamalla poistutaan.",
+  /* Advanced soldering screen enabled  */ "Näyttää yksityiskohtaisemmat tiedot juotostilassa.", //"Näytetään tarkemmat tiedot juottamisen aikana",
+  /* Description Scroll Speed           */ "Näiden selitetekstien vieritysnopeus." ,//"Tekstin vieritysnopeus näytöllä",
 };

 const char* SettingsCalibrationWarning = "Varmista että kärki on huoneenlämpöinen ennen jatkamista!"; //"Älä jatka ennen kuin kärki on jäähtynyt!";
@@ -444,20 +444,21 @@ const char* SettingsShortNames[17][2] = {
  /* (<= 11) Power source (DC or batt)          */ {"Virtalähde", "DC"},
  /* (<=  9) Sleep temperature                  */ {"Lepotilan", "lämpötila"},
  /* (<=  9) Sleep timeout                      */ {"Lepotilan", "viive"},
-  /* (<= 10) Shutdown timeout                   */ {"Sammutuksen", "viive"}, // Too long
+  /* (<= 10) Shutdown timeout                   */ {"Sammutus", "viive"},
  /* (<= 13) Motion sensitivity level           */ {"Liikkeen", "herkkyys"},
  /* (<= 13) Temperature in F and C             */ {"Lämpötilan", "yksikkö"},
-  /* (<= 13) Advanced idle display mode enabled */ {"Tarkemmat tiedot", "lepotilassa"}, // Too long
-  /* (<= 13) Display rotation mode              */ {"Näytön", "esityssuunta"},
+  /* (<= 13) Advanced idle display mode enabled */ {"Tiedot", "lepotilassa"},
+  /* (<= 13) Display rotation mode              */ {"Näytön", "kierto"},
  /* (<= 13) Boost enabled                      */ {"Tehostus", "käytössä"},
-  /* (<=  9) Boost temperature                  */ {"Tehostus", "lämpötila"},
-  /* (<= 13) Automatic start mode               */ {"Automattinen", "käynnistyminen"}, // Too long
+  /* (<=  9) Boost temperature                  */ {"Tehostus-", "lämpötila"},
+  /* (<= 13) Automatic start mode               */ {"Autom.", "käynnistys"},
+
  /* (<= 13) Cooldown blink                     */ {"Jäähdytyksen", "vilkutus"},
-  /* (<= 16) Temperature calibration enter menu */ {"Kalibroidaanko", "lämpötila?"},
-  /* (<= 16) Settings reset command             */ {"Palautetaanko", "tehdasasetukset?"},
-  /* (<= 16) Calibrate input voltage            */ {"Kalibroidaanko", "tulojännite?"},
-  /* (<= 13) Advanced soldering screen enabled  */ {"Monipuolisempi", "juotosnäyttö"}, // Too long
-  /* (<= 11) Display Help Text Scroll Speed     */ {"Selitteiden","näyttönopeus"}, // Too long
+  /* (<= 16) Temperature calibration enter menu */ {"Kalibroi", "lämpötila?"},
+  /* (<= 16) Settings reset command             */ {"Palauta", "tehdasasetukset?"},
+  /* (<= 16) Calibrate input voltage            */ {"Kalibroi", "tulojännite?"},
+  /* (<= 13) Advanced soldering screen enabled  */ {"Tarkempi", "juotosnäyttö"},
+  /* (<= 11) Display Help Text Scroll Speed     */ {"Tietojen","näyttönopeus"},
 };

 // SettingsMenuEntries lengths <= 13 per line (\n starts second line)
@@ -465,7 +466,7 @@ const char* SettingsMenuEntries[4] = {
  /* Soldering Menu    */ "Juotos-\nasetukset" ,//"Juotos\nasetukset",
  /* Power Saving Menu */ "Lepotilan\nasetukset", // "Lepo\ntila",
  /* UI Menu           */ "Käyttö-\nliittymä", //"Käyttö\nliittymä",
-  /* Advanced Menu     */ "Lisäasetukset", // "Lisä\nasetukset",
+  /* Advanced Menu     */ "Lisä-\nasetukset", // "Lisä\nasetukset",
 };

 const char* SettingsMenuEntriesDescriptions[4] = {
@@ -1454,7 +1455,7 @@ const char* SettingsMenuEntriesDescriptions[4] ={
 };
 #endif

-#ifdef LANG_UK
+#ifdef LANG_UA
 const char* SettingsDescriptions[17] = {
 	// These are all the help text for all the settings.
 	// No requirements on spacing or length.
--- a/workspace/TS100/src/main.cpp
+++ b/workspace/TS100/src/main.cpp
@@ -10,12 +10,14 @@
 #include "string.h"
 #include "LIS2DH12.hpp"
 #include <gui.hpp>
+#include "FRToSI2C.hpp"

 #define ACCELDEBUG 0
 // C++ objects
-OLED lcd(&hi2c1);
-MMA8652FC accel(&hi2c1);
-LIS2DH12 accel2(&hi2c1);
+FRToSI2C i2cDev(&hi2c1);
+OLED lcd(&i2cDev);
+MMA8652FC accel(&i2cDev);
+LIS2DH12 accel2(&i2cDev);
 uint8_t PCBVersion = 0;
 // File local variables
 uint16_t currentlyActiveTemperatureTarget = 0;
@@ -42,6 +44,7 @@ int main(void) {
 	 */
 	HAL_Init();
 	Setup_HAL();  // Setup all the HAL objects
+	HAL_IWDG_Refresh(&hiwdg);
 	setTipPWM(0);
 	lcd.initialize();   // start up the LCD
 	lcd.setFont(0);     // default to bigger font
@@ -253,7 +256,7 @@ static void gui_drawBatteryIcon() {
 			cellV = 9;
 		lcd.drawBattery(cellV + 1);
 	} else
-		lcd.drawSymbol(16);  // Draw the DC Logo
+		lcd.drawSymbol(15);  // Draw the DC Logo
 }
 static void gui_solderingTempAdjust() {
 	uint32_t lastChange = xTaskGetTickCount();
@@ -568,18 +571,10 @@ static void gui_solderingMode() {
 						lcd.drawChar(' ');

 					// Draw heating/cooling symbols
-					// If tip PWM > 10% then we are 'heating'
-					if (getTipPWM() > 10)
-						lcd.drawSymbol(14);
-					else
-						lcd.drawSymbol(15);
+					lcd.drawHeatSymbol(getTipPWM());
 				} else {
 					// Draw heating/cooling symbols
-					// If tip PWM > 10% then we are 'heating'
-					if (getTipPWM() > 10)
-						lcd.drawSymbol(14);
-					else
-						lcd.drawSymbol(15);
+					lcd.drawHeatSymbol(getTipPWM());
 					// We draw boost arrow if boosting, or else gap temp <-> heat indicator
 					if (boostModeOn)
 						lcd.drawSymbol(2);
@@ -620,6 +615,7 @@ static void gui_solderingMode() {

 		// Undervoltage test
 		if (checkVoltageForExit()) {
+			lastButtonTime = xTaskGetTickCount();
 			return;
 		}

@@ -628,6 +624,7 @@ static void gui_solderingMode() {
 			if (xTaskGetTickCount() - lastMovementTime > sleepThres
 					&& xTaskGetTickCount() - lastButtonTime > sleepThres) {
 				if (gui_SolderingSleepingMode()) {
+					lastButtonTime = xTaskGetTickCount();
 					return;  // If the function returns non-0 then exit
 				}
 			}
@@ -637,6 +634,7 @@ static void gui_solderingMode() {

 /* StartGUITask function */
 void startGUITask(void const *argument) {
+	i2cDev.FRToSInit();
 	/*
 	 * Main program states:
 	 *
@@ -659,8 +657,10 @@ void startGUITask(void const *argument) {
 	 */

 	uint8_t animationStep = 0;
+
 	uint8_t tempWarningState = 0;
 	bool buttonLockout = false;
+
 	HAL_IWDG_Refresh(&hiwdg);
 	switch (systemSettings.OrientationMode) {
 	case 0:
@@ -704,12 +704,14 @@ void startGUITask(void const *argument) {

 	for (;;) {
 		ButtonState buttons = getButtonState();
+
 		if (tempWarningState == 2)
 			buttons = BUTTON_F_SHORT;
 		if (buttons != BUTTON_NONE && buttonLockout)
 			buttons = BUTTON_NONE;
 		else
 			buttonLockout = false;
+
 		switch (buttons) {
 		case BUTTON_NONE:
 			// Do nothing
@@ -742,7 +744,7 @@ void startGUITask(void const *argument) {
 			lcd.setFont(0);
 			lcd.displayOnOff(true);  // turn lcd on
 			gui_solderingMode();     // enter soldering mode
-			tempWarningState = 0;    // make sure warning can show
+
 			break;
 		case BUTTON_B_SHORT:
 			lcd.setFont(0);
@@ -776,17 +778,7 @@ void startGUITask(void const *argument) {

 		if (tipTemp > 600)
 			tipTemp = 0;
-		if (tipTemp > 50) {
-			if (tempWarningState == 0) {
-				currentlyActiveTemperatureTarget = 0;  // ensure tip is off
-				lcd.displayOnOff(true);                // force LCD on
-				if (gui_showTipTempWarning() == 1) {
-					tempWarningState = 2;  // we can re-enter the warning
-				} else
-					tempWarningState = 1;
-			}
-		} else
-			tempWarningState = 0;
+
 		// Clear the lcd buffer
 		lcd.clearScreen();
 		lcd.setCursor(0, 0);
@@ -819,10 +811,26 @@ void startGUITask(void const *argument) {
 				lcd.setCursor(0, 0);
 				gui_drawBatteryIcon();
 			} else {
-				lcd.drawArea(0, 0, 84, 16, idleScreenBGF); // Needs to be flipped
+				lcd.drawArea(0, 0, 84, 16, idleScreenBGF); // Needs to be flipped so button ends up on right side of screen
 				lcd.setCursor(84, 0);
 				gui_drawBatteryIcon();
 			}
+			if (tipTemp > 50) {
+				//draw temp over the start soldering button
+				//Location changes on screen rotation
+				if (lcd.getRotation()) {
+					// in right handed mode we want to draw over the first part
+					lcd.fillArea(55, 0, 41, 16, 0);	//clear the area for the temp
+					lcd.setCursor(56, 0);
+
+				} else {
+					lcd.fillArea(0, 0, 41, 16, 0);				//clear the area
+					lcd.setCursor(0, 0);
+				}
+				//draw in the temp
+				lcd.setFont(0);				//big font
+				gui_drawTipTemp();				// draw in the temp
+			}
 		}

 		lcd.refresh();
@@ -848,8 +856,7 @@ void startPIDTask(void const *argument) {
 	int32_t integralCount = 0;
 	int32_t derivativeLastValue = 0;
 	int32_t kp, ki, kd;
-	kp = 40;
-	ki = 60;
+	ki = 50;
 	kd = 15;
 	// REMEBER ^^^^ These constants are backwards
 	// They act as dividers, so to 'increase' a P term, you make the number
@@ -857,12 +864,12 @@ void startPIDTask(void const *argument) {
 	if (getInputVoltageX10(systemSettings.voltageDiv) < 150) {
 		//Boot P term if < 15 Volts
 		kp = 30;
-	}
+	} else
+		kp = 42;
 	const int32_t itermMax = 100;
 	pidTaskNotification = xTaskGetCurrentTaskHandle();
-	uint32_t ulNotificationValue;
 	for (;;) {
-		ulNotificationValue = ulTaskNotifyTake( pdTRUE, 100);//Wait a max of 100ms
+		ulTaskNotifyTake( pdTRUE, 50);	//Wait a max of 50ms
 		//This is a call to block this thread until the ADC does its samples
 		uint16_t rawTemp = getTipRawTemp(1);  // get instantaneous reading
 		if (currentlyActiveTemperatureTarget) {
@@ -900,8 +907,8 @@ void startPIDTask(void const *argument) {
 			}

 			/*if (currentlyActiveTemperatureTarget < rawTemp) {
-				output = 0;
-			}*/
+			 output = 0;
+			 }*/
 			setTipPWM(output);
 			derivativeLastValue = rawTemp;  // store for next loop

@@ -1082,3 +1089,23 @@ void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef* hadc) {
 		portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
 	}
 }
+
+void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c) {
+	i2cDev.CpltCallback();
+}
+void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c) {
+	i2cDev.CpltCallback();
+}
+void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c) {
+
+	i2cDev.CpltCallback();
+}
+void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c) {
+	i2cDev.CpltCallback();
+}
+void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c) {
+	i2cDev.CpltCallback();
+}
+void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c) {
+	i2cDev.CpltCallback();
+}
--- a/workspace/TS100/src/stm32f1xx_hal_msp.c
+++ b/workspace/TS100/src/stm32f1xx_hal_msp.c
@@ -28,10 +28,10 @@ void HAL_MspInit(void) {

 	/**NOJTAG: JTAG-DP Disabled and SW-DP Enabled
 	 */
-	__HAL_AFIO_REMAP_SWJ_NOJTAG();
+	__HAL_AFIO_REMAP_SWJ_NOJTAG()
+	;
 //	__HAL_AFIO_REMAP_SWJ_DISABLE(); /*Disable swd for debug io use*/

-
 }

 void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) {
@@ -77,22 +77,51 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) {
 void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) {

 	GPIO_InitTypeDef GPIO_InitStruct;
-	if (hi2c->Instance == I2C1) {
-		/**I2C1 GPIO Configuration
-		 PB6     ------> I2C1_SCL
-		 PB7     ------> I2C1_SDA
-		 */
-		GPIO_InitStruct.Pin = SCL_Pin | SDA_Pin;
-		GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
-		GPIO_InitStruct.Pull = GPIO_PULLUP;
-		GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-		HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+	/**I2C1 GPIO Configuration
+	 PB6     ------> I2C1_SCL
+	 PB7     ------> I2C1_SDA
+	 */
+	GPIO_InitStruct.Pin = SCL_Pin | SDA_Pin;
+	GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
+	GPIO_InitStruct.Pull = GPIO_PULLUP;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+	HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);

-		/* Peripheral clock enable */
-		__HAL_RCC_I2C1_CLK_ENABLE()
-		;
+	/* Peripheral clock enable */
+	__HAL_RCC_I2C1_CLK_ENABLE()
+	;
+	/* I2C1 DMA Init */
+	/* I2C1_RX Init */
+	hdma_i2c1_rx.Instance = DMA1_Channel7;
+	hdma_i2c1_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
+	hdma_i2c1_rx.Init.PeriphInc = DMA_PINC_DISABLE;
+	hdma_i2c1_rx.Init.MemInc = DMA_MINC_ENABLE;
+	hdma_i2c1_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+	hdma_i2c1_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+	hdma_i2c1_rx.Init.Mode = DMA_NORMAL;
+	hdma_i2c1_rx.Init.Priority = DMA_PRIORITY_MEDIUM;
+	HAL_DMA_Init(&hdma_i2c1_rx);

-	}
+	__HAL_LINKDMA(hi2c, hdmarx, hdma_i2c1_rx);
+
+	/* I2C1_TX Init */
+	hdma_i2c1_tx.Instance = DMA1_Channel6;
+	hdma_i2c1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+	hdma_i2c1_tx.Init.PeriphInc = DMA_PINC_DISABLE;
+	hdma_i2c1_tx.Init.MemInc = DMA_MINC_ENABLE;
+	hdma_i2c1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+	hdma_i2c1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+	hdma_i2c1_tx.Init.Mode = DMA_NORMAL;
+	hdma_i2c1_tx.Init.Priority = DMA_PRIORITY_MEDIUM;
+	HAL_DMA_Init(&hdma_i2c1_tx);
+
+	__HAL_LINKDMA(hi2c, hdmatx, hdma_i2c1_tx);
+
+	/* I2C1 interrupt Init */
+	HAL_NVIC_SetPriority(I2C1_EV_IRQn, 5, 0);
+	HAL_NVIC_EnableIRQ(I2C1_EV_IRQn);
+	HAL_NVIC_SetPriority(I2C1_ER_IRQn, 5, 0);
+	HAL_NVIC_EnableIRQ(I2C1_ER_IRQn);

 }

--- a/workspace/TS100/src/stm32f1xx_it.c
+++ b/workspace/TS100/src/stm32f1xx_it.c
@@ -7,6 +7,7 @@

 extern TIM_HandleTypeDef htim1; //used for the systick

+
 /******************************************************************************/
 /*            Cortex-M3 Processor Interruption and Exception Handlers         */
 /******************************************************************************/
@@ -55,6 +56,7 @@ void DMA1_Channel1_IRQHandler(void) {
 	HAL_DMA_IRQHandler(&hdma_adc1);
 }

+
 //ADC interrupt used for DMA
 void ADC1_2_IRQHandler(void) {
 	HAL_ADC_IRQHandler(&hadc1);
@@ -82,5 +84,21 @@ void EXTI3_IRQHandler(void) {
 //EXTI 5 is triggered via the accelerometer on movement
 void EXTI9_5_IRQHandler(void) {
 	HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_5);
-
+}
+
+void I2C1_EV_IRQHandler(void) {
+	HAL_I2C_EV_IRQHandler(&hi2c1);
+}
+void I2C1_ER_IRQHandler(void) {
+	HAL_I2C_ER_IRQHandler(&hi2c1);
+}
+
+void DMA1_Channel6_IRQHandler(void)
+{
+  HAL_DMA_IRQHandler(&hdma_i2c1_tx);
+}
+
+void DMA1_Channel7_IRQHandler(void)
+{
+   HAL_DMA_IRQHandler(&hdma_i2c1_rx);
 }
Author	SHA1	Message	Date
Ben V. Brown	42db57da25	Update power indicator Fixes and closes #211 Final 2.04 release coming up :)	2018-04-27 15:25:58 +10:00
Ben V. Brown	b6351f9696	Add showing the tip temp on idle (#226 ) This shows the tip temp on the simple home screen if the temp is > 50C. This removes the tip temp warning for all users, as now everyone can see the tip temp. #187	2018-04-27 14:46:59 +10:00
Leonid	bf7f1f5062	typo (#272 )	2018-04-20 12:44:07 +10:00
Ben V. Brown	6500eb5eed	FI Updates #267	2018-04-14 18:05:13 +10:00
Ben V. Brown	311d5182eb	Cleanup formatting	2018-04-14 17:58:28 +10:00
Ben V. Brown	88ea45d8c8	Fix OLED leftover task calls	2018-04-14 17:05:26 +10:00
Ben V. Brown	576575d7ba	More FRToS I2C cleanup	2018-04-14 16:33:16 +10:00
Ben V. Brown	7c1937b412	Adding FreeRToS constructs to I2C driver	2018-04-14 15:05:46 +10:00
Ben V. Brown	f599624b6f	I2C into nicer wrapper for FreeRToS	2018-04-14 13:37:42 +10:00
Ben V. Brown	cc09157106	Fix UK -> UA for Ukrainian #261	2018-04-13 17:27:22 +10:00