aboutsummaryrefslogtreecommitdiffhomepage
path: root/workspace
diff options
context:
space:
mode:
authorBen V. Brown <[email protected]>2017-08-26 16:54:09 +1000
committerBen V. Brown <[email protected]>2017-08-26 16:54:09 +1000
commit6cc2dfe238e5d108ee5869dd451085f120234fc6 (patch)
treed7fd026e092fae16e76171c697ea13eaa57b705f /workspace
parent0ae32506e99b850898b49d8a2749749706f498fe (diff)
downloadIronOS-6cc2dfe238e5d108ee5869dd451085f120234fc6.tar.gz
IronOS-6cc2dfe238e5d108ee5869dd451085f120234fc6.zip
Fix jumping into cooldown accidentally
Final commit for 1.17
Diffstat (limited to 'workspace')
-rw-r--r--workspace/ts100/src/Main.c2
-rw-r--r--workspace/ts100/src/Modes.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/workspace/ts100/src/Main.c b/workspace/ts100/src/Main.c
index aaf139cf..51b3b932 100644
--- a/workspace/ts100/src/Main.c
+++ b/workspace/ts100/src/Main.c
@@ -14,6 +14,8 @@ void setup();
int main(void) {
setup();/*Setup the system*/
+ for(uint8_t i=0;i<100;i++)
+ readIronTemp(0, 1, 0xFFFF);
if (systemSettings.autoStart == 1)
operatingMode = SOLDERING;
else if (systemSettings.autoStart == 2)
diff --git a/workspace/ts100/src/Modes.c b/workspace/ts100/src/Modes.c
index 34d01a65..b4319faa 100644
--- a/workspace/ts100/src/Modes.c
+++ b/workspace/ts100/src/Modes.c
@@ -742,7 +742,6 @@ void DrawUI() {
} else {
drawTemp(temp, 5, systemSettings.temperatureRounding);
-
}
break;