damping instead of 24h average
This commit is contained in:
@ -128,12 +128,11 @@ void taskMetrics(void *pvParameters)
|
||||
aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().average60s.fValue;
|
||||
u16MetricCounter++;
|
||||
|
||||
// Chamber Temperature Average 24h
|
||||
/*
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "chamber_temperature_avg24h");
|
||||
// Chamber Temperature Damped
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "chamber_temperature_damped");
|
||||
aMetrics[u16MetricCounter].type = FLOAT;
|
||||
aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().average24h.fValue;
|
||||
u16MetricCounter++;*/
|
||||
aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().fDampedValue;
|
||||
u16MetricCounter++;
|
||||
|
||||
// Chamber Temperature Predict 60s
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "chamber_temperature_pred60");
|
||||
@ -159,12 +158,11 @@ void taskMetrics(void *pvParameters)
|
||||
aMetrics[u16MetricCounter].fMetricValue = getInletFlowTemperature().average60s.fValue;
|
||||
u16MetricCounter++;
|
||||
|
||||
// Inlet Flow Temperature Average 24h
|
||||
/*
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "inlet_flow_temperature_avg24h");
|
||||
// Inlet Flow Temperature Damped
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "inlet_flow_temperature_damped");
|
||||
aMetrics[u16MetricCounter].type = FLOAT;
|
||||
aMetrics[u16MetricCounter].fMetricValue = getInletFlowTemperature().average24h.fValue;
|
||||
u16MetricCounter++;*/
|
||||
aMetrics[u16MetricCounter].fMetricValue = getInletFlowTemperature().fDampedValue;
|
||||
u16MetricCounter++;
|
||||
|
||||
// Inlet Flow Temperature Predict 60s
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "inlet_flow_temperature_pred60");
|
||||
@ -190,13 +188,12 @@ void taskMetrics(void *pvParameters)
|
||||
aMetrics[u16MetricCounter].fMetricValue = getOutdoorTemperature().average60s.fValue;
|
||||
u16MetricCounter++;
|
||||
|
||||
// Outdoor Temperature Average 24h
|
||||
/*
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "outdoor_temperature_avg24h");
|
||||
// Outdoor Temperature Average Damped
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "outdoor_temperature_damped");
|
||||
aMetrics[u16MetricCounter].type = FLOAT;
|
||||
aMetrics[u16MetricCounter].fMetricValue = getOutdoorTemperature().average24h.fValue;
|
||||
aMetrics[u16MetricCounter].fMetricValue = getOutdoorTemperature().fDampedValue;
|
||||
u16MetricCounter++;
|
||||
*/
|
||||
|
||||
// Outdoor Temperature Predict 60s
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "outdoor_temperature_pred60");
|
||||
aMetrics[u16MetricCounter].type = FLOAT;
|
||||
@ -221,12 +218,11 @@ void taskMetrics(void *pvParameters)
|
||||
aMetrics[u16MetricCounter].fMetricValue = getReturnFlowTemperature().average60s.fValue;
|
||||
u16MetricCounter++;
|
||||
|
||||
// Return Flow Temperature Average 24h
|
||||
/*
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "return_flow_temperature_avg24h");
|
||||
// Return Flow Temperature Damped
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "return_flow_temperature_damped");
|
||||
aMetrics[u16MetricCounter].type = FLOAT;
|
||||
aMetrics[u16MetricCounter].fMetricValue = getReturnFlowTemperature().average24h.fValue;
|
||||
u16MetricCounter++;*/
|
||||
aMetrics[u16MetricCounter].fMetricValue = getReturnFlowTemperature().fDampedValue;
|
||||
u16MetricCounter++;
|
||||
|
||||
// Return Flow Temperature Predict 60s
|
||||
strcpy(aMetrics[u16MetricCounter].caMetricName, "return_flow_temperature_pred60");
|
||||
@ -286,6 +282,7 @@ void taskMetrics(void *pvParameters)
|
||||
aMetrics[u16MetricCounter].i64MetricValue = ap.rssi;
|
||||
u16MetricCounter++;
|
||||
|
||||
ESP_ERROR_CHECK(u16MetricCounter > METRIC_MAX_COUNT);
|
||||
vSetMetrics(aMetrics, u16MetricCounter);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user