Add key auto-repeat

Collapsed motion being enabled into the motion sensitivity menu. Fixing
#20
More options for the sensitivity as well.

.gitignore

@@ -37,3 +37,4 @@ workspace/.metadata/*
 
 workspace/ts100/.settings/language.settings.xml
 workspace/ts100/.cproject
+TS100/KiCad/TS100.bak

README.md

@@ -1,6 +1,6 @@
 # TS100
 This is a complete re-write of the open source software for the ts100 soldering iron.
-This project is feature complete for use as a soldering iron, but is still open to ideas and suggestions.
+This project is feature complete for use as a soldering iron, *but is still open to ideas and suggestions.*
 
 This project was started to remove the need for USB for changing system settings.
 In the latest official firmware they have also added a settings menu system, so it is still worth comparing the two firmwares to select your preferred option.
@@ -17,18 +17,18 @@ In the latest official firmware they have also added a settings menu system, so
 * Use hardware features to improve reliability
 * Can disable movement detection if desired
 * Calibration of the temperature offset
+* Boost mode lets you temporarily change the temperature when soldering
 
 # Upgrading your ts100 iron
 This is completely safe, if it goes wrong just put the .hex file from the official website onto the unit and your back to the old firmware. Downloads for the hex files to flash are available on the [releases page.](https://github.com/Ralim/ts100/releases)
-**You will need a windows computer (7,8,10 tested), using the normal windows explorer to load the firmware.
-The bootloader does not appear to work under mac or linux at the moment.**
+Officially the bootloader on the iron only works under windows. However, users have reported that it does work under Mac, and can be made to work under Linux. Details over on the [wiki page](https://github.com/Ralim/ts100/wiki/Upgrading-Firmware).
 
 1. Hold the button closest to the tip, and plug in the USB to the computer.
 2. The unit will appear as a USB drive.
 3. Drag the .hex file onto the USB drive.
 4. The unit will disconnect and reconnect.
-5. The filename will have changed to end in .RDY or .ERR .
-6. If it ends with .RDY your done! Otherwise something went wrong.
+5. The filename will have changed to end in .RDY or .ERR 
+6. If it ends with .RDY you're done! Otherwise something went wrong.
 7. Disconnect the USB and power up the iron. You're good to go.
 
 For the more adventurerous out there, you can also load this firmware onto the device using a SWD programmer.
@@ -49,23 +49,52 @@ Pressing both buttons will also exit the soldering mode.
 This menu allows you to cycle through all the options and set their values.
 The button near the tip cycles through the options, and the one near the usb changes the selected option.
 Note that settings are not saved until you exit the menu, and some settings such as screen flip do not apply until a power cycle is applied.
+If you leave the unit alone (ie don't press any buttons) on a setting, after 3 seconds the screen will scroll a longer version of the name
 
 * UVCO -> Undervoltage cut out level, settable in 1V increments from 10-24V
-* SLTME -> Sleep time, how long it takes before the unit goes to sleep
 * STMP -> The temperature the unit drops to in sleep mode
+* SLTME -> Sleep time, how long it takes before the unit goes to sleep
 * SHTME -> Shutdown Time, how long the unit will wait after movement before shutting down completely
-* MOTION -> Wether motion detection is enabled or not
+* MSENSE -> Motion Sensitivity,0-9,0 means motion sensing is turned off, 9 is most sensitive, 1 is least sensitive (ie takes more movement to trigger)
 * TMPUNIT -> Temperature unit, C or F
+* TMPRND -> Temperature Rounding, {1,5,10}
+* TMPSPD -> How fast the temperature should update in the soldering status screen.
 * FLPDSP -> Flip display for left handed users
-* SENSE -> Motion Sensitivity, H is more sensitive. L is lowest sensitivity (ie takes more movement to trigger)
+* BOOST -> Enable boost mode
+* BTMP -> Set the temperature for the boost mode
 
+Temperature rounding means that the unit will round off the temperature before displaying. This can helpt to reduce the flickering of the temperature when the unit oscillates between two temperatures.
 ## Extras Menu
 This menu defaults to showing the current temperature on the tip. 
 Pressing the button near the iron tip will show the current input voltage. Pressing the other button while this is show will allow you to calibrate the reading if your iron is like mine and is not overly accurate out of the factory. (Press buttons to change measurement up and down, press both to exit and save). 
 
 Pressing the button near the usb enters the temperature offset setting menu, when the iron is cold, pressing the other button will start the unit calibrating for any offset in the tip temperature.
+## Boost mode
+This allows you to change the front key (one near the tip) to become a boost button instead of going to temperature editing when in soldering mode. This allows you to set this button to change the soldering temperature for short periods. For example when soldering a big joint and you want to boost the temperature a bit.
 
+The boost temperature is set in the settings menu.
 # Version Changes:
+V1.12
+- Increases sensitivity options to be 1-9 with 0 off state
+- Fixes issue where going from COOL -> soldering can leave screen off.
+
+V1.11
+- Boost mode
+- Change sensitivity options to be 1-8
+
+V1.10
+- Adds help text to settings
+- Improves settings for the display update rate
+
+V1.09
+- Adds display modes, for slowing down or simplifying the display
+
+V1.08
+- Fix settings menu not showing flip display
+
+V1.07
+- Adds shutdown time to automatically shutdown the iron after inactivity
+
 V1.06
 - Changes H and C when the iron is heating to the minidso chevron like images
 
@@ -86,3 +115,5 @@ V1.03
 V1.02
 - Adds hold both buttons on IDLE to access the therometer mode.
 - Changes the exit soldering mode to be holding both buttons (Like original firmware).
+
+If you _really_ loved this firmware and want to continue my caffine addiction, you can do so here (or email me) : https://paypal.me/RalimTek

TS100/KiCad/MCU_SubBoard.sch

@@ -0,0 +1,392 @@
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:stm32
+LIBS:mma8652fc
+LIBS:switches
+LIBS:TS100-cache
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 2 2
+Title "TS100 Soldering Iron Schematic"
+Date ""
+Rev "2.46"
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 "Converted by Ben V. Brown"
+Comment4 "KiCad port of published schematic"
+$EndDescr
+$Comp
+L STM32F103T8Ux U4
+U 1 1 591D59BB
+P 5600 3550
+F 0 "U4" H 3200 4675 50  0000 L BNN
+F 1 "STM32F103T8Ux" H 8000 4675 50  0000 R BNN
+F 2 "Housings_DFN_QFN:QFN-36-1EP_6x6mm_Pitch0.5mm" H 8000 4625 50  0001 R TNN
+F 3 "" H 5600 3550 50  0001 C CNN
+F 4 "-" H 5600 3550 60  0001 C CNN "bom_partno"
+	1    5600 3550
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR206
+U 1 1 591D5AD3
+P 5600 4850
+F 0 "#PWR206" H 5600 4600 50  0001 C CNN
+F 1 "GND" H 5600 4700 50  0000 C CNN
+F 2 "" H 5600 4850 50  0001 C CNN
+F 3 "" H 5600 4850 50  0001 C CNN
+	1    5600 4850
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C30
+U 1 1 591D5BA8
+P 1450 4700
+F 0 "C30" H 1475 4800 50  0000 L CNN
+F 1 "103" H 1475 4600 50  0000 L CNN
+F 2 "" H 1488 4550 50  0001 C CNN
+F 3 "" H 1450 4700 50  0001 C CNN
+	1    1450 4700
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R23
+U 1 1 591D5BDF
+P 1700 4700
+F 0 "R23" V 1780 4700 50  0000 C CNN
+F 1 "15K" V 1700 4700 50  0000 C CNN
+F 2 "" V 1630 4700 50  0001 C CNN
+F 3 "" H 1700 4700 50  0001 C CNN
+	1    1700 4700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5800 4850 5800 4650
+Wire Wire Line
+	5600 4850 5600 4650
+Wire Wire Line
+	5700 4650 5700 4850
+Connection ~ 5700 4850
+Wire Wire Line
+	5500 4850 5500 4650
+Connection ~ 5600 4850
+Wire Wire Line
+	5400 4850 5400 4650
+Connection ~ 5500 4850
+Wire Wire Line
+	3100 2950 1350 2950
+Wire Wire Line
+	1350 2950 1350 4850
+Connection ~ 5400 4850
+Wire Wire Line
+	1450 4550 1450 3550
+Wire Wire Line
+	1450 3550 3100 3550
+Wire Wire Line
+	1350 4850 9000 4850
+Connection ~ 1450 4850
+Text HLabel 8100 4050 2    60   Input ~ 0
+SWDIO
+Text HLabel 8100 4150 2    60   Input ~ 0
+SWCLK
+Text HLabel 8100 3850 2    60   Input ~ 0
+USB_D-
+Text HLabel 8100 3950 2    60   Input ~ 0
+USB_D+
+Wire Wire Line
+	1700 4550 1700 3750
+Wire Wire Line
+	1700 3750 3100 3750
+Connection ~ 1700 4850
+Text HLabel 8100 3650 2    60   Input ~ 0
+K1
+Text HLabel 8100 3550 2    60   Input ~ 0
+nCR
+Text HLabel 9000 3450 2    60   Input ~ 0
+TMP36
+Wire Wire Line
+	5400 2350 5700 2350
+Connection ~ 5500 2350
+Connection ~ 5600 2350
+$Comp
+L VDD #PWR205
+U 1 1 591D5F85
+P 5550 2350
+F 0 "#PWR205" H 5550 2200 50  0001 C CNN
+F 1 "VDD" H 5550 2500 50  0000 C CNN
+F 2 "" H 5550 2350 50  0001 C CNN
+F 3 "" H 5550 2350 50  0001 C CNN
+	1    5550 2350
+	1    0    0    -1  
+$EndComp
+Connection ~ 5550 2350
+Text HLabel 8100 3350 2    60   Input ~ 0
+K2
+$Comp
+L C C29
+U 1 1 591D61F5
+P 9000 4700
+F 0 "C29" H 9025 4800 50  0000 L CNN
+F 1 "103" H 9025 4600 50  0000 L CNN
+F 2 "" H 9038 4550 50  0001 C CNN
+F 3 "" H 9000 4700 50  0001 C CNN
+	1    9000 4700
+	1    0    0    -1  
+$EndComp
+Connection ~ 5800 4850
+Wire Wire Line
+	9000 4550 9000 3450
+Wire Wire Line
+	9000 3450 8100 3450
+Text HLabel 3100 4150 0    60   Input ~ 0
+SCL
+Text HLabel 3100 4250 0    60   Input ~ 0
+SDA
+Text HLabel 3100 3950 0    60   Input ~ 0
+Po
+Text HLabel 3100 3650 0    60   Input ~ 0
+Vb
+$Comp
+L R R25
+U 1 1 591D65E3
+P 1950 2600
+F 0 "R25" V 2030 2600 50  0000 C CNN
+F 1 "15K" V 1950 2600 50  0000 C CNN
+F 2 "" V 1880 2600 50  0001 C CNN
+F 3 "" H 1950 2600 50  0001 C CNN
+	1    1950 2600
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C17
+U 1 1 591D663E
+P 1950 4700
+F 0 "C17" H 1975 4800 50  0000 L CNN
+F 1 "105" H 1975 4600 50  0000 L CNN
+F 2 "" H 1988 4550 50  0001 C CNN
+F 3 "" H 1950 4700 50  0001 C CNN
+	1    1950 4700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1950 4550 1950 2750
+Wire Wire Line
+	1950 2750 3100 2750
+$Comp
+L VDD #PWR201
+U 1 1 591D66BF
+P 1950 2450
+F 0 "#PWR201" H 1950 2300 50  0001 C CNN
+F 1 "VDD" H 1950 2600 50  0000 C CNN
+F 2 "" H 1950 2450 50  0001 C CNN
+F 3 "" H 1950 2450 50  0001 C CNN
+	1    1950 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L MMA8652FC U3
+U 1 1 591D6A94
+P 3750 6350
+F 0 "U3" H 3400 5950 60  0000 C CNN
+F 1 "MMA8652FC" H 3950 5950 60  0000 C CNN
+F 2 "" H 3550 6100 60  0001 C CNN
+F 3 "" H 3550 6100 60  0000 C CNN
+	1    3750 6350
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR204
+U 1 1 591D6B9E
+P 4650 6700
+F 0 "#PWR204" H 4650 6450 50  0001 C CNN
+F 1 "GND" H 4650 6550 50  0000 C CNN
+F 2 "" H 4650 6700 50  0001 C CNN
+F 3 "" H 4650 6700 50  0001 C CNN
+	1    4650 6700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4500 6600 4650 6600
+Wire Wire Line
+	4650 6400 4650 6700
+Wire Wire Line
+	4500 6400 4650 6400
+Connection ~ 4650 6600
+Wire Wire Line
+	4500 6500 4650 6500
+Connection ~ 4650 6500
+$Comp
+L VDD #PWR203
+U 1 1 591D6DA1
+P 4650 5900
+F 0 "#PWR203" H 4650 5750 50  0001 C CNN
+F 1 "VDD" H 4650 6050 50  0000 C CNN
+F 2 "" H 4650 5900 50  0001 C CNN
+F 3 "" H 4650 5900 50  0001 C CNN
+	1    4650 5900
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4650 5900 4650 6200
+Wire Wire Line
+	4650 6100 4500 6100
+Wire Wire Line
+	4650 6200 4500 6200
+Connection ~ 4650 6100
+$Comp
+L C C22
+U 1 1 591D70DB
+P 2250 6550
+F 0 "C22" H 2275 6650 50  0000 L CNN
+F 1 "104" H 2275 6450 50  0000 L CNN
+F 2 "" H 2288 6400 50  0001 C CNN
+F 3 "" H 2250 6550 50  0001 C CNN
+	1    2250 6550
+	1    0    0    -1  
+$EndComp
+Text HLabel 3050 6350 0    60   Input ~ 0
+SDA
+Text HLabel 3050 6250 0    60   Input ~ 0
+SCL
+Wire Wire Line
+	2250 6400 2250 6100
+Wire Wire Line
+	2250 6100 3050 6100
+$Comp
+L GND #PWR202
+U 1 1 591D735E
+P 2250 6700
+F 0 "#PWR202" H 2250 6450 50  0001 C CNN
+F 1 "GND" H 2250 6550 50  0000 C CNN
+F 2 "" H 2250 6700 50  0001 C CNN
+F 3 "" H 2250 6700 50  0001 C CNN
+	1    2250 6700
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C18
+U 1 1 591D7528
+P 8200 5800
+F 0 "C18" H 8225 5900 50  0000 L CNN
+F 1 "105" H 8225 5700 50  0000 L CNN
+F 2 "" H 8238 5650 50  0001 C CNN
+F 3 "" H 8200 5800 50  0001 C CNN
+	1    8200 5800
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C19
+U 1 1 591D75B9
+P 8500 5800
+F 0 "C19" H 8525 5900 50  0000 L CNN
+F 1 "105" H 8525 5700 50  0000 L CNN
+F 2 "" H 8538 5650 50  0001 C CNN
+F 3 "" H 8500 5800 50  0001 C CNN
+	1    8500 5800
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C20
+U 1 1 591D75EF
+P 8800 5800
+F 0 "C20" H 8825 5900 50  0000 L CNN
+F 1 "105" H 8825 5700 50  0000 L CNN
+F 2 "" H 8838 5650 50  0001 C CNN
+F 3 "" H 8800 5800 50  0001 C CNN
+	1    8800 5800
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C25
+U 1 1 591D7626
+P 9100 5800
+F 0 "C25" H 9125 5900 50  0000 L CNN
+F 1 "104" H 9125 5700 50  0000 L CNN
+F 2 "" H 9138 5650 50  0001 C CNN
+F 3 "" H 9100 5800 50  0001 C CNN
+	1    9100 5800
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C21
+U 1 1 591D7668
+P 9400 5800
+F 0 "C21" H 9425 5900 50  0000 L CNN
+F 1 "105" H 9425 5700 50  0000 L CNN
+F 2 "" H 9438 5650 50  0001 C CNN
+F 3 "" H 9400 5800 50  0001 C CNN
+	1    9400 5800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8200 5950 9400 5950
+Connection ~ 8500 5950
+Connection ~ 8800 5950
+Connection ~ 9100 5950
+Wire Wire Line
+	8200 5650 9400 5650
+Connection ~ 9100 5650
+Connection ~ 8800 5650
+Connection ~ 8500 5650
+$Comp
+L GND #PWR208
+U 1 1 591D78AD
+P 8800 5950
+F 0 "#PWR208" H 8800 5700 50  0001 C CNN
+F 1 "GND" H 8800 5800 50  0000 C CNN
+F 2 "" H 8800 5950 50  0001 C CNN
+F 3 "" H 8800 5950 50  0001 C CNN
+	1    8800 5950
+	1    0    0    -1  
+$EndComp
+$Comp
+L VDD #PWR207
+U 1 1 591D78DF
+P 8800 5650
+F 0 "#PWR207" H 8800 5500 50  0001 C CNN
+F 1 "VDD" H 8800 5800 50  0000 C CNN
+F 2 "" H 8800 5650 50  0001 C CNN
+F 3 "" H 8800 5650 50  0001 C CNN
+	1    8800 5650
+	1    0    0    -1  
+$EndComp
+Text Label 3050 6600 2    60   ~ 0
+ACC_INT2
+Text Label 3050 6500 2    60   ~ 0
+ACC_INT1
+Text Label 3100 3850 2    60   ~ 0
+ACC_INT2
+Text Label 3100 4050 2    60   ~ 0
+ACC_INT1
+$EndSCHEMATC

TS100/KiCad/TS100.pro

@@ -0,0 +1,63 @@
+update=18/05/2017 9:29:06 PM
+version=1
+last_client=kicad
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[general]
+version=1
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=transistors
+LibName4=conn
+LibName5=linear
+LibName6=regul
+LibName7=74xx
+LibName8=cmos4000
+LibName9=adc-dac
+LibName10=memory
+LibName11=xilinx
+LibName12=microcontrollers
+LibName13=dsp
+LibName14=microchip
+LibName15=analog_switches
+LibName16=motorola
+LibName17=texas
+LibName18=intel
+LibName19=audio
+LibName20=interface
+LibName21=digital-audio
+LibName22=philips
+LibName23=display
+LibName24=cypress
+LibName25=siliconi
+LibName26=opto
+LibName27=atmel
+LibName28=contrib
+LibName29=valves
+LibName30=stm32
+LibName31=mma8652fc
+LibName32=switches

TS100/KiCad/TS100.sch

@@ -0,0 +1,151 @@
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:stm32
+LIBS:mma8652fc
+LIBS:switches
+LIBS:TS100-cache
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 2
+Title "TS100 Soldering Iron Schematic"
+Date "2017-05-18"
+Rev "2.46"
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 "Converted by Ben V. Brown"
+Comment4 "KiCad port of published schematic"
+$EndDescr
+$Sheet
+S 1450 1000 1450 1850
+U 591D5966
+F0 "STM32 & Accel Sub Board" 60
+F1 "MCU_SubBoard.sch" 60
+F2 "SWDIO" I R 2900 1100 60 
+F3 "SWCLK" I R 2900 1200 60 
+F4 "USB_D-" I R 2900 1350 60 
+F5 "USB_D+" I R 2900 1450 60 
+F6 "K1" I R 2900 1650 60 
+F7 "nCR" I R 2900 2150 60 
+F8 "TMP36" I R 2900 2250 60 
+F9 "K2" I R 2900 1750 60 
+F10 "SCL" I R 2900 2550 60 
+F11 "SDA" I R 2900 2650 60 
+F12 "Po" I R 2900 2050 60 
+F13 "Vb" I R 2900 1950 60 
+$EndSheet
+$Comp
+L BARREL_JACK J101
+U 1 1 591D8B75
+P 1600 3600
+F 0 "J101" H 1600 3795 50  0000 C CNN
+F 1 "BARREL_JACK" H 1600 3445 50  0000 C CNN
+F 2 "" H 1600 3600 50  0001 C CNN
+F 3 "" H 1600 3600 50  0001 C CNN
+	1    1600 3600
+	1    0    0    -1  
+$EndComp
+Text Label 1900 3500 0    60   ~ 0
+VIN
+$Comp
+L GND #PWR103
+U 1 1 591D8F24
+P 2000 3800
+F 0 "#PWR103" H 2000 3550 50  0001 C CNN
+F 1 "GND" H 2000 3650 50  0000 C CNN
+F 2 "" H 2000 3800 50  0001 C CNN
+F 3 "" H 2000 3800 50  0001 C CNN
+	1    2000 3800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1900 3600 2000 3600
+Wire Wire Line
+	2000 3600 2000 3800
+Wire Wire Line
+	1900 3700 2000 3700
+Connection ~ 2000 3700
+$Comp
+L SW_Push SW1
+U 1 1 591D9BC6
+P 1400 4550
+F 0 "SW1" H 1450 4650 50  0000 L CNN
+F 1 "SW_Push" H 1400 4490 50  0000 C CNN
+F 2 "" H 1400 4750 50  0001 C CNN
+F 3 "" H 1400 4750 50  0001 C CNN
+F 4 "-" H 1400 4550 60  0001 C CNN "bom_partno"
+	1    1400 4550
+	0    1    1    0   
+$EndComp
+$Comp
+L SW_Push SW101
+U 1 1 591DA371
+P 1700 4550
+F 0 "SW101" H 1750 4650 50  0000 L CNN
+F 1 "SW_Push" H 1700 4490 50  0000 C CNN
+F 2 "" H 1700 4750 50  0001 C CNN
+F 3 "" H 1700 4750 50  0001 C CNN
+	1    1700 4550
+	0    1    1    0   
+$EndComp
+$Comp
+L GND #PWR102
+U 1 1 591DA3DA
+P 1700 4750
+F 0 "#PWR102" H 1700 4500 50  0001 C CNN
+F 1 "GND" H 1700 4600 50  0000 C CNN
+F 2 "" H 1700 4750 50  0001 C CNN
+F 3 "" H 1700 4750 50  0001 C CNN
+	1    1700 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR101
+U 1 1 591DA436
+P 1400 4750
+F 0 "#PWR101" H 1400 4500 50  0001 C CNN
+F 1 "GND" H 1400 4600 50  0000 C CNN
+F 2 "" H 1400 4750 50  0001 C CNN
+F 3 "" H 1400 4750 50  0001 C CNN
+	1    1400 4750
+	1    0    0    -1  
+$EndComp
+Text Label 1400 4350 0    60   ~ 0
+K1
+Text Label 1700 4350 0    60   ~ 0
+K2
+Text Label 2900 1750 0    60   ~ 0
+K2
+Text Label 2900 1650 0    60   ~ 0
+K1
+$EndSCHEMATC

workspace/ts100/inc/Interrupt.h

@@ -11,7 +11,9 @@ void delayMs(uint32_t ticks);
 volatile extern uint32_t lastKeyPress;
 volatile extern uint32_t lastMovement;
 
-volatile extern uint16_t keyState;
+volatile extern uint8_t keyState;
+volatile extern uint8_t rawKeys;
+
 inline uint32_t millis() {
 	return system_Ticks;
 }
@@ -24,9 +26,9 @@ inline void resetLastButtonPress() {
 
 }
 inline void resetButtons() {
-	lastKeyPress = millis();
 	keyState = 0;
 }
+
 inline uint32_t getLastMovement() {
 	return lastMovement;
 }
@@ -34,6 +36,13 @@ inline uint32_t getLastMovement() {
 inline uint16_t getButtons() {
 	return keyState;
 }
+inline uint16_t getRawButtons() {
+	return rawKeys;
+}
+inline void restoreButtons()
+{
+	keyState=getRawButtons();
+}
 
 /*IRQ prototypes*/
 void NMI_Handler(void);

workspace/ts100/inc/Modes.h

@@ -29,16 +29,20 @@ enum {
 	TEMPCAL,		//Cal tip temp offset
 
 } operatingMode;
+#define SETTINGSOPTIONSCOUNT 10 /*Number of settings in the settings menu*/
 
 enum {
 	UVCO = 0,
 	SLEEP_TEMP,
 	SLEEP_TIME,
 	SHUTDOWN_TIME,
-	MOTIONDETECT,
 	MOTIONSENSITIVITY,
 	TEMPDISPLAY,
+	TEMPROUNDING,
+	DISPUPDATERATE,
 	LEFTY,
+	BOOSTMODE,
+	BOOSTTEMP,
 } settingsPage;
 
 void ProcessUI();

workspace/ts100/inc/Oled.h

@@ -22,7 +22,7 @@ void Init_Oled(uint8_t leftHanded);
 u8* Data_Command(u8 len, u8* ptr);
 void Clear_Screen(void);//Clear the screen
 /*Functions for writing to the screen*/
-void OLED_DrawString(char* string, uint8_t length);
+void OLED_DrawString(const char* string, const uint8_t length);
 void OLED_DrawChar(char c, uint8_t x);
 void OLED_DrawTwoNumber(uint8_t in, uint8_t x);
 void OLED_BlankSlot(uint8_t xStart,uint8_t width);

workspace/ts100/inc/Settings.h

@@ -11,27 +11,35 @@
 #define SETTINGS_H_
 #include <stdint.h>
 #include "stm32f10x_flash.h"
-#define SETTINGSVERSION 0x05 /*Change this if you change the struct below to prevent people getting out of sync*/
-#define SETTINGSOPTIONSCOUNT 7 /*Number of settings in the settings menu*/
-#define MOTION_HIGH (0x00)
-#define MOTION_MED  (0x10)
-#define MOTION_LOW  (0x20)
+#define SETTINGSVERSION 12 /*Change this if you change the struct below to prevent people getting out of sync*/
+//Display Speeds
+#define DISPLAYMODE_FAST 	(0x00)
+#define DISPLAYMODE_MEDIUM 	(0x01)
+#define DISPLAYMODE_SLOW	(0x02)
+//Rounding Modes
+#define ROUNDING_NONE			(0x00)
+#define ROUNDING_FIVE			(0x01)
+#define ROUNDING_TEN			(0x02)
+
 /*
  * This struct must be a multiple of 2 bytes as it is saved / restored from flash in uint16_t chunks
  */
 struct {
-	uint32_t SolderingTemp; 		//current set point for the iron
+	uint16_t SolderingTemp; 		//current set point for the iron
 	uint32_t SleepTemp; 			//temp to drop to in sleep
 	uint8_t version;				//Used to track if a reset is needed on firmware upgrade
 	uint8_t SleepTime; 				//minutes timeout to sleep
 	uint8_t cutoutVoltage:5; 		//The voltage we cut out at for under voltage
-	uint8_t movementEnabled:1;		//If movement is enabled
 	uint8_t displayTempInF:1;		//If we need to convert the C reading to F
 	uint8_t flipDisplay:1;			//If true we want to invert the display for lefties
-	uint8_t sensitivity:7;			//Sensitivity of accelerometer
-	uint8_t ShutdownTime:7;			//Time until unit shuts down if left alone
+	uint8_t sensitivity:6;			//Sensitivity of accelerometer (5 bits)
+	uint8_t ShutdownTime:6;			//Time until unit shuts down if left alone
+	uint8_t displayUpdateSpeed:2;	//How fast the display updates / temp showing mode
+	uint8_t temperatureRounding:2;	//Rounding mode for the temperature
+	uint8_t boostModeEnabled:1;		//Boost mode swaps BUT_A in soldering mode to temporary soldering temp over-ride
 	uint16_t tempCalibration;		//Temperature calibration value
 	uint16_t voltageDiv;			//Voltage divisor factor
+	uint16_t BoostTemp; 			//Boost mode set point for the iron
 } systemSettings;
 
 void saveSettings();

workspace/ts100/src/Analog.c

@@ -23,7 +23,7 @@ uint16_t readDCVoltage(uint16_t divFactor) {
 //This allows us to read it in X10 mode
 //Returns temperature in C X10 mode
 int16_t readTipTemp() {
-	static uint32_t rollingAverage[4];
+	static uint32_t rollingAverage[16];
 	static uint8_t rIndex = 0;
 
 	/*The head has a thermocouple inline with the heater
@@ -54,9 +54,13 @@ int16_t readTipTemp() {
 	ad_sum = ad_sum - max - min; //remove the two outliers
 	avg_data = ad_sum / 8; //take the average
 	rollingAverage[rIndex] = avg_data;
-	rIndex = (rIndex + 1) % 4;
+	rIndex = (rIndex + 1) % 16;
 	return (rollingAverage[0] + rollingAverage[1] + rollingAverage[2]
-			+ rollingAverage[3]) / 4; //get the average
+			+ rollingAverage[3] + rollingAverage[4] + rollingAverage[5]
+			+ rollingAverage[6] + rollingAverage[7] + rollingAverage[8]
+			+ rollingAverage[9] + rollingAverage[10] + rollingAverage[11]
+			+ rollingAverage[12] + rollingAverage[13] + rollingAverage[14]
+			+ rollingAverage[15]) / 16; //get the average
 
 }
 
@@ -110,7 +114,7 @@ uint16_t readIronTemp(uint16_t calibration_temp, uint8_t read,
 	static uint16_t calTemp = 0;
 	static uint16_t lastVal = 0;
 	static uint16_t lastSetTemp;
-	if(setPointTemp!=0xFFFF)
+	if (setPointTemp != 0xFFFF)
 		lastSetTemp = setPointTemp;
 	if (calibration_temp != 0)
 		calTemp = calibration_temp;

workspace/ts100/src/Interrupt.c

@@ -4,7 +4,8 @@
 
 volatile uint32_t system_Ticks;
 volatile uint32_t lastKeyPress; //millis() at the last button event
-volatile uint16_t keyState; //tracks the button status
+volatile uint8_t keyState; //tracks the button status
+volatile uint8_t rawKeys;
 volatile uint32_t lastMovement; //millis() at last movement event
 
 //Delay in milliseconds using systemTick
@@ -55,18 +56,24 @@ void EXTI9_5_IRQHandler(void) {
 //we are interested in line 9 and line 6 for buttons
 	//Line 5 == movement
 	if (EXTI_GetITStatus(EXTI_Line9) != RESET) {
-		if (GPIO_ReadInputDataBit(GPIOA, KEY_A) == SET)
+		if (GPIO_ReadInputDataBit(GPIOA, KEY_A) == SET) {
 			keyState &= ~(BUT_A);
-		else
+			rawKeys &= ~BUT_A;
+		} else {
 			keyState |= BUT_A;
-		lastKeyPress = millis();
+			rawKeys |= BUT_A;
+			lastKeyPress = millis();
+		}
 		EXTI_ClearITPendingBit(EXTI_Line9);
 	} else if (EXTI_GetITStatus(EXTI_Line6) != RESET) {
-		if (GPIO_ReadInputDataBit(GPIOA, KEY_B) == SET)
+		if (GPIO_ReadInputDataBit(GPIOA, KEY_B) == SET) {
 			keyState &= ~(BUT_B);
-		else
+			rawKeys &= ~BUT_B;
+		} else {
 			keyState |= BUT_B;
-		lastKeyPress = millis();
+			rawKeys |= BUT_B;
+			lastKeyPress = millis();
+		}
 		EXTI_ClearITPendingBit(EXTI_Line6);
 	} else if (EXTI_GetITStatus(EXTI_Line5) != RESET) {	//Movement Event
 		lastMovement = millis();
@@ -205,4 +212,3 @@ void USB_LP_CAN1_RX0_IRQHandler(void) {
 
 }
 
-

workspace/ts100/src/MMA8652FC.c

@@ -34,10 +34,13 @@ void StartUp_Accelerometer(uint8_t sensitivity) {
 	I2C_RegisterWrite( CTRL_REG2, 0x40);	// Reset all registers to POR values
 	delayMs(2);		// ~1ms delay
 	I2C_RegisterWrite(FF_MT_CFG_REG, 0x78);	// Enable motion detection for X and Y axis, latch enabled
-	I2C_RegisterWrite(FF_MT_THS_REG, sensitivity|0x0F);		// Set threshold
-	I2C_RegisterWrite(FF_MT_COUNT_REG, 0x01);	// Set debounce to 100ms
+	uint8_t sens = 9 * 7 + 5;
+	sens -= 7 * sensitivity;
+
+	I2C_RegisterWrite(FF_MT_THS_REG, 0x80 | sens);		// Set threshold
+	I2C_RegisterWrite(FF_MT_COUNT_REG, 0x02);	// Set debounce to 100ms
 
 	I2C_RegisterWrite( CTRL_REG4, 0x04);		// Enable motion interrupt
 	I2C_RegisterWrite( CTRL_REG5, 0x04);// Route motion interrupts to INT1 ->PB5 ->EXTI5
-	I2C_RegisterWrite( CTRL_REG1, 0x19);		// ODR=100 Hz, Active mode
+	I2C_RegisterWrite( CTRL_REG1, 0x11);		// ODR=800 Hz, Active mode
 }

workspace/ts100/src/Main.c

@@ -18,6 +18,10 @@ int main(void) {
 		ProcessUI();
 		DrawUI();
 		delayMs(50); //Slow the system down a little bit
+		if(GPIO_ReadInputDataBit(GPIOB,GPIO_Pin_5)==Bit_RESET)
+		{
+			lastMovement = millis();
+		}
 	}
 }
 void setup() {
@@ -37,7 +41,7 @@ void setup() {
 	readIronTemp(systemSettings.tempCalibration, 0,0); 	//load the default calibration value
 	Init_Oled(systemSettings.flipDisplay); 				//Init the OLED display
 
-	OLED_DrawString("VER 1.08", 8); 					//
-	delayMs(800);										//Pause to show version number
+	OLED_DrawString("VER 1.13", 8); 					//Version Number
+	delayMs(500);										//Pause to show version number
 	Start_Watchdog(1000); 								//start the system watch dog as 1 second timeout
 }

workspace/ts100/src/Modes.c

@@ -5,18 +5,31 @@
  *      Author: Ralim <ralim@ralimtek.com>
  */
 #include "Modes.h"
-uint8_t CalStatus = 0;
+const char *SettingsLongNames[] = { "      Undervoltage Cutout <V>",
+		"      Sleep Temperature <C>", "      Sleep Timeout <Minutes>",
+		"      Shutdown Timeout <Minutes>",
+		"      Motion Sensitivity <0.Off 1.least sensitive 9.most sensitive>",
+		"      Temperature Unit", "      Temperature Rounding Amount",
+		"      Temperature Display Update Rate",
+		"      Flip Display for Left Hand",
+		"      Enable front key boost 450C mode when soldering",
+		"      Temperature when in boost mode" };
+const uint8_t SettingsLongNamesLengths[] = { 29, 27, 29, 32, 67, 22, 33, 37, 32,
+		53, 36 };
+uint8_t StatusFlags = 0;
+uint32_t temporaryTempStorage = 0;
 //This does the required processing and state changes
 void ProcessUI() {
 	uint8_t Buttons = getButtons(); //read the buttons status
 	static uint32_t lastModeChange = 0;
-	if (millis() - getLastButtonPress() < 30)
+	if (getRawButtons() && ((millis() - getLastButtonPress()) > 1000)) {
+		lastKeyPress = millis() - 600;
+		Buttons = getRawButtons();
+	} else if (millis() - getLastButtonPress() < 80) {
 		Buttons = 0;
-	else if (Buttons != 0) {
-		resetLastButtonPress();
+	} else if (Buttons != 0) {
 		resetButtons();
 	}
-	//rough prevention for de-bouncing and allocates settling time
 
 	switch (operatingMode) {
 	case STARTUP:
@@ -25,24 +38,54 @@ void ProcessUI() {
 		} else if (Buttons == BUT_A) {
 			//A key pressed so we are moving to soldering mode
 			operatingMode = SOLDERING;
+			Oled_DisplayOn();
 		} else if (Buttons == BUT_B) {
 			//B Button was pressed so we are moving to the Settings menu
 			operatingMode = SETTINGS;
+			Oled_DisplayOn();
 		}
 		break;
 	case SOLDERING:
 		//We need to check the buttons if we need to jump out
-		if (Buttons == BUT_A || Buttons == BUT_B) {
+		if ((Buttons == BUT_A && !systemSettings.boostModeEnabled)
+				|| Buttons == BUT_B) {
 			//A or B key pressed so we are moving to temp set
 			operatingMode = TEMP_ADJ;
+			if (StatusFlags == 8) {
+				//Boost mode was enabled before
+				//We need to cancel the temp
+				systemSettings.SolderingTemp = temporaryTempStorage;
+				StatusFlags = 0;
+			}
 		} else if (Buttons == (BUT_A | BUT_B)) {
 
 			//Both buttons were pressed, exit back to the cooling screen
 			operatingMode = COOLING;
+			if (StatusFlags == 8) {
+				//Boost mode was enabled before
+				//We need to cancel the temp
+				systemSettings.SolderingTemp = temporaryTempStorage;
+				StatusFlags = 0;
+			}
 
+		} else if ((getRawButtons() == BUT_A && systemSettings.boostModeEnabled)) {
+			if (StatusFlags != 8) {
+				StatusFlags = 8;
+				temporaryTempStorage = systemSettings.SolderingTemp;
+				systemSettings.SolderingTemp = systemSettings.BoostTemp;
+			}
+			//Update the PID Loop
+			int32_t newOutput = computePID(systemSettings.SolderingTemp);
+			setIronTimer(newOutput);
 		} else {
+			if (StatusFlags == 8) {
+				//Boost mode was enabled before
+				//We need to cancel the temp
+				systemSettings.SolderingTemp = temporaryTempStorage;
+				StatusFlags = 0;
+			}
 			//We need to check the timer for movement in case we need to goto idle
-			if (systemSettings.movementEnabled)
+			if (systemSettings.sensitivity)
 				if (millis() - getLastMovement()
 						> (systemSettings.SleepTime * 60000)) {
 					if (millis() - getLastButtonPress()
@@ -85,60 +128,80 @@ void ProcessUI() {
 	case SETTINGS:
 		//Settings is the mode with the most logic
 		//Here we are in the menu so we need to increment through the sub menus / increase the value
+		if (StatusFlags == 4 && Buttons != 0) {
+			//The user pressed the button to breakout of the settings help prompt
+			StatusFlags = 0;
+		} else {
+			if (Buttons & BUT_B) {
+				//A key iterates through the menu
+				if (settingsPage == SETTINGSOPTIONSCOUNT) {
+					//Roll off the end
+					settingsPage = 0;				//reset
+					operatingMode = STARTUP;		//reset back to the startup
+					saveSettings();					//Save the settings
+				} else {
+					++settingsPage;					//move to the next option
+				}
+			} else if (Buttons & BUT_A) {
+				//B changes the value selected
+				switch (settingsPage) {
+				case UVCO:
+					//we are incrementing the cutout voltage
+					systemSettings.cutoutVoltage += 1;		//Go up 1V at a jump
+					if (systemSettings.cutoutVoltage > 24)
+						systemSettings.cutoutVoltage = 10;
+					break;
+				case SLEEP_TEMP:
+					systemSettings.SleepTemp += 100;	//Go up 10C at a time
+					if (systemSettings.SleepTemp > 3000)
+						systemSettings.SleepTemp = 1000;//cant sleep higher than 300
+					break;
+				case SLEEP_TIME:
+					++systemSettings.SleepTime;		//Go up 1 minute at a time
+					if (systemSettings.SleepTime > 30)
+						systemSettings.SleepTime = 1;//cant set time over 30 mins
+					//Remember that ^ is the time of no movement
+					break;
+				case SHUTDOWN_TIME:
+					++systemSettings.ShutdownTime;
+					if (systemSettings.ShutdownTime > 60)
+						systemSettings.ShutdownTime = 0;		//wrap to off
+					break;
+				case TEMPDISPLAY:
+					systemSettings.displayTempInF =
+							!systemSettings.displayTempInF;
+					break;
+				case LEFTY:
+					systemSettings.flipDisplay = !systemSettings.flipDisplay;
+					break;
+				case MOTIONSENSITIVITY:
+					systemSettings.sensitivity++;
+					systemSettings.sensitivity = systemSettings.sensitivity
+							% 10;
 
-		if (Buttons & BUT_A) {
-			//A key iterates through the menu
-			if (settingsPage == SETTINGSOPTIONSCOUNT) {
-				//Roll off the end
-				settingsPage = 0;				//reset
-				operatingMode = STARTUP;		//reset back to the startup
-				saveSettings();					//Save the settings
-			} else
-				++settingsPage;					//move to the next option
-		} else if (Buttons & BUT_B) {
-			resetLastButtonPress();
-			//B changes the value selected
-			switch (settingsPage) {
-			case UVCO:
-				//we are incrementing the cutout voltage
-				systemSettings.cutoutVoltage += 1;		//Go up 1V at a jump
-				if (systemSettings.cutoutVoltage > 24)
-					systemSettings.cutoutVoltage = 10;
-				break;
-			case SLEEP_TEMP:
-				systemSettings.SleepTemp += 100;		//Go up 10c at a time
-				if (systemSettings.SleepTemp > 3000)
-					systemSettings.SleepTemp = 1000;//cant sleep higher than 300
-				break;
-			case SLEEP_TIME:
-				++systemSettings.SleepTime;		//Go up 1 minute at a time
-				if (systemSettings.SleepTime > 30)
-					systemSettings.SleepTime = 1;	//cant set time over 30 mins
-				//Remember that ^ is the time of no movement
-				break;
-			case SHUTDOWN_TIME:
-				++systemSettings.ShutdownTime;
-				if (systemSettings.ShutdownTime > 60)
-					systemSettings.ShutdownTime = 0;			//wrap to off
-				break;
-			case MOTIONDETECT:
-				systemSettings.movementEnabled =
-						!systemSettings.movementEnabled;
-				break;
-			case TEMPDISPLAY:
-				systemSettings.displayTempInF = !systemSettings.displayTempInF;
-				break;
-			case LEFTY:
-				systemSettings.flipDisplay = !systemSettings.flipDisplay;
-				break;
-			case MOTIONSENSITIVITY:
-				systemSettings.sensitivity += 0x10;
-				if (systemSettings.sensitivity > 0x20)
-					systemSettings.sensitivity = 0;		//reset to high on wrap
-
-				break;
-			default:
-				break;
+					break;
+				case TEMPROUNDING:
+					systemSettings.temperatureRounding++;
+					systemSettings.temperatureRounding =
+							systemSettings.temperatureRounding % 3;
+					break;
+				case DISPUPDATERATE:
+					systemSettings.displayUpdateSpeed++;
+					systemSettings.displayUpdateSpeed =
+							systemSettings.displayUpdateSpeed % 3;
+					break;
+				case BOOSTMODE:
+					systemSettings.boostModeEnabled =
+							!systemSettings.boostModeEnabled;
+					break;
+				case BOOSTTEMP:
+					systemSettings.BoostTemp += 100;	//Go up 10C at a time
+					if (systemSettings.BoostTemp > 4500)
+						systemSettings.BoostTemp = 2500;	//loop back at 250
+					break;
+				default:
+					break;
+				}
 			}
 		}
 		break;
@@ -154,13 +217,14 @@ void ProcessUI() {
 			operatingMode = SOLDERING;
 			Oled_DisplayOn();
 			return;
-		} else if (systemSettings.movementEnabled)
+		} else if (systemSettings.sensitivity) {
 			if (millis() - getLastMovement() < 1000) {//moved in the last second
 				operatingMode = SOLDERING; //Goto active mode again
 				Oled_DisplayOn();
 				return;
 			}
-		if (systemSettings.movementEnabled) {
+		}
+		if (systemSettings.sensitivity) {
 			//Check if we should shutdown
 			if ((millis() - getLastMovement()
 					> (systemSettings.ShutdownTime * 60000))
@@ -177,13 +241,22 @@ void ProcessUI() {
 	case COOLING: {
 		setIronTimer(0); //turn off heating
 		//This mode warns the user the iron is still cooling down
-		uint16_t temp = readIronTemp(0, 1, 0xFFFF); //take a new reading as the heater code is not taking new readings
-		if (temp < 400) { //if the temp is < 40C then we can go back to IDLE
-			operatingMode = STARTUP;
-		} else if (Buttons & (BUT_A | BUT_B)) { //we check if the user has pushed a button to ack
+		if (Buttons & (BUT_A | BUT_B)) { //we check if the user has pushed a button to exit
 			//Either button was pushed
 			operatingMode = STARTUP;
 		}
+		if (systemSettings.sensitivity) {
+			if (millis() - getLastMovement()
+					> (systemSettings.ShutdownTime * 60000)) {
+				if ((millis() - getLastButtonPress()
+						> systemSettings.ShutdownTime * 60000)) {
+					Oled_DisplayOff();
+				}
+			} else {
+				Oled_DisplayOn();
+			}
+		} else
+			Oled_DisplayOn();
 	}
 		break;
 	case UVLOWARN:
@@ -198,10 +271,10 @@ void ProcessUI() {
 
 		if (Buttons == BUT_A) {
 			//Single button press, cycle over to the DC display
-			CalStatus = 0;
+			StatusFlags = 0;
 			operatingMode = DCINDISP;
 		} else if (Buttons == BUT_B) {
-			CalStatus = 0;
+			StatusFlags = 0;
 			operatingMode = TEMPCAL;
 		} else if (Buttons == (BUT_A | BUT_B)) {
 			//If the user is holding both button, exit the  screen
@@ -212,13 +285,13 @@ void ProcessUI() {
 		break;
 	case DCINDISP: {
 		//This lets the user check the input voltage
-		if (CalStatus == 0) {
+		if (StatusFlags == 0) {
 			if (Buttons == BUT_A) {
 				//Single button press, cycle over to the temp display
 				operatingMode = THERMOMETER;
 			} else if (Buttons == BUT_B) {
 				//dc cal mode
-				CalStatus = 1;
+				StatusFlags = 1;
 			} else if (Buttons == (BUT_A | BUT_B)) {
 				//If the user is holding both button, exit the  screen
 				operatingMode = STARTUP;
@@ -236,7 +309,7 @@ void ProcessUI() {
 				else
 					systemSettings.voltageDiv++;
 			} else if (Buttons == (BUT_A | BUT_B)) {
-				CalStatus = 0;
+				StatusFlags = 0;
 				saveSettings();
 			}
 			if (systemSettings.voltageDiv < 120)
@@ -253,13 +326,13 @@ void ProcessUI() {
 			operatingMode = THERMOMETER;
 		} else if (Buttons == BUT_A) {
 			//Try and calibrate
-			if (CalStatus == 0) {
+			if (StatusFlags == 0) {
 				if ((readTipTemp() < 300) && (readSensorTemp() < 300)) {
-					CalStatus = 1;
+					StatusFlags = 1;
 					systemSettings.tempCalibration = readTipTemp();
 					saveSettings();
 				} else {
-					CalStatus = 2;
+					StatusFlags = 2;
 				}
 			}
 		} else if (Buttons == (BUT_A | BUT_B)) {
@@ -276,18 +349,34 @@ void ProcessUI() {
 /*
  * Draws the temp with temp conversion if needed
  */
-void drawTemp(uint16_t temp, uint8_t x) {
+void drawTemp(uint16_t temp, uint8_t x, uint8_t roundingMode) {
 	if (systemSettings.displayTempInF)
 		temp = (temp * 9 + 1600) / 5;/*Convert to F -> T*(9/5)+32*/
 	if (temp % 10 > 5)
 		temp += 10;		//round up
-	OLED_DrawThreeNumber(temp / 10, x);
+	temp /= 10;
+	//handle rounding modes
+	if (roundingMode == ROUNDING_FIVE) {
+		if (temp % 10 < 5)
+			temp = (temp / 10) * 10;
+		else
+			temp = ((temp / 10) * 10) + 5;
+	} else if (roundingMode == ROUNDING_TEN) {
+		temp = (temp / 10) * 10;
+	}
+
+	OLED_DrawThreeNumber(temp, x);
 }
 
 /*
  * Performs all the OLED drawing for the current operating mode
  */
 void DrawUI() {
+	static uint32_t lastOLEDDrawTime = 0;
+	static uint16_t lastSolderingDrawnTemp1 = 0;
+	static uint16_t lastSolderingDrawnTemp2 = 0;
+
+	static uint8_t settingsLongTestScrollPos = 0;
 	uint16_t temp = readIronTemp(0, 0, 0xFFFF);
 	switch (operatingMode) {
 	case STARTUP:
@@ -305,18 +394,40 @@ void DrawUI() {
 	case SOLDERING:
 		//The user is soldering
 	{
-		drawTemp(temp, 0);
-		OLED_DrawChar(' ', 3);
+		if (systemSettings.displayUpdateSpeed == DISPLAYMODE_SLOW
+				&& (millis() - lastOLEDDrawTime < 200))
+			return;
+		else if (systemSettings.displayUpdateSpeed == DISPLAYMODE_MEDIUM
+				&& (millis() - lastOLEDDrawTime < 100))
+			return;
+		else if (systemSettings.displayUpdateSpeed == DISPLAYMODE_FAST
+				&& (millis() - lastOLEDDrawTime < 50))
+			return;
+
+		uint32_t tempavg = (temp + lastSolderingDrawnTemp1
+				+ lastSolderingDrawnTemp2);
+		tempavg /= 3;
+		drawTemp(tempavg, 0, systemSettings.temperatureRounding);
+		lastSolderingDrawnTemp1 = temp;
+		lastSolderingDrawnTemp2 = lastSolderingDrawnTemp1;
+		lastOLEDDrawTime = millis();
+		//Now draw symbols
+		if (StatusFlags == 8)
+			OLED_DrawChar('B', 3);
+		else
+			OLED_DrawChar(' ', 3);
 
 		OLED_BlankSlot(6 * 12 + 16, 24 - 16);//blank out the tail after the arrows
 		OLED_BlankSlot(4 * 12 + 16, 24 - 16);//blank out the tail after the temp
-		if (getIronTimer() == 0) {
+		if (getIronTimer() == 0
+				&& (temp / 10) > (systemSettings.SolderingTemp / 10)) {
+			//Cooling
 			OLED_DrawSymbol(6, 5);
 		} else {
-			if (getIronTimer() < 900) {
+			if (getIronTimer() < 1500) {
+				//Maintaining
 				OLED_DrawSymbol(6, 7);
 			} else {		//we are heating
-				//OLED_DrawChar('H', 5);
 				OLED_DrawSymbol(6, 6);
 			}
 		}
@@ -325,6 +436,7 @@ void DrawUI() {
 		} else {
 			OLED_DrawSymbol(4, 0);
 		}
+
 	}
 		break;
 	case TEMP_ADJ:
@@ -332,79 +444,132 @@ void DrawUI() {
 		//With the nifty arrows
 		OLED_DrawChar(' ', 0);
 		OLED_DrawChar('<', 1);
-		drawTemp(systemSettings.SolderingTemp, 2);
+		drawTemp(systemSettings.SolderingTemp, 2, 0);
 		OLED_DrawChar(' ', 5);
 		OLED_DrawChar(' ', 7);
 		OLED_DrawChar('>', 6);
 		break;
 	case SETTINGS:
 		//We are prompting the user the setting name
-
-		switch (settingsPage) {
-		case UVCO:
-			OLED_DrawString("UVCO ", 5);
-			OLED_DrawTwoNumber(systemSettings.cutoutVoltage, 5);
-			OLED_DrawChar('V', 7);
-			break;
-		case SLEEP_TEMP:
-			OLED_DrawString("STMP ", 5);
-			OLED_DrawThreeNumber(systemSettings.SleepTemp / 10, 5);
-			break;
-		case SLEEP_TIME:
-			OLED_DrawString("SLTME ", 6);
-			OLED_DrawTwoNumber(systemSettings.SleepTime, 6);
-			break;
-		case SHUTDOWN_TIME:
-			OLED_DrawString("SHTME ", 6);
-			OLED_DrawTwoNumber(systemSettings.ShutdownTime, 6);
-			break;
-		case MOTIONDETECT:/*Toggle the mode*/
-			if (systemSettings.movementEnabled)
-				OLED_DrawString("MOTION T", 8);
-			else
-				OLED_DrawString("MOTION F", 8);
-			break;
-		case TEMPDISPLAY:/*Are we showing in C or F ?*/
-			if (systemSettings.displayTempInF)
-				OLED_DrawString("TMPUNT F", 8);
-			else
-				OLED_DrawString("TMPUNT C", 8);
-			break;
-
-		case LEFTY:
-
-			if (systemSettings.flipDisplay)
-				OLED_DrawString("FLPDSP T", 8);
-			else
-				OLED_DrawString("FLPDSP F", 8);
-			break;
-		case MOTIONSENSITIVITY:
-			switch (systemSettings.sensitivity) {
-			case MOTION_HIGH:
-				OLED_DrawString("SENSE H ", 8);
+		if (millis() - getLastButtonPress() > 3000) {
+			StatusFlags = 4;
+			//If the user has idled for > 3 seconds, show the long name for the selected setting instead
+			//draw from settingsLongTestScrollPos through to end of screen
+			uint8_t lengthLeft = SettingsLongNamesLengths[settingsPage]
+					- settingsLongTestScrollPos;
+			if (lengthLeft < 1)
+				settingsLongTestScrollPos = 0;
+			//^ Reset once not much left
+			if (lengthLeft > 8)
+				lengthLeft = 8;
+			OLED_DrawString(
+					SettingsLongNames[(uint8_t) settingsPage]
+							+ settingsLongTestScrollPos, lengthLeft);
+			if (lengthLeft < 8)
+				for (uint8_t i = lengthLeft; i < 8; i++)
+					OLED_DrawChar(' ', i);
+			if (millis() - lastOLEDDrawTime > 120) {
+				settingsLongTestScrollPos++;
+				lastOLEDDrawTime = millis();
+			}
+		} else {
+			settingsLongTestScrollPos = 0;
+			switch (settingsPage) {
+			case UVCO:
+				OLED_DrawString("UVCO ", 5);
+				OLED_DrawTwoNumber(systemSettings.cutoutVoltage, 5);
+				OLED_DrawChar('V', 7);
 				break;
-			case MOTION_MED:
-				OLED_DrawString("SENSE M ", 8);
+			case SLEEP_TEMP:
+				OLED_DrawString("STMP ", 5);
+				OLED_DrawThreeNumber(systemSettings.SleepTemp / 10, 5);
 				break;
-			case MOTION_LOW:
-				OLED_DrawString("SENSE L ", 8);
+			case SLEEP_TIME:
+				OLED_DrawString("SLTME ", 6);
+				OLED_DrawTwoNumber(systemSettings.SleepTime, 6);
+				break;
+			case SHUTDOWN_TIME:
+				OLED_DrawString("SHTME ", 6);
+				OLED_DrawTwoNumber(systemSettings.ShutdownTime, 6);
+				break;
+			case TEMPDISPLAY:/*Are we showing in C or F ?*/
+				if (systemSettings.displayTempInF)
+					OLED_DrawString("TMPUNT F", 8);
+				else
+					OLED_DrawString("TMPUNT C", 8);
+				break;
+			case LEFTY:
+
+				if (systemSettings.flipDisplay)
+					OLED_DrawString("FLPDSP T", 8);
+				else
+					OLED_DrawString("FLPDSP F", 8);
+				break;
+			case MOTIONSENSITIVITY:
+				OLED_DrawString("MSENSE ", 7);
+				OLED_DrawChar('0' + systemSettings.sensitivity, 7);
+				break;
+			case TEMPROUNDING:
+				//We are prompting the user about their display mode preferences
+			{
+				switch (systemSettings.temperatureRounding) {
+				case ROUNDING_NONE:
+					OLED_DrawString("TMPRND 1", 8);
+					break;
+				case ROUNDING_FIVE:
+					OLED_DrawString("TMPRND 5", 8);
+					break;
+				case ROUNDING_TEN:
+					OLED_DrawString("TMPRND10", 8);
+					break;
+				default:
+					OLED_DrawString("TMPRND 1", 8);
+					break;
+				}
+			}
+				break;
+			case DISPUPDATERATE:
+				//We are prompting the user about their display mode preferences
+			{
+				switch (systemSettings.displayUpdateSpeed) {
+				case DISPLAYMODE_FAST:
+					OLED_DrawString("TMPSPD F", 8);
+					break;
+				case DISPLAYMODE_SLOW:
+					OLED_DrawString("TMPSPD S", 8);
+					break;
+				case DISPLAYMODE_MEDIUM:
+					OLED_DrawString("TMPSPD M", 8);
+					break;
+
+				}
+			}
+				break;
+			case BOOSTMODE:
+				switch (systemSettings.boostModeEnabled) {
+				case 1:
+					OLED_DrawString("BOOST  T", 8);
+					break;
+				case 0:
+					OLED_DrawString("BOOST  F", 8);
+					break;
+				}
+				break;
+			case BOOSTTEMP:
+				OLED_DrawString("BTMP ", 5);
+				OLED_DrawThreeNumber(systemSettings.BoostTemp / 10, 5);
 				break;
 			default:
-				OLED_DrawString("SENSE   ", 8);
 				break;
 			}
-
-			break;
-
-		default:
-			break;
 		}
 		break;
 	case SLEEP:
 		//The iron is in sleep temp mode
 		//Draw in temp and sleep
 		OLED_DrawString("SLP", 3);
-		drawTemp(temp, 4);
+		drawTemp(temp, 4, systemSettings.temperatureRounding);
+		OLED_BlankSlot(84, 96 - 85);		//blank out after the temp
 
 		if (millis() - getLastMovement() > (10 * 60 * 1000)
 				&& (millis() - getLastButtonPress() > (10 * 60 * 1000))) {
@@ -418,7 +583,8 @@ void DrawUI() {
 	case COOLING:
 		//We are warning the user the tip is cooling
 		OLED_DrawString("COOL ", 5);
-		drawTemp(temp, 5);
+		temp = readIronTemp(0, 1, 0xFFFF);		//force temp re-reading
+		drawTemp(temp, 5, systemSettings.temperatureRounding);
 		break;
 	case UVLOWARN:
 		OLED_DrawString("LOW VOLT", 8);
@@ -426,12 +592,12 @@ void DrawUI() {
 	case THERMOMETER:
 		temp = readIronTemp(0, 1, 0xFFFF);	//Force a reading as heater is off
 		OLED_DrawString("TEMP ", 5);//extra one to it clears the leftover 'L' from IDLE
-		drawTemp(temp, 5);
+		drawTemp(temp, 5, 0);
 		break;
 	case DCINDISP: {
 		uint16_t voltage = readDCVoltage(systemSettings.voltageDiv); //get X10 voltage
 
-		if (CalStatus == 0 || ((millis() % 1000) > 500)) {
+		if (StatusFlags == 0 || ((millis() % 1000) > 500)) {
 			OLED_DrawString("IN", 2);
 			OLED_DrawChar((voltage / 100) % 10, 2);
 			voltage -= (voltage / 100) * 100;
@@ -448,11 +614,11 @@ void DrawUI() {
 		break;
 	case TEMPCAL: {
 
-		if (CalStatus == 0) {
+		if (StatusFlags == 0) {
 			OLED_DrawString("CAL TEMP", 8);
-		} else if (CalStatus == 1) {
+		} else if (StatusFlags == 1) {
 			OLED_DrawString("CAL OK  ", 8);
-		} else if (CalStatus == 2) {
+		} else if (StatusFlags == 2) {
 			OLED_DrawString("CAL FAIL", 8);
 		}
 	}
@@ -461,4 +627,5 @@ void DrawUI() {
 	default:
 		break;
 	}
+
 }

workspace/ts100/src/Oled.c

@@ -174,7 +174,7 @@ void Clear_Screen(void) {
 /*
  * Draws a string onto the screen starting at the left
  */
-void OLED_DrawString(char* string, uint8_t length) {
+void OLED_DrawString(const char* string,const  uint8_t length) {
 	for (uint8_t i = 0; i < length; i++) {
 		OLED_DrawChar(string[i], i);
 	}
@@ -188,7 +188,9 @@ void OLED_DrawChar(char c, uint8_t x) {
 	x *= FONT_WIDTH; //convert to a x coordinate
 
 	u8* ptr = (u8*) FONT;
-	if (c >= 'A' && c <= 'Z') {
+	if (c >= 'a' && c <= 'z') {
+		ptr += (c - 'a' + 10) * (FONT_WIDTH * 2); //alpha is ofset 10 chars into the array
+	} else if (c >= 'A' && c <= 'Z') {
 		ptr += (c - 'A' + 10) * (FONT_WIDTH * 2); //alpha is ofset 10 chars into the array
 	} else if (c >= '0' && c <= '9')
 		ptr += (c - '0') * (FONT_WIDTH * 2);

workspace/ts100/src/PID.c

@@ -15,8 +15,8 @@ int32_t computePID(uint16_t setpoint) {
 	uint16_t currentReading = readIronTemp(0, 1,setpoint); //get the current temp of the iron
 	int16_t error = (int16_t) setpoint - (int16_t) currentReading; //calculate the error term
 	ITerm += (pidSettings.ki * error);
-	if (ITerm > MAXPIDOUTPUT)
-		ITerm = MAXPIDOUTPUT;
+	if (ITerm > MAXPIDOUTPUT/2)
+		ITerm = MAXPIDOUTPUT/2;
 	else if (ITerm < 0)
 		ITerm = 0; //cap at 0 since we cant force the iron to cool itself :)
 
@@ -34,8 +34,8 @@ int32_t computePID(uint16_t setpoint) {
 }
 /*Sets up the pid values*/
 void setupPID(void) {
-	pidSettings.kp = 25;
-	pidSettings.ki = 7;
-	pidSettings.kd = 2;
+	pidSettings.kp = 15;
+	pidSettings.ki = 2;
+	pidSettings.kd = 3;
 
 }

workspace/ts100/src/Settings.c

@@ -44,14 +44,17 @@ void resetSettings() {
 	systemSettings.SleepTemp = 1500;			//Temperature the iron sleeps at - default 150.0 C
 	systemSettings.SleepTime = 1;				//How many minutes we wait until going to sleep - default 1 min
 	systemSettings.SolderingTemp = 3200;		//Default soldering temp is 320.0 C
-	systemSettings.movementEnabled = 1; 		//we use movement detection by default
 	systemSettings.cutoutVoltage = 10;			//10V is the minium cutout voltage as the unit V measurement is unstable below 9.5V
 	systemSettings.version = SETTINGSVERSION;	//Store the version number to allow for easier upgrades
 	systemSettings.displayTempInF =0;			//default to C
 	systemSettings.flipDisplay=0;				//Default to right handed mode
-	systemSettings.sensitivity=0x00;			//Default high sensitivity
+	systemSettings.sensitivity=6;				//Default high sensitivity
 	systemSettings.tempCalibration=239;			//Default to their calibration value
 	systemSettings.voltageDiv=144;				//Default divider from schematic
-	systemSettings.ShutdownTime=30;
+	systemSettings.ShutdownTime=30;				//How many minutes until the unit turns itself off
+	systemSettings.displayUpdateSpeed=1;		//How fast the LCD updates
+	systemSettings.temperatureRounding=0;		//How the temperature is rounded off
+	systemSettings.boostModeEnabled=0;			//Default to safe, with no boost mode
+	systemSettings.BoostTemp=4000;				//default to 400C
 }
 

workspace/ts100/ts100.xml

@@ -1,9 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<targetDefinitions xmlns="http://openstm32.org/stm32TargetDefinitions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://openstm32.org/stm32TargetDefinitions stm32TargetDefinitions.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE targetDefinitions [ 
+	<!ELEMENT targetDefinitions (board)>
+	<!ELEMENT board (name, dbgIF+, dbgDEV, mcuId)>
+	<!ELEMENT name (#PCDATA)>
+	<!ELEMENT dbgIF (#PCDATA)>
+	<!ELEMENT dbgDEV (#PCDATA)>
+	<!ELEMENT mcuId (#PCDATA)>
+	<!ATTLIST board id CDATA #REQUIRED>
+]>
+
+<targetDefinitions>
   <board id="ts100">
     <name>ts100</name>
-    <mcuId>stm32f103t8ux</mcuId>
     <dbgIF>SWD</dbgIF>
-    <dbgDEV>ST-LinkV2</dbgDEV>
+    <dbgDEV>ST-Link</dbgDEV>
+    <mcuId>stm32f103t8ux</mcuId>
   </board>
 </targetDefinitions>