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

move to AddLog_P

Browse Source
This commit is contained in:
Marcus 2021-01-04 11:11:05 +01:00
parent 3f9960719a
commit 66b85b6ddf
2 changed files with 19 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasmota/xdrv_91_timeprop.ino
View File

@ -106,8 +106,7 @@ void Timeprop_Set_Power( int index, float power )
void Timeprop_Init() void Timeprop_Init()
{ {
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "Timeprop Init"); AddLog_P(LOG_LEVEL_INFO, PSTR("Timeprop Init"));
AddLog(LOG_LEVEL_INFO);
int cycleTimes[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_CYCLETIMES}; int cycleTimes[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_CYCLETIMES};
int deadTimes[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_DEADTIMES}; int deadTimes[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_DEADTIMES};
int opInverts[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_OPINVERTS}; int opInverts[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_OPINVERTS};

53
tasmota/xdrv_92_pid.ino
View File

@ -160,8 +160,7 @@ static long pid_current_time_secs = 0; // a counter that counts seconds since i
void PID_Init() void PID_Init()
{ {
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID Init"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID Init"));
AddLog(LOG_LEVEL_INFO);
pid.initialise( PID_SETPOINT, PID_PROPBAND, PID_INTEGRAL_TIME, PID_DERIVATIVE_TIME, PID_INITIAL_INT, pid.initialise( PID_SETPOINT, PID_PROPBAND, PID_INTEGRAL_TIME, PID_DERIVATIVE_TIME, PID_INITIAL_INT,
PID_MAX_INTERVAL, PID_DERIV_SMOOTH_FACTOR, PID_AUTO, PID_MANUAL_POWER ); PID_MAX_INTERVAL, PID_DERIV_SMOOTH_FACTOR, PID_AUTO, PID_MANUAL_POWER );
} }
@ -182,8 +181,7 @@ void PID_Show_Sensor() {
// as published in tele/SENSOR // as published in tele/SENSOR
// Update period is specified in TELE_PERIOD // Update period is specified in TELE_PERIOD
// e.g. "{"Time":"2018-03-13T16:48:05","DS18B20":{"Temperature":22.0},"TempUnit":"C"}" // e.g. "{"Time":"2018-03-13T16:48:05","DS18B20":{"Temperature":22.0},"TempUnit":"C"}"
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID_Show_Sensor: mqtt_data: %s", TasmotaGlobal.mqtt_data); AddLog_P(LOG_LEVEL_INFO, PSTR("PID_Show_Sensor: mqtt_data: %s"), TasmotaGlobal.mqtt_data);
AddLog(LOG_LEVEL_INFO);
StaticJsonBuffer<400> jsonBuffer; StaticJsonBuffer<400> jsonBuffer;
// force mqtt_data to read only to stop parse from overwriting it // force mqtt_data to read only to stop parse from overwriting it
JsonObject& data_json = jsonBuffer.parseObject((const char*)mqtt_data); JsonObject& data_json = jsonBuffer.parseObject((const char*)mqtt_data);
@ -191,8 +189,7 @@ void PID_Show_Sensor() {
const char* value = data_json["DS18B20"]["Temperature"]; const char* value = data_json["DS18B20"]["Temperature"];
// check that something was found and it contains a number // check that something was found and it contains a number
if (value != NULL && strlen(value) > 0 && (isdigit(value[0]) || (value[0] == '-' && isdigit(value[1])) ) ) { if (value != NULL && strlen(value) > 0 && (isdigit(value[0]) || (value[0] == '-' && isdigit(value[1])) ) ) {
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID_Show_Sensor: Temperature: %s", value); AddLog_P(LOG_LEVEL_INFO, PSTR("PID_Show_Sensor: Temperature: %s"), value);
AddLog(LOG_LEVEL_INFO);
// pass the value to the pid alogorithm to use as current pv // pass the value to the pid alogorithm to use as current pv
last_pv_update_secs = pid_current_time_secs; last_pv_update_secs = pid_current_time_secs;
pid.setPv(atof(value), last_pv_update_secs); pid.setPv(atof(value), last_pv_update_secs);
@ -202,13 +199,11 @@ void PID_Show_Sensor() {
run_pid_now = true; run_pid_now = true;
} }
} else { } else {
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID_Show_Sensor - no temperature found"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID_Show_Sensor - no temperature found"));
AddLog(LOG_LEVEL_INFO);
} }
} else { } else {
// parse failed // parse failed
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID_Show_Sensor - json parse failed"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID_Show_Sensor - json parse failed"));
AddLog(LOG_LEVEL_INFO);
} }
} }
@ -228,14 +223,13 @@ boolean PID_Command()
boolean serviced = true; boolean serviced = true;
uint8_t ua_prefix_len = strlen(D_CMND_PID); // to detect prefix of command uint8_t ua_prefix_len = strlen(D_CMND_PID); // to detect prefix of command
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "Command called: " AddLog_P(LOG_LEVEL_INFO, PSTR("Command called: "
"index: %d data_len: %d payload: %d topic: %s data: %s", "index: %d data_len: %d payload: %d topic: %s data: %s"),
XdrvMailbox.index, XdrvMailbox.index,
XdrvMailbox.data_len, XdrvMailbox.data_len,
XdrvMailbox.payload, XdrvMailbox.payload,
(XdrvMailbox.payload >= 0 ? XdrvMailbox.topic : ""), (XdrvMailbox.payload >= 0 ? XdrvMailbox.topic : ""),
(XdrvMailbox.data_len >= 0 ? XdrvMailbox.data : "")); (XdrvMailbox.data_len >= 0 ? XdrvMailbox.data : ""));
AddLog(LOG_LEVEL_INFO);
if (0 == strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_PID), ua_prefix_len)) { if (0 == strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_PID), ua_prefix_len)) {
// command starts with pid_ // command starts with pid_
@ -243,8 +237,7 @@ boolean PID_Command()
serviced = true; serviced = true;
switch (command_code) { switch (command_code) {
case CMND_PID_SETPV: case CMND_PID_SETPV:
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID command setpv"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID command setpv"));
AddLog(LOG_LEVEL_INFO);
last_pv_update_secs = pid_current_time_secs; last_pv_update_secs = pid_current_time_secs;
pid.setPv(atof(XdrvMailbox.data), last_pv_update_secs); pid.setPv(atof(XdrvMailbox.data), last_pv_update_secs);
// also trigger running the pid algorithm if we have been told to run it each pv sample // also trigger running the pid algorithm if we have been told to run it each pv sample
@ -255,63 +248,53 @@ boolean PID_Command()
break; break;
case CMND_PID_SETSETPOINT: case CMND_PID_SETSETPOINT:
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID command setsetpoint"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID command setsetpoint"));
AddLog(LOG_LEVEL_INFO);
pid.setSp(atof(XdrvMailbox.data)); pid.setSp(atof(XdrvMailbox.data));
break; break;
case CMND_PID_SETPROPBAND: case CMND_PID_SETPROPBAND:
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID command propband"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID command propband"));
AddLog(LOG_LEVEL_INFO);
pid.setPb(atof(XdrvMailbox.data)); pid.setPb(atof(XdrvMailbox.data));
break; break;
case CMND_PID_SETINTEGRAL_TIME: case CMND_PID_SETINTEGRAL_TIME:
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID command Ti"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID command Ti"));
AddLog(LOG_LEVEL_INFO);
pid.setTi(atof(XdrvMailbox.data)); pid.setTi(atof(XdrvMailbox.data));
break; break;
case CMND_PID_SETDERIVATIVE_TIME: case CMND_PID_SETDERIVATIVE_TIME:
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID command Td"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID command Td"));
AddLog(LOG_LEVEL_INFO);
pid.setTd(atof(XdrvMailbox.data)); pid.setTd(atof(XdrvMailbox.data));
break; break;
case CMND_PID_SETINITIAL_INT: case CMND_PID_SETINITIAL_INT:
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID command initial int"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID command initial int"));
AddLog(LOG_LEVEL_INFO);
pid.setInitialInt(atof(XdrvMailbox.data)); pid.setInitialInt(atof(XdrvMailbox.data));
break; break;
case CMND_PID_SETDERIV_SMOOTH_FACTOR: case CMND_PID_SETDERIV_SMOOTH_FACTOR:
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID command deriv smooth"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID command deriv smooth"));
AddLog(LOG_LEVEL_INFO);
pid.setDSmooth(atof(XdrvMailbox.data)); pid.setDSmooth(atof(XdrvMailbox.data));
break; break;
case CMND_PID_SETAUTO: case CMND_PID_SETAUTO:
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID command auto"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID command auto"));
AddLog(LOG_LEVEL_INFO);
pid.setAuto(atoi(XdrvMailbox.data)); pid.setAuto(atoi(XdrvMailbox.data));
break; break;
case CMND_PID_SETMANUAL_POWER: case CMND_PID_SETMANUAL_POWER:
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID command manual power"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID command manual power"));
AddLog(LOG_LEVEL_INFO);
pid.setManualPower(atof(XdrvMailbox.data)); pid.setManualPower(atof(XdrvMailbox.data));
break; break;
case CMND_PID_SETMAX_INTERVAL: case CMND_PID_SETMAX_INTERVAL:
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID command set max interval"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID command set max interval"));
AddLog(LOG_LEVEL_INFO);
max_interval = atoi(XdrvMailbox.data); max_interval = atoi(XdrvMailbox.data);
pid.setMaxInterval(max_interval); pid.setMaxInterval(max_interval);
break; break;
case CMND_PID_SETUPDATE_SECS: case CMND_PID_SETUPDATE_SECS:
snprintf_P(TasmotaGlobal.log_data, sizeof(TasmotaGlobal.log_data), "PID command set update secs"); AddLog_P(LOG_LEVEL_INFO, PSTR("PID command set update secs"));
AddLog(LOG_LEVEL_INFO);
update_secs = atoi(XdrvMailbox.data) ; update_secs = atoi(XdrvMailbox.data) ;
if (update_secs < 0) update_secs = 0; if (update_secs < 0) update_secs = 0;
break; break;