jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Javier Arigita 2020-04-23 22:47:18 +02:00
parent 29ec129a05
commit 7ea961953f
1 changed files with 2 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
tasmota/xdrv_39_thermostat.ino
View File

@ -319,35 +319,11 @@ bool HeatStateManualToAuto()
bool change_state; bool change_state;
// If switch input inactive // If switch input inactive
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
// AND no switch input action (time in current state) bigger than a pre-defined time
// then go to automatic
if ((ThermostatSwitchStatus(Thermostat.input_switch_number) == 0)
=======
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
// AND sensor alive // AND sensor alive
// AND no switch input action (time in current state) bigger than a pre-defined time // AND no switch input action (time in current state) bigger than a pre-defined time
// then go to automatic // then go to automatic
if ((ThermostatSwitchStatus(Thermostat.input_switch_number) == 0) if ((ThermostatSwitchStatus(Thermostat.input_switch_number) == 0)
&&(Thermostat.status.sensor_alive == IFACE_ON) &&(Thermostat.status.sensor_alive == IFACE_ON)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
&& ((uptime - Thermostat.timestamp_input_on) > ((uint32_t)Thermostat.time_manual_to_auto * 60))) { && ((uptime - Thermostat.timestamp_input_on) > ((uint32_t)Thermostat.time_manual_to_auto * 60))) {
change_state = true; change_state = true;
} }
@ -449,23 +425,7 @@ void ThermostatCalculatePI()
// Reset of antiwindup // Reset of antiwindup
// If error does not lay within the integrator scope range, do not use the integral // If error does not lay within the integrator scope range, do not use the integral
// and accumulate error = 0 // and accumulate error = 0
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
if (abs(Thermostat.temp_pi_error) > Thermostat.temp_reset_anti_windup) {
=======
if (abs(Thermostat.temp_pi_error) > (int16_t)Thermostat.temp_reset_anti_windup) { if (abs(Thermostat.temp_pi_error) > (int16_t)Thermostat.temp_reset_anti_windup) {
>>>>>>> new_branch_dev
=======
if (abs(Thermostat.temp_pi_error) > (int16_t)Thermostat.temp_reset_anti_windup) {
>>>>>>> new_branch_dev
=======
if (abs(Thermostat.temp_pi_error) > (int16_t)Thermostat.temp_reset_anti_windup) {
>>>>>>> new_branch_dev
=======
if (abs(Thermostat.temp_pi_error) > (int16_t)Thermostat.temp_reset_anti_windup) {
>>>>>>> new_branch_dev
Thermostat.time_integral_pi = 0; Thermostat.time_integral_pi = 0;
Thermostat.temp_pi_accum_error = 0; Thermostat.temp_pi_accum_error = 0;
} }
@ -542,23 +502,7 @@ void ThermostatCalculatePI()
} }
} }
// If target value has not been reached // If target value has not been reached
<<<<<<< HEAD // AND we are within the histeresis
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
// AND we are withing the histeresis
=======
// AND we are withinvr the histeresis
>>>>>>> new_branch_dev
=======
// AND we are withinvr the histeresis
>>>>>>> new_branch_dev
=======
// 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)
@ -757,33 +701,12 @@ void ThermostatWork()
break; break;
case THERMOSTAT_MANUAL_OP: // State manual operation following input switch case THERMOSTAT_MANUAL_OP: // State manual operation following input switch
Thermostat.time_ctr_checkpoint = 0; Thermostat.time_ctr_checkpoint = 0;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
if (ThermostatSwitchStatus(Thermostat.input_switch_number) == 1) { if (ThermostatSwitchStatus(Thermostat.input_switch_number) == 1) {
Thermostat.status.command_output = IFACE_ON; Thermostat.status.command_output = IFACE_ON;
} }
else { else {
Thermostat.status.command_output = IFACE_OFF; Thermostat.status.command_output = IFACE_OFF;
} }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
break; break;
} }
bool output_command; bool output_command;
@ -909,33 +832,9 @@ void CmndTempMeasuredSet(void)
uint32_t timestamp = uptime; uint32_t timestamp = uptime;
// Calculate temperature gradient if temperature value has changed // Calculate temperature gradient if temperature value has changed
if (value != Thermostat.temp_measured) { if (value != Thermostat.temp_measured) {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
int16_t temp_delta = (value - Thermostat.temp_measured); // in tenths of degrees
uint32_t time_delta = (timestamp - Thermostat.timestamp_temp_meas_change_update); // in seconds
Thermostat.temp_measured_gradient = (int32_t)((360000 * (int32_t)temp_delta) / (int32_t)time_delta); // hundreths of degrees per hour
=======
int32_t temp_delta = (value - Thermostat.temp_measured); // in tenths of degrees int32_t temp_delta = (value - Thermostat.temp_measured); // in tenths of degrees
uint32_t time_delta = (timestamp - Thermostat.timestamp_temp_meas_change_update); // in seconds uint32_t time_delta = (timestamp - Thermostat.timestamp_temp_meas_change_update); // in seconds
Thermostat.temp_measured_gradient = (int32_t)((360000 * temp_delta) / ((int32_t)time_delta)); // hundreths of degrees per hour Thermostat.temp_measured_gradient = (int32_t)((360000 * temp_delta) / ((int32_t)time_delta)); // hundreths of degrees per hour
>>>>>>> new_branch_dev
=======
int32_t temp_delta = (value - Thermostat.temp_measured); // in tenths of degrees
uint32_t time_delta = (timestamp - Thermostat.timestamp_temp_meas_change_update); // in seconds
Thermostat.temp_measured_gradient = (int32_t)((360000 * temp_delta) / ((int32_t)time_delta)); // hundreths of degrees per hour
>>>>>>> new_branch_dev
=======
int32_t temp_delta = (value - Thermostat.temp_measured); // in tenths of degrees
uint32_t time_delta = (timestamp - Thermostat.timestamp_temp_meas_change_update); // in seconds
Thermostat.temp_measured_gradient = (int32_t)((360000 * temp_delta) / ((int32_t)time_delta)); // hundreths of degrees per hour
>>>>>>> new_branch_dev
=======
int32_t temp_delta = (value - Thermostat.temp_measured); // in tenths of degrees
uint32_t time_delta = (timestamp - Thermostat.timestamp_temp_meas_change_update); // in seconds
Thermostat.temp_measured_gradient = (int32_t)((360000 * temp_delta) / ((int32_t)time_delta)); // hundreths of degrees per hour
>>>>>>> new_branch_dev
Thermostat.temp_measured = value; Thermostat.temp_measured = value;
Thermostat.timestamp_temp_meas_change_update = timestamp; Thermostat.timestamp_temp_meas_change_update = timestamp;
} }
@ -1241,17 +1140,6 @@ bool Xdrv39(uint8_t function)
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Thermostat.time_integral_pi: %s"), result_chr); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Thermostat.time_integral_pi: %s"), result_chr);
dtostrfd(Thermostat.time_total_pi, 0, result_chr); dtostrfd(Thermostat.time_total_pi, 0, result_chr);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Thermostat.time_total_pi: %s"), result_chr); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Thermostat.time_total_pi: %s"), result_chr);
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
dtostrfd(Thermostat.temp_measured_gradient, 0, result_chr); dtostrfd(Thermostat.temp_measured_gradient, 0, result_chr);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Thermostat.temp_measured_gradient: %s"), result_chr); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Thermostat.temp_measured_gradient: %s"), result_chr);
dtostrfd(Thermostat.time_rampup_deadtime, 0, result_chr); dtostrfd(Thermostat.time_rampup_deadtime, 0, result_chr);
@ -1262,16 +1150,6 @@ bool Xdrv39(uint8_t function)
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Thermostat.time_ctr_changepoint: %s"), result_chr); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Thermostat.time_ctr_changepoint: %s"), result_chr);
dtostrfd(Thermostat.temp_rampup_output_off, 0, result_chr); dtostrfd(Thermostat.temp_rampup_output_off, 0, result_chr);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Thermostat.temp_rampup_output_off: %s"), result_chr); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Thermostat.temp_rampup_output_off: %s"), result_chr);
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
=======
>>>>>>> new_branch_dev
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("------ Thermostat End ------")); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("------ Thermostat End ------"));
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("")); AddLog_P2(LOG_LEVEL_DEBUG, PSTR(""));
#endif #endif