Sleep screen check bug

Should fix #248
This commit is contained in:
Ben V. Brown
2018-03-23 10:00:07 +11:00
parent b4235bea75
commit 6c34675083

View File

@@ -754,16 +754,18 @@ void startGUITask(void const *argument) {
} }
currentlyActiveTemperatureTarget = 0; // ensure tip is off currentlyActiveTemperatureTarget = 0; // ensure tip is off
uint16_t tipTemp = tipMeasurementToC(getTipRawTemp(0)); uint16_t tipTemp = tipMeasurementToC(getTipRawTemp(0));
if (tipTemp < 50) if (tipTemp < 50) {
if (systemSettings.sensitivity) { if (systemSettings.sensitivity) {
if ((xTaskGetTickCount() - lastMovementTime) > 6000 if ((xTaskGetTickCount() - lastMovementTime) > 6000
&& (xTaskGetTickCount() - lastButtonTime) > 6000) && (xTaskGetTickCount() - lastButtonTime) > 6000)
lcd.displayOnOff(false); // turn lcd off when no movement lcd.displayOnOff(false); // turn lcd off when no movement
else if (xTaskGetTickCount() - lastMovementTime < 100 else
|| xTaskGetTickCount() - lastButtonTime < 100) /*Use short time for test, and prevent lots of I2C lcd.displayOnOff(true); // turn lcd on
writes for no need*/ } else
lcd.displayOnOff(true); // turn lcd back on lcd.displayOnOff(true); // turn lcd on
} } else
lcd.displayOnOff(true); // turn lcd on
if (tipTemp > 600) if (tipTemp > 600)
tipTemp = 0; tipTemp = 0;
if (tipTemp > 50) { if (tipTemp > 50) {