Adds automatic shutdown

Closes #7 .
Adds shutdown feature with settings entry

README.md

@@ -1,23 +1,22 @@
 # TS100
-This is a complete open source re-write of the software for the ts100 soldering iron.
+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 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.
 
-## Features Working
+## Features
 * Soldering / Temperature control
 * Full PID iron temperature control
-* Adjusting temperature
+* Automatic sleep with selectable sensitivity
-* Automatic sleep
 * Motion wake support
 * Settings menu
-* Input voltage UVLO measurement
+* Input voltage UVLO measurement for battery powered use
-* Saving settings to flash for persistence
+* All settings saved
-* Improved GUI Fonts
+* Improved readability Fonts
-* Use hardware I2C for communications
+* Use hardware features to improve reliability
 * Can disable movement detection if desired
+* Calibration of the temperature offset
 
 # 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)
@@ -38,11 +37,52 @@ There is a complete device flash backup included in this repository. (Note this
 
 # New Menu System
 This new firmware uses a new menu system to allow access to the settings on the device.
-This menu can be accessed as shown in following flow chart, in the settings numbers roll over from top to bottom.
+When on the main screen, the unit shows prompts for the two most common operations.
-![TS100: Software Menu](TS100.png "Fairly easy to learn")
+-> Pressing the button near the tip enters soldering mode
+-> Pressing the button near the power input enters the settings menu.
+-> Pressing both buttons together enters the Extras menu
+## Soldering mode
+In this mode the iron works as you would expect, pressing either button will take you to a temperature change screen. Use each button to go up and down in temperature. Pressing both buttons will exit you from the temperature menu (or wait 3 seconds and it will time out).
+Pressing both buttons will also exit the soldering mode.
 
+## Settings Menu
+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.
+
+* 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
+* SHTME -> Shutdown Time, how long the unit will wait after movement before shutting down completely
+* MOTION -> Wether motion detection is enabled or not
+* TMPUNIT -> Temperature unit, C or F
+* FLPDSP -> Flip display for left handed users
+* SENSE -> Motion Sensitivity, H is more sensitive. L is lowest sensitivity (ie takes more movement to trigger)
+
+## 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.
 
 # Version Changes:
+V1.06
+- Changes H and C when the iron is heating to the minidso chevron like images
+
+V1.05
+- Adds ability to calibrate the input voltage measurement
+
+V1.04
+- Increased accuracy of the temperature control
+- Improved PID response slightly
+- Allows temperature offset calibration
+- Nicer idle screen
+
+V1.03 
+- Improved Button handling
+- Ability to set motion sensitivity
+- DC voltmeter page shows input voltage
+
 V1.02
-	- Adds hold both buttons on IDLE to access the therometer mode.
+- Adds hold both buttons on IDLE to access the therometer mode.
-	- Changes the exit soldering mode to be holding both buttons (Like original firmware).
+- Changes the exit soldering mode to be holding both buttons (Like original firmware).

workspace/ts100/inc/Analog.h

@@ -15,6 +15,6 @@
 extern volatile uint16_t ADC1ConvertedValue[2];
 
 uint16_t Get_ADC1Value(uint8_t i);
-uint16_t readIronTemp(uint16_t calibration,uint8_t read);//read the iron temp in C X10
+uint16_t readIronTemp(uint16_t calibration_temp, uint8_t read,uint16_t setPointTemp); //read the iron temp in C X10
-uint16_t readDCVoltage();/*Get the system voltage X10*/
+uint16_t readDCVoltage(uint16_t divFactor);/*Get the system voltage X10*/
 #endif /* ANALOG_H_ */

workspace/ts100/inc/Font.h

@@ -97,4 +97,96 @@ const uint8_t FONT[]={
 		0x00,0x00,0x00,0x00,0x0F,0x0F,0x0F,0x0F,0x00,0x00,0x00,0x00,/*.*/
 };
 
+const uint8_t Iron_Base[] ={
+		0x00,0x20,0x60,0x60,0x60,0x60,0x60,0x60,0x90,0x90,0x90,0x90,
+		0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,
+		0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x60,0x60,0x60,
+		0x60,0x60,0x60,0x60,0x60,0x70,0xF8,0x88,0x84,0x82,0x82,0x83,
+		0x83,0x83,0x83,0x83,0x83,0x82,0x82,0x82,0x82,0x83,0x83,0x83,
+		0x83,0x83,0x83,0x82,0x82,0x82,0x82,0x82,0x86,0x84,0x84,0x84,
+		0x84,0x84,0x84,0x84,0x84,0x84,0x84,0x84,0x84,0x84,0x84,0x84,
+		0x84,0x84,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0xFE,0x00,
+
+};
+//The top pixel row for left arrow / on hint
+const uint8_t Iron_LeftArrow_UP[] = {
+		0x00,0x7C,0x82,0x82,0x82,0x7C,0x00,0xFE,0x08,0x10,0x20,0xFE,//ON
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,
+		0x98,0xBF,0xBF,0x98,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+};
+
+const uint8_t Iron_LeftArrow_DOWN[] = {
+		0x00,0x7C,0x82,0x82,0x82,0x7C,0x00,0xFE,0x08,0x10,0x20,0xFE,//ON
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,
+		0x30,0x7E,0x7E,0x30,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+};
+//The top pixel row for both arrows /
+const uint8_t Iron_BothArrows[] = {
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,
+		0x98,0xBF,0xBF,0x98,0x88,0x00,0x00,0x00,0x00,0x88,0x98,0xBF,
+		0xBF,0x98,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+};
+//The top pixel row for right arrow / settings hint
+const uint8_t Iron_RightArrow_UP[] = {
+		0x00,0x8C,0x92,0x92,0x92,0x62,0x00,0xFE,0x92,0x92,0x92,0x82,//SE
+		0x00,0x02,0x02,0xFE,0x02,0x02,0x00,0x02,0x02,0xFE,0x02,0x02,//TT
+		0x00,0x00,0x82,0xFE,0x82,0x00,0x00,0xFE,0x08,0x10,0x20,0xFE,//IN
+		0x00,0x7C,0x82,0x82,0xA2,0x62,0x00,0x8C,0x92,0x92,0x92,0x62,//GS
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0x98,0xBF,
+		0xBF,0x98,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+};
+const uint8_t Iron_RightArrow_DOWN[] = {
+		0x00,0x8C,0x92,0x92,0x92,0x62,0x00,0xFE,0x92,0x92,0x92,0x82,//SE
+		0x00,0x02,0x02,0xFE,0x02,0x02,0x00,0x02,0x02,0xFE,0x02,0x02,//TT
+		0x00,0x00,0x82,0xFE,0x82,0x00,0x00,0xFE,0x08,0x10,0x20,0xFE,//IN
+		0x00,0x7C,0x82,0x82,0xA2,0x62,0x00,0x8C,0x92,0x92,0x92,0x62,//GS
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x30,0x7E,
+		0x7E,0x30,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+};
+
+const uint8_t SymbolTable[]={
+
+		0x0E,0x11,0x11,0x0E,0xE0,0xF8,0x0C,0x06,0x03,0x01,0x01,0x01,0x01,0x02,0x1E,0x00,
+		0x00,0x00,0x00,0x00,0x0F,0x3F,0x70,0xC0,0x80,0x80,0x80,0x80,0x80,0x40,0x20,0x00,	// Degrees C
+
+		0x08,0x14,0x22,0x14,0x08,0x02,0x02,0xFE,0x06,0x02,0x02,0x02,0xC2,0x02,0x06,0x1E,
+		0x00,0x00,0x00,0x00,0x00,0x80,0x80,0xFF,0x81,0x81,0x01,0x01,0x03,0x00,0x00,0x00,	// Degrees F
+
+		0xC0,0x30,0x08,0x04,0x04,0x02,0xFA,0xAA,0xFA,0x02,0x04,0x04,0x08,0x30,0xC0,0x00,
+	 	0x07,0x18,0x20,0x40,0x58,0xA4,0xDB,0xDE,0xDB,0xA4,0x58,0x40,0x20,0x18,0x07,0x00, 	// Temp symbol
+
+		0x00,0xF0,0xF0,0x00,0x00,0xF0,0xF0,0xF0,0x00,0x00,0xFC,0xF8,0xF0,0xE0,0xC0,0x80, 	//Right Arrow
+		0x00,0x0F,0x0F,0x00,0x00,0x0F,0x0F,0x0F,0x00,0x00,0x3F,0x1F,0x0F,0x07,0x03,0x01,
+
+		0x80,0xC0,0xE0,0xF0,0xF8,0xFC,0x00,0x00,0xF0,0xF0,0xF0,0x00,0x00,0xF0,0xF0,0x00,	//Left Arrow
+		0x01,0x03,0x07,0x0F,0x1F,0x3F,0x00,0x00,0x0F,0x0F,0x0F,0x00,0x00,0x0F,0x0F,0x00,
+
+		0x11,0x33,0x66,0xCC,0x98,0x30,0x60,0xC0,0xC0,0x60,0x30,0x98,0xCC,0x66,0x33,0x11,
+		0x01,0x03,0x06,0x0C,0x19,0x33,0x66,0xCC,0xCC,0x66,0x33,0x19,0x0C,0x06,0x03,0x01,	//Down Chevron
+
+		0x80,0xC0,0x60,0x30,0x98,0xCC,0x66,0x33,0x33,0x66,0xCC,0x98,0x30,0x60,0xC0,0x80,
+		0x88,0xCC,0x66,0x33,0x19,0x0C,0x06,0x03,0x03,0x06,0x0C,0x19,0x33,0x66,0xCC,0x88,	//Up Chevron
+
+		0x00,0x8C,0x8C,0x8C,0x8C,0x8C,0x8C,0x8C,0x8C,0x8C,0x8C,0x8C,0x8C,0x8C,0x8C,0x00, 	// Flat Lines
+		0x00,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x00,
+};
 #endif /* FONT_H_ */

workspace/ts100/inc/Modes.h

@@ -17,21 +17,24 @@
 #include "Settings.h"
 #include "Analog.h"
 enum {
-	STARTUP, //we are sitting on the prompt to push a button
+	STARTUP, 		//we are sitting on the prompt to push a button
-	SOLDERING,
+	SOLDERING, 		//Normal operating mode
-	TEMP_ADJ,
+	TEMP_ADJ,		//Adjust the set temperature
-	SETTINGS,
+	SETTINGS,		//Settings menu
-	SLEEP,
+	SLEEP,			//Iron is snoozing due to lack of use
-	COOLING,
+	COOLING,		//Iron is cooling down -> Warning screen
-	UVLOWARN,
+	UVLOWARN,		//Unit tripped low voltage
-	THERMOMETER,
+	THERMOMETER,	//Read the tip temp
-	DCINDISP,
+	DCINDISP,		//Disp the input voltage && Cal the DCin voltage divider
+	TEMPCAL,		//Cal tip temp offset
+
 } operatingMode;
 
 enum {
 	UVCO = 0,
 	SLEEP_TEMP,
 	SLEEP_TIME,
+	SHUTDOWN_TIME,
 	MOTIONDETECT,
 	MOTIONSENSITIVITY,
 	TEMPDISPLAY,

workspace/ts100/inc/Oled.h

@@ -25,7 +25,9 @@ void Clear_Screen(void);//Clear the screen
 void OLED_DrawString(char* string, 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);
 void OLED_DrawThreeNumber(uint16_t in, uint8_t x);
-
+void OLED_DrawIDLELogo();
+void OLED_DrawSymbol(uint8_t x,uint8_t symbol);
 #endif
 /******************************** END OF FILE *********************************/

workspace/ts100/inc/Settings.h

@@ -11,7 +11,7 @@
 #define SETTINGS_H_
 #include <stdint.h>
 #include "stm32f10x_flash.h"
-#define SETTINGSVERSION 0x03 /*Change this if you change the struct below to prevent people getting out of sync*/
+#define SETTINGSVERSION 0x05 /*Change this if you change the struct below to prevent people getting out of sync*/
 #define SETTINGSOPTIONSCOUNT 6 /*Number of settings in the settings menu*/
 #define MOTION_HIGH (0x00)
 #define MOTION_MED  (0x10)
@@ -20,16 +20,18 @@
  * 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 setpoint for the iron
+	uint32_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 cutout at for undervoltage
+	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
 	uint16_t tempCalibration;		//Temperature calibration value
+	uint16_t voltageDiv;			//Voltage divisor factor
 } systemSettings;
 
 void saveSettings();

workspace/ts100/src/Analog.c

@@ -10,12 +10,12 @@
 
 //Reads the dc input and returns it as X10 voltage (ie 236 = 23.6V)
 //Seems unstable below 9.5V input
-uint16_t readDCVoltage() {
+uint16_t readDCVoltage(uint16_t divFactor) {
 	uint16_t reading = 0;
 	for (u8 i = 0; i < 10; i++) {
 		reading += ADC_GetConversionValue(ADC2);
 	}
-	reading /= 144; //take the average and convert to X10 voltage
+	reading /= divFactor; //take the average and convert to X10 voltage
 	return reading; //return the read voltage
 }
 
@@ -105,16 +105,30 @@ uint16_t Get_ADC1Value(uint8_t i) {
 }
 //This returns the calibrated temperature reading of the iron temp
 //inputs : calibration value / wether to take a new reading or not
-uint16_t readIronTemp(uint16_t calibration_temp, uint8_t read) {
+uint16_t readIronTemp(uint16_t calibration_temp, uint8_t read,
+		uint16_t setPointTemp) {
 	static uint16_t calTemp = 0;
 	static uint16_t lastVal = 0;
-
+	static uint16_t lastSetTemp;
+	if(setPointTemp!=0xFFFF)
+		lastSetTemp = setPointTemp;
 	if (calibration_temp != 0)
 		calTemp = calibration_temp;
 
 	if (read) {
-		lastVal = (readTipTemp() * 1000 + 806 * readSensorTemp()
+		int16_t compensation = 80 + 150 * (lastSetTemp - 1000) / 3000;
-				- calTemp * 1000) / 806;
+		int16_t tipTemp = readTipTemp();
+		int16_t ColdJTemp = readSensorTemp();
+		if (lastSetTemp == 1000)
+			compensation -= 10;
+
+		if (lastSetTemp != 0) {
+			if (tipTemp > (compensation + calTemp))
+				tipTemp -= compensation;
+		}
+		if (ColdJTemp > 400)
+			ColdJTemp = 400;
+		lastVal = (tipTemp * 1000 + 807 * ColdJTemp - calTemp * 1000) / 807;
 
 	}
 

workspace/ts100/src/Main.c

@@ -24,20 +24,20 @@ void setup() {
 	RCC_Config(); 										//setup system clock
 	NVIC_Config(0x4000); 								//this shifts the NVIC table to be offset, for the usb bootloader's size
 	GPIO_Config(); 										//setup all the GPIO pins
-	Init_EXTI(); 										//init the EXTI inputs
+	Init_EXTI(); 										//Init the EXTI inputs
 	Init_Timer3(); 										//Used for the soldering iron tip
-	Adc_Init(); 										//init adc and dma
+	Adc_Init(); 										//Init adc and DMA
 	I2C_Configuration();								//Start the I2C hardware
 	GPIO_Init_OLED();									//Init the GPIO ports for the OLED
 	restoreSettings();									//Load settings
 
 	StartUp_Accelerometer(systemSettings.sensitivity); 	//start the accelerometer
 
-	setupPID(); 										//init the PID values
+	setupPID(); 										//Init the PID values
-	readIronTemp(239, 0); 								//load the default calibration value
+	readIronTemp(systemSettings.tempCalibration, 0,0); 	//load the default calibration value
-	Init_Oled(systemSettings.flipDisplay); 				//init the OLED display
+	Init_Oled(systemSettings.flipDisplay); 				//Init the OLED display
 
-	OLED_DrawString("VER 1.03", 8); 					//1.settings version as of current
+	OLED_DrawString("VER 1.07", 8); 					//
 	delayMs(800);										//Pause to show version number
 	Start_Watchdog(1000); 								//start the system watch dog as 1 second timeout
 }

workspace/ts100/src/Modes.c

@@ -5,6 +5,7 @@
  *      Author: Ralim <ralim@ralimtek.com>
  */
 #include "Modes.h"
+uint8_t CalStatus = 0;
 //This does the required processing and state changes
 void ProcessUI() {
 	uint8_t Buttons = getButtons(); //read the buttons status
@@ -50,7 +51,7 @@ void ProcessUI() {
 						return;
 					}
 				}
-			uint16_t voltage = readDCVoltage(); //get X10 voltage
+			uint16_t voltage = readDCVoltage(systemSettings.voltageDiv); //get X10 voltage
 			if ((voltage / 10) < systemSettings.cutoutVoltage) {
 				operatingMode = UVLOWARN;
 				lastModeChange = millis();
@@ -115,6 +116,11 @@ void ProcessUI() {
 					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;
@@ -141,16 +147,29 @@ void ProcessUI() {
 		if (Buttons & BUT_A) {
 			//A Button was pressed so we are moving back to soldering
 			operatingMode = SOLDERING;
+			Oled_DisplayOn();
 			return;
 		} else if (Buttons & BUT_B) {
 			//B Button was pressed so we are moving back to soldering
 			operatingMode = SOLDERING;
+			Oled_DisplayOn();
 			return;
 		} else if (systemSettings.movementEnabled)
 			if (millis() - getLastMovement() < 1000) {//moved in the last second
 				operatingMode = SOLDERING; //Goto active mode again
+				Oled_DisplayOn();
 				return;
 			}
+		if (systemSettings.movementEnabled) {
+			//Check if we should shutdown
+			if ((millis() - getLastMovement()
+					> (systemSettings.ShutdownTime * 60000))
+					|| (millis() - getLastButtonPress()
+							> systemSettings.ShutdownTime * 60000)) {
+				operatingMode = COOLING; //shutdown the tip
+				Oled_DisplayOn();
+			}
+		}
 		//else if nothing has been pushed we need to compute the PID to keep the iron at the sleep temp
 		int32_t newOutput = computePID(systemSettings.SleepTemp);
 		setIronTimer(newOutput);
@@ -158,7 +177,7 @@ 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); //take a new reading as the heater code is not taking new readings
+		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
@@ -177,9 +196,13 @@ void ProcessUI() {
 	case THERMOMETER: {
 		//This lets the user check the tip temp without heating the iron.. And eventually calibration will be added here
 
-		if ((Buttons == BUT_A) | (Buttons == BUT_B)) {
+		if (Buttons == BUT_A) {
 			//Single button press, cycle over to the DC display
+			CalStatus = 0;
 			operatingMode = DCINDISP;
+		} else if (Buttons == BUT_B) {
+			CalStatus = 0;
+			operatingMode = TEMPCAL;
 		} else if (Buttons == (BUT_A | BUT_B)) {
 			//If the user is holding both button, exit the  screen
 			operatingMode = STARTUP;
@@ -189,10 +212,56 @@ void ProcessUI() {
 		break;
 	case DCINDISP: {
 		//This lets the user check the input voltage
+		if (CalStatus == 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;
+			} else if (Buttons == (BUT_A | BUT_B)) {
+				//If the user is holding both button, exit the  screen
+				operatingMode = STARTUP;
+			}
+		} else {
+			//User is calibrating the dc input
+			if (Buttons == BUT_A) {
+				if (!systemSettings.flipDisplay)
+					systemSettings.voltageDiv++;
+				else
+					systemSettings.voltageDiv--;
+			} else if (Buttons == BUT_B) {
+				if (!systemSettings.flipDisplay)
+					systemSettings.voltageDiv--;
+				else
+					systemSettings.voltageDiv++;
+			} else if (Buttons == (BUT_A | BUT_B)) {
+				CalStatus = 0;
+				saveSettings();
+			}
+			if (systemSettings.voltageDiv < 120)
+				systemSettings.voltageDiv = 160;
+			else if (systemSettings.voltageDiv > 160)
+				systemSettings.voltageDiv = 120;
+		}
 
-		if ((Buttons == BUT_A) | (Buttons == BUT_B)) {
+	}
-			//Single button press, cycle over to the temp display
+		break;
+	case TEMPCAL: {
+		if (Buttons == BUT_B) {
+			//Single button press, cycle over to the DC IN
 			operatingMode = THERMOMETER;
+		} else if (Buttons == BUT_A) {
+			//Try and calibrate
+			if (CalStatus == 0) {
+				if ((readTipTemp() < 300) && (readSensorTemp() < 300)) {
+					CalStatus = 1;
+					systemSettings.tempCalibration = readTipTemp();
+					saveSettings();
+				} else {
+					CalStatus = 2;
+				}
+			}
 		} else if (Buttons == (BUT_A | BUT_B)) {
 			//If the user is holding both button, exit the  screen
 			operatingMode = STARTUP;
@@ -210,6 +279,8 @@ void ProcessUI() {
 void drawTemp(uint16_t temp, uint8_t x) {
 	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);
 }
 
@@ -217,7 +288,7 @@ void drawTemp(uint16_t temp, uint8_t x) {
  * Performs all the OLED drawing for the current operating mode
  */
 void DrawUI() {
-	uint16_t temp = readIronTemp(0, 0);
+	uint16_t temp = readIronTemp(0, 0, 0xFFFF);
 	switch (operatingMode) {
 	case STARTUP:
 		//We are chilling in the idle mode
@@ -228,40 +299,43 @@ void DrawUI() {
 			Oled_DisplayOff();
 		} else {
 			Oled_DisplayOn();
-			OLED_DrawString("  IDLE  ", 8);		//write the word IDLE
+			OLED_DrawIDLELogo();		//Draw the icons for prompting the user
 		}
 		break;
 	case SOLDERING:
 		//The user is soldering
 	{
-		if (getIronTimer() == 0) {
-			OLED_DrawChar('C', 5);
-		} else {
-			if (getIronTimer() < 900) {
-				OLED_DrawChar(' ', 5);
-			} else {		//we are heating
-				OLED_DrawChar('H', 5);
-			}
-		}
 		drawTemp(temp, 0);
 		OLED_DrawChar(' ', 3);
-		OLED_DrawChar(' ', 4);
-		OLED_DrawChar(' ', 6);
-		OLED_DrawChar(' ', 7);
 
+		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) {
+			OLED_DrawSymbol(6, 5);
+		} else {
+			if (getIronTimer() < 900) {
+				OLED_DrawSymbol(6, 7);
+			} else {		//we are heating
+				//OLED_DrawChar('H', 5);
+				OLED_DrawSymbol(6, 6);
+			}
+		}
+		if (systemSettings.displayTempInF) {
+			OLED_DrawSymbol(4, 1);
+		} else {
+			OLED_DrawSymbol(4, 0);
+		}
 	}
 		break;
 	case TEMP_ADJ:
 		//We are prompting the user to change the temp so we draw the current setpoint temp
 		//With the nifty arrows
-
 		OLED_DrawChar(' ', 0);
 		OLED_DrawChar('<', 1);
 		drawTemp(systemSettings.SolderingTemp, 2);
 		OLED_DrawChar(' ', 5);
-		OLED_DrawChar(' ', 6);
+		OLED_DrawChar(' ', 7);
-		OLED_DrawChar('>', 7);
+		OLED_DrawChar('>', 6);
-
 		break;
 	case SETTINGS:
 		//We are prompting the user the setting name
@@ -277,9 +351,13 @@ void DrawUI() {
 			OLED_DrawThreeNumber(systemSettings.SleepTemp / 10, 5);
 			break;
 		case SLEEP_TIME:
-			OLED_DrawString("STIME ", 6);
+			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);
@@ -317,6 +395,7 @@ void DrawUI() {
 			}
 
 			break;
+
 		default:
 			break;
 		}
@@ -326,33 +405,58 @@ void DrawUI() {
 		//Draw in temp and sleep
 		OLED_DrawString("SLP", 3);
 		drawTemp(temp, 4);
+
+		if (millis() - getLastMovement() > (10 * 60 * 1000)
+				&& (millis() - getLastButtonPress() > (10 * 60 * 1000))) {
+			//OLED off
+			Oled_DisplayOff();
+		} else {
+			Oled_DisplayOn();
+		}
+
 		break;
 	case COOLING:
 		//We are warning the user the tip is cooling
-		OLED_DrawString("COOL", 4);
+		OLED_DrawString("COOL ", 5);
 		drawTemp(temp, 5);
 		break;
 	case UVLOWARN:
 		OLED_DrawString("LOW VOLT", 8);
 		break;
 	case THERMOMETER:
-		temp = readIronTemp(0, 1);		//Force a reading as heater is off
+		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);
 		break;
 	case DCINDISP: {
-		uint16_t voltage = readDCVoltage(); //get X10 voltage
+		uint16_t voltage = readDCVoltage(systemSettings.voltageDiv); //get X10 voltage
-		OLED_DrawString("IN", 2);
-		OLED_DrawChar((voltage / 100) % 10, 2);
-		voltage -= (voltage / 100) * 100;
-		OLED_DrawChar((voltage / 10) % 10, 3);
-		voltage -= (voltage / 10) * 10;
-		OLED_DrawChar('.', 4);
-		OLED_DrawChar(voltage % 10, 5);
-		OLED_DrawChar('V', 6);
-		OLED_DrawChar(' ', 7);
 
+		if (CalStatus == 0 || ((millis() % 1000) > 500)) {
+			OLED_DrawString("IN", 2);
+			OLED_DrawChar((voltage / 100) % 10, 2);
+			voltage -= (voltage / 100) * 100;
+			OLED_DrawChar((voltage / 10) % 10, 3);
+			voltage -= (voltage / 10) * 10;
+			OLED_DrawChar('.', 4);
+			OLED_DrawChar(voltage % 10, 5);
+			OLED_DrawChar('V', 6);
+			OLED_DrawChar(' ', 7);
+		} else {
+			OLED_DrawString("IN      ", 8);
+		}
 	}
+		break;
+	case TEMPCAL: {
+
+		if (CalStatus == 0) {
+			OLED_DrawString("CAL TEMP", 8);
+		} else if (CalStatus == 1) {
+			OLED_DrawString("CAL OK  ", 8);
+		} else if (CalStatus == 2) {
+			OLED_DrawString("CAL FAIL", 8);
+		}
+	}
+
 		break;
 	default:
 		break;

workspace/ts100/src/Oled.c

@@ -19,7 +19,7 @@ int8_t displayOffset = 32;
 /*All commands are prefixed with 0x80*/
 u8 OLED_Setup_Array[46] = { 0x80, 0xAE,/*Display off*/
 0x80, 0xD5,/*Set display clock divide ratio / osc freq*/
-0x80, 0x52,/**/
+0x80, 0x52,/*Unknown*/
 0x80, 0xA8,/*Set Multiplex Ratio*/
 0x80, 0x0F, /*16 == max brightness,39==dimmest*/
 0x80, 0xC0,/*Set COM Scan direction*/
@@ -28,7 +28,7 @@ u8 OLED_Setup_Array[46] = { 0x80, 0xAE,/*Display off*/
 0x80, 0x40,/*Set Display start line to 0*/
 0x80, 0xA0,/*Set Segment remap to normal*/
 0x80, 0x8D,/*Unknown*/
-0x80, 0x14,/**/
+0x80, 0x14,/*Unknown*/
 0x80, 0xDA,/*Set VCOM Pins hardware config*/
 0x80, 0x02,/*Combination 2*/
 0x80, 0x81,/*Contrast*/
@@ -36,7 +36,7 @@ u8 OLED_Setup_Array[46] = { 0x80, 0xAE,/*Display off*/
 0x80, 0xD9,/*Set pre-charge period*/
 0x80, 0xF1,/**/
 0x80, 0xDB,/*Adjust VCOMH regulator ouput*/
-0x80, 0x30,/**/
+0x80, 0x30,/*Unknown*/
 0x80, 0xA4,/*Enable the display GDDR*/
 0x80, 0XA6,/*Normal display*/
 0x80, 0xAF /*Dispaly on*/
@@ -105,7 +105,7 @@ void Set_ShowPos(u8 x, u8 y) {
  Function:Oled_DrawArea
  Description:
  Inputs:(x,y) start point, (width,height) of enclosing rect, pointer to data
- Output: last byte written out
+ Output: pointer to the last byte written out
  *******************************************************************************/
 u8* Oled_DrawArea(u8 x0, u8 y0, u8 wide, u8 high, u8* ptr) {
 	u8 m, n, y;
@@ -207,6 +207,14 @@ void OLED_DrawChar(char c, uint8_t x) {
 
 	Oled_DrawArea(x, 0, FONT_WIDTH, 16, (u8*) ptr);
 }
+
+void OLED_BlankSlot(uint8_t xStart, uint8_t width) {
+	u8* ptr = (u8*) FONT;
+	ptr += (36) * (FONT_WIDTH * 2);
+
+	Oled_DrawArea(xStart, 0, width, 16, (u8*) ptr);
+}
+
 /*
  * Draw a 2 digit number to the display at letter slot x
  */
@@ -234,3 +242,27 @@ void OLED_DrawFourNumber(uint16_t in, uint8_t x) {
 	OLED_DrawChar((in / 10) % 10, x + 2);
 	OLED_DrawChar(in % 10, x + 3);
 }
+
+void OLED_DrawIDLELogo() {
+	static uint8_t drawAttempt = 0;
+	drawAttempt++;
+	if (drawAttempt & 0x80) {
+		if (drawAttempt & 0x08)
+			Oled_DrawArea(0, 0, 96, 8, (u8*) Iron_RightArrow_UP);
+		else
+			Oled_DrawArea(0, 0, 96, 8, (u8*) Iron_RightArrow_DOWN);
+
+		Oled_DrawArea(0, 8, 96, 8, (u8*) Iron_Base);
+	} else {
+		if (drawAttempt & 0x08)
+			Oled_DrawArea(0, 0, 96, 8, (u8*) Iron_LeftArrow_UP);
+		else
+			Oled_DrawArea(0, 0, 96, 8, (u8*) Iron_LeftArrow_DOWN);
+		Oled_DrawArea(0, 8, 96, 8, (u8*) Iron_Base);
+	}
+
+}
+
+void OLED_DrawSymbol(uint8_t x, uint8_t symbol) {
+	Oled_DrawArea(x * FONT_WIDTH, 0, 16, 16, SymbolTable + (symbol * 32));
+}

workspace/ts100/src/PID.c

@@ -12,7 +12,7 @@
 int32_t computePID(uint16_t setpoint) {
 	int32_t ITerm = 0;
 	static int16_t lastReading = 0;
-	uint16_t currentReading = readIronTemp(0, 1); //get the current temp of the iron
+	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)
@@ -34,7 +34,7 @@ int32_t computePID(uint16_t setpoint) {
 }
 /*Sets up the pid values*/
 void setupPID(void) {
-	pidSettings.kp = 22;
+	pidSettings.kp = 25;
 	pidSettings.ki = 7;
 	pidSettings.kd = 2;
 

workspace/ts100/src/Settings.c

@@ -51,6 +51,7 @@ void resetSettings() {
 	systemSettings.flipDisplay=0;				//Default to right handed mode
 	systemSettings.sensitivity=0x00;			//Default high sensitivity
 	systemSettings.tempCalibration=239;			//Default to their calibration value
-
+	systemSettings.voltageDiv=144;				//Default divider from schematic
+	systemSettings.ShutdownTime=30;
 }