mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge

This commit is contained in:
Javier Arigita 2020-04-23 22:50:51 +02:00
parent bbb4fbd24b
commit 6225298353
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasmota/xdrv_39_thermostat.ino
View File

@ -502,15 +502,7 @@ void ThermostatCalculatePI()
} }
} }
// If target value has not been reached // If target value has not been reached
<<<<<<< HEAD
<<<<<<< HEAD
// AND we are within the histeresis // AND we are within the histeresis
=======
// AND we are withinvr the histeresis
>>>>>>> new_branch_dev
=======
// AND we are withinvr the histeresis
>>>>>>> new_branch_dev
// AND gradient is positive // AND gradient is positive
// then set value to 0 // then set value to 0
else if ((Thermostat.temp_pi_error > 0) else if ((Thermostat.temp_pi_error > 0)