aboutsummaryrefslogtreecommitdiffhomepage
path: root/workspace
diff options
context:
space:
mode:
authorBen V. Brown <[email protected]>2017-07-07 19:29:15 +1000
committerBen V. Brown <[email protected]>2017-07-07 19:29:15 +1000
commit6bbade318d5f33fba3fb9a2434fd606dbef1231b (patch)
tree0798ac10fff0273b2e74412fd72d43adac27ee2d /workspace
parentf3156e88dc54d88f6419852856eabcb33e920002 (diff)
downloadIronOS-1.09.tar.gz
IronOS-1.09.zip
Fix default settings for displaymode to fastv1.09
Diffstat (limited to 'workspace')
-rw-r--r--workspace/ts100/src/Modes.c11
-rw-r--r--workspace/ts100/src/Settings.c3
2 files changed, 10 insertions, 4 deletions
diff --git a/workspace/ts100/src/Modes.c b/workspace/ts100/src/Modes.c
index 944effa5..1ffd3189 100644
--- a/workspace/ts100/src/Modes.c
+++ b/workspace/ts100/src/Modes.c
@@ -315,11 +315,16 @@ void DrawUI() {
case SOLDERING:
//The user is soldering
{
+ if (systemSettings.displayUpdateMode == DISPLAYMODE_SLOW
+ && (millis() - lastSolderingDrawTime < 1000))
+ return;
+
if (systemSettings.displayUpdateMode == DISPLAYMODE_FAST
- || (systemSettings.displayUpdateMode == DISPLAYMODE_SLOW
- && (millis() - lastSolderingDrawTime > 1000))) {
+ || systemSettings.displayUpdateMode == DISPLAYMODE_SLOW) {
drawTemp(temp, 0);
- } else if (systemSettings.displayUpdateMode == DISPLAYMODE_ROUND) {
+ lastSolderingDrawTime = millis();
+ }
+ if (systemSettings.displayUpdateMode == DISPLAYMODE_ROUND) {
drawTemp((temp / 100) * 100, 0);
} else if (systemSettings.displayUpdateMode == DISPLAYMODE_NONE) {
diff --git a/workspace/ts100/src/Settings.c b/workspace/ts100/src/Settings.c
index e24601da..d25dde95 100644
--- a/workspace/ts100/src/Settings.c
+++ b/workspace/ts100/src/Settings.c
@@ -52,6 +52,7 @@ void resetSettings() {
systemSettings.sensitivity=0x00; //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.displayUpdateMode=0; //How fast the LCD updates
}